Skip to contentSkip to conversation

nvme: skip optional id ctrl csi if it failed

PATCH In review Keith Busch 3 participants 3 messages May 30, 2023 – Jun 5, 2023 NVMe

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvme: skip optional id ctrl csi if it failed

From: Keith Busch <[email protected]>

I frequently recieved report is the driver requests the optional Command Set Specific Identify Controller structure. Some controllers report this in their error log, which tiggers other warnings to user space monitoring the devices.

These error entries are harmless and of questionable value to save in the log, but let's reduce their occurance by not resending the command if it previously failed.

---
 drivers/nvme/host/core.c | 5 ++++-
 drivers/nvme/host/nvme.h | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/nvme/host/core.c +4 -1
index 1f0cbb77b2493..0fe8d9c18759a 100644
@@ -3064,7 +3064,8 @@ static int nvme_init_non_mdts_limits(struct nvme_ctrl *ctrl)
 		ctrl->max_zeroes_sectors = 0;
 
 	if (ctrl->subsys->subtype != NVME_NQN_NVME ||
-	    nvme_ctrl_limited_cns(ctrl))
+	    nvme_ctrl_limited_cns(ctrl) ||
+	    test_bit(NVME_CTRL_SKIP_ID_CNS_CS, ctrl->flags))
 		return 0;
 
 	id = kzalloc(sizeof(*id), GFP_KERNEL);
@@ -3086,6 +3087,8 @@ static int nvme_init_non_mdts_limits(struct nvme_ctrl *ctrl)
 		ctrl->max_zeroes_sectors = nvme_mps_to_sectors(ctrl, id->wzsl);
 
 free_data:
+	if (ret > 0)
+		set_bit(NVME_CTRL_SKIP_ID_CNS_CS, ctrl->flags);
 	kfree(id);
 	return ret;
 }
drivers/nvme/host/nvme.h +1 -0
index a2d4f59e0535a..2f11f1d9a85ac 100644
@@ -247,6 +247,7 @@ enum nvme_ctrl_flags {
 	NVME_CTRL_ADMIN_Q_STOPPED	= 1,
 	NVME_CTRL_STARTED_ONCE		= 2,
 	NVME_CTRL_STOPPED		= 3,
+	NVME_CTRL_SKIP_ID_CNS_CS	= 4,
 };
 
 struct nvme_ctrl {
Signature · 1 line
2.34.1