Skip to contentSkip to conversation

nvme: enable generic interface (/dev/ngX) for unknown command sets

PATCH In review Kanchan Joshi 3 participants 3 messages Mar 25, 2022 – Mar 28, 2022 1 message not in the archive NVMe

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): CGME20220325111952epcas5p4800055294fe473b923713d4b9c006026@epcas5p4.samsung.com

#1 lore raw

PATCH 1/1 nvme: enable generic interface (/dev/ngX) for unknown command sets

block and char interface do not show up for any command set other than NVM and ZNS.
Allow namespace setup to take place, and char interface to come up for unknown command sets. Hide the block-interface for such command sets.

---
This is prepared against linux-block/for-next.
On top of commit e529e21f317 ("Merge branch 'for-5.18/io_uring' into for-next")

 drivers/nvme/host/core.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/nvme/host/core.c +15 -5
index 677fa4bf76d3..3e5d9a3f4167 100644
@@ -1875,7 +1875,7 @@ static void nvme_set_chunk_sectors(struct nvme_ns *ns, struct nvme_id_ns *id)
 static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id)
 {
 	unsigned lbaf = nvme_lbaf_index(id->flbas);
-	int ret;
+	int ret = 0;
 
 	blk_mq_freeze_queue(ns->disk->queue);
 	ns->lba_shift = id->lbaf[lbaf].ds;
@@ -1885,11 +1885,13 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id)
 	nvme_set_chunk_sectors(ns, id);
 	nvme_update_disk_info(ns->disk, ns, id);
 
-	if (ns->head->ids.csi == NVME_CSI_ZNS) {
+	if (ns->head->ids.csi == NVME_CSI_ZNS)
 		ret = nvme_update_zone_info(ns, lbaf);
-		if (ret)
-			goto out_unfreeze;
-	}
+	else if (ns->head->ids.csi != NVME_CSI_NVM)
+		/* suppress block-interface for unknown command-sets */
+		ret = -ENODEV;
+	if (ret)
+		goto out_unfreeze;
 
 	set_bit(NVME_NS_READY, &ns->flags);
 	blk_mq_unfreeze_queue(ns->disk->queue);
@@ -4098,6 +4100,14 @@ static void nvme_validate_or_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
 	default:
 		dev_warn(ctrl->device, "unknown csi %u for nsid %u\n",
 			ids.csi, nsid);
+		if (!nvme_multi_css(ctrl)) {
+			dev_warn(ctrl->device,
+				"command set not reported for nsid: %d\n",
+				nsid);
+			break;
+		}
+		/* required to enable char-interface for unknown command sets*/
+		nvme_alloc_ns(ctrl, nsid, &ids);
 		break;
 	}
 }
Signature · 1 line
2.25.1
#2 lore raw

drivers/nvme/host/core.c static void nvme_set_chunk_sectors(struct nvme_ns *ns, struct nvme_id_ns *id) · line 1881

Quoted 13 lines · Kanchan Joshi
drivers/nvme/host/core.c +1 -1
index 677fa4bf76d3..3e5d9a3f4167 100644
@@ -1875,7 +1875,7 @@ static void nvme_set_chunk_sectors(struct nvme_ns *ns, struct nvme_id_ns *id)
 static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id)
 {
 	unsigned lbaf = nvme_lbaf_index(id->flbas);
-	int ret;
+	int ret = 0;
 
 	blk_mq_freeze_queue(ns->disk->queue);
 	ns->lba_shift = id->lbaf[lbaf].ds;

nvme_update_ns_info can't really work for arbitrary command sets as the concept of LBA sizes and format doesn't apply there. So we'll need a different stubbed out version that doesn't deal with the block interface at all.

drivers/nvme/host/core.c static void nvme_validate_or_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) · line 4108

Quoted 10 lines
drivers/nvme/host/core.c +6 -0
@@ -4098,6 +4100,14 @@ static void nvme_validate_or_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
 	default:
 		dev_warn(ctrl->device, "unknown csi %u for nsid %u\n",
 			ids.csi, nsid);
+		if (!nvme_multi_css(ctrl)) {
+			dev_warn(ctrl->device,
+				"command set not reported for nsid: %d\n",
+				nsid);
+			break;
+		}

Given that the NVM command set has a CSI of 0 getting random garbage here sounds unlikely. That being said if we want to support passthrough for unknown command sets the warning above should probably go away above as well.

drivers/nvme/host/core.c static void nvme_validate_or_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) · line 4110

Quoted 2 lines
drivers/nvme/host/core.c +2 -0
+		/* required to enable char-interface for unknown command sets*/
+		nvme_alloc_ns(ctrl, nsid, &ids);

And this can't really work as nvme_alloc_ns looks at the Identify Namespace structure for the NVM command set which can't really work for arbitrary command sets. We'll need a nvme_alloc_ns_generic instead that looks at the Command Set Independent Identify Namespace structure for a few things like namespace sharing capability and does just the basic work to get the passthrough interface up.