Skip to contentSkip to conversation

nvme: validate cntlid's only for nvme >= 1.1.0

PATCH In review Maximilian Heyne 3 participants 5 messages Jun 30, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvme: validate cntlid's only for nvme >= 1.1.0

Controller ID's (cntlid) for NVMe devices were introduced in version 1.1.0 of the specification. Controllers that follow the older 1.0.0 spec don't set this field so it doesn't make sense to validate it. On the contrary, when using SR-IOV this check breaks VFs as they are all part of the same NVMe subsystem.

---
 drivers/nvme/host/core.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/nvme/host/core.c +3 -2
index 28f4388c1337..c4a991acc949 100644
@@ -2773,7 +2773,8 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
 		put_device(&subsys->dev);
 		subsys = found;
 
-		if (!nvme_validate_cntlid(subsys, ctrl, id)) {
+		if (ctrl->vs >= NVME_VS(1, 1, 0) &&
+		    !nvme_validate_cntlid(subsys, ctrl, id)) {
 			ret = -EINVAL;
 			goto out_put_subsystem;
 		}
@@ -2883,7 +2884,7 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)
 			goto out_free;
 	}
 
-	if (!(ctrl->ops->flags & NVME_F_FABRICS))
+	if (!(ctrl->ops->flags & NVME_F_FABRICS) && ctrl->vs >= NVME_VS(1, 1, 0))
 		ctrl->cntlid = le16_to_cpu(id->cntlid);
 
 	if (!ctrl->identified) {
Signature · 12 lines
2.16.6




Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879
#1 lore raw
Quoted 8 lines · Maximilian Heyne

Controller ID's (cntlid) for NVMe devices were introduced in version 1.1.0 of the specification. Controllers that follow the older 1.0.0 spec don't set this field so it doesn't make sense to validate it. On the contrary, when using SR-IOV this check breaks VFs as they are all part of the same NVMe subsystem.

The first hunk looks ok, the second doesn't make sense as fabrics was only added with NVMe 1.2.2. I can fix it up when applying if you are ok with that.

But you guys really shouldn't be doing SR-IOV with 1.0 controllers independent of this..

#2 lore raw
Quoted 10 lines · Christoph Hellwig
Quoted 8 lines · Maximilian Heyne

Controller ID's (cntlid) for NVMe devices were introduced in version 1.1.0 of the specification. Controllers that follow the older 1.0.0 spec don't set this field so it doesn't make sense to validate it. On the contrary, when using SR-IOV this check breaks VFs as they are all part of the same NVMe subsystem.

Quoted 6 lines

The first hunk looks ok, the second doesn't make sense as fabrics was only added with NVMe 1.2.2. I can fix it up when applying if you are ok with that.

But you guys really shouldn't be doing SR-IOV with 1.0 controllers independent of this..

And actually - 1.0 did not have the concept of a subsystem. So having a duplicate serial number for a 1.0 controller actually is a pretty nasty bug. Can you point me to this broken controller? Do you think the OEM could fix it up to report a proper version number and controller ID?

#3 lore raw
Quoted 8 lines · Christoph Hellwig
Quoted 7 lines · Christoph Hellwig
Quoted 6 lines · Maximilian Heyne

Controller ID's (cntlid) for NVMe devices were introduced in version 1.1.0 of the specification. Controllers that follow the older 1.0.0 spec don't set this field so it doesn't make sense to validate it. On the contrary, when using SR-IOV this check breaks VFs as they are all part of the same NVMe subsystem.

Quoted 6 lines
Quoted 6 lines
Quoted 2 lines

The first hunk looks ok, the second doesn't make sense as fabrics was only added with NVMe 1.2.2. I can fix it up when applying if you are ok with that.

I'd be totally ok with that.

Quoted 3 lines
Quoted 3 lines

But you guys really shouldn't be doing SR-IOV with 1.0 controllers independent of this..

So far it worked...

Quoted 7 lines

And actually - 1.0 did not have the concept of a subsystem. So having a duplicate serial number for a 1.0 controller actually is a pretty nasty bug. Can you point me to this broken controller? Do you think the OEM could fix it up to report a proper version number and controller ID?

I meant that the VF NVMe controllers will all land in the same subsystem from the kernel's point of view, because, as you said, there was no idea of different subsystems in the 1.0 spec.
It's an older in-house controller. Seems to set the same serial number for all VF's. Should the firmware set unique serials for the VF's instead?

Thanks
Max

Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879

maintainer
#4 lore raw
Quoted 11 lines · Maximilian Heyne
Quoted 6 lines · Christoph Hellwig

And actually - 1.0 did not have the concept of a subsystem. So having a duplicate serial number for a 1.0 controller actually is a pretty nasty bug. Can you point me to this broken controller? Do you think the OEM could fix it up to report a proper version number and controller ID?

I meant that the VF NVMe controllers will all land in the same subsystem from the kernel's point of view, because, as you said, there was no idea of different subsystems in the 1.0 spec.

Each controller should have landed in its own subsystem in this case rather than the same subsystem.

Quoted 2 lines

It's an older in-house controller. Seems to set the same serial number for all VF's. Should the firmware set unique serials for the VF's instead?

Yes, the driver shouldn't be finding duplicate serial numbers.