Commit d0dd594b authored by Breno Leitao's avatar Breno Leitao Committed by Keith Busch
Browse files

nvme: Print capabilities changes just once 



This current dev_info() could be very verbose and being printed very
frequently depending on some userspace application sending some specific
commands.

Just print this message once and skip it until the controller resets.
Use a controller flag (NVME_CTRL_DIRTY_CAPABILITY) to track if the
capability needs a reset.

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 2293cae7

drivers/nvme/host/core.c

+5 −1
Original line number Diff line number Diff line
@@ -1125,9 +1125,12 @@ void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects, 
		mutex_unlock(&ctrl->scan_lock);

	}

	if (effects & NVME_CMD_EFFECTS_CCC) {

		if (!test_and_set_bit(NVME_CTRL_DIRTY_CAPABILITY,

				      &ctrl->flags)) {

			dev_info(ctrl->device,

"controller capabilities changed, reset may be required to take effect.\n");

		}

	}

	if (effects & (NVME_CMD_EFFECTS_NIC | NVME_CMD_EFFECTS_NCC)) {

		nvme_queue_scan(ctrl);

		flush_work(&ctrl->scan_work);
@@ -3280,6 +3283,7 @@ int nvme_init_ctrl_finish(struct nvme_ctrl *ctrl, bool was_suspended) 
			return ret;

	}



	clear_bit(NVME_CTRL_DIRTY_CAPABILITY, &ctrl->flags);

	ctrl->identified = true;



	return 0;

drivers/nvme/host/nvme.h

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ enum nvme_ctrl_flags { 
	NVME_CTRL_STARTED_ONCE		= 2,

	NVME_CTRL_STOPPED		= 3,

	NVME_CTRL_SKIP_ID_CNS_CS	= 4,

	NVME_CTRL_DIRTY_CAPABILITY	= 5,

};



struct nvme_ctrl {