Skip to contentSkip to conversation

NVMe: Add SCSI VPD Block Limits Translation

PATCH New Keith Busch 3 participants 7 messages Dec 5, 2014 – Dec 17, 2014

Subsystems (2)
Block layer NVMe
lore
Share & tools
lore

Keith Busch

author
#0 lore raw

PATCH 1/1 NVMe: Add SCSI VPD Block Limits Translation

This adds the translation for Inquriy VPD page b0 in accordance with the translation reference.

Signed-off-by Keith Busch <keith.busch at intel.com>
---
 drivers/block/nvme-scsi.c |   28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)
drivers/block/nvme-scsi.c +27 -1
index d194ac2..85c4dab 100644
@@ -55,6 +55,7 @@ static int sg_version_num = 30534;	/* 2 digits for each component */
 #define VPD_SERIAL_NUMBER				0x80
 #define VPD_DEVICE_IDENTIFIERS				0x83
 #define VPD_EXTENDED_INQUIRY				0x86
+#define VPD_BLOCK_LIMITS				0xB0
 #define VPD_BLOCK_DEV_CHARACTERISTICS			0xB1
 
 /* CDB offsets */

@@ -132,9 +133,10 @@ static int sg_version_num = 30534;	/* 2 digits for each component */
 #define INQ_UNIT_SERIAL_NUMBER_PAGE			0x80
 #define INQ_DEVICE_IDENTIFICATION_PAGE			0x83
 #define INQ_EXTENDED_INQUIRY_DATA_PAGE			0x86
+#define INQ_BDEV_LIMITS_PAGE				0xB0
 #define INQ_BDEV_CHARACTERISTICS_PAGE			0xB1
 #define INQ_SERIAL_NUMBER_LENGTH			0x14
-#define INQ_NUM_SUPPORTED_VPD_PAGES			5
+#define INQ_NUM_SUPPORTED_VPD_PAGES			6
 #define VERSION_SPC_4					0x06
 #define ACA_UNSUPPORTED					0
 #define STANDARD_INQUIRY_LENGTH				36

@@ -747,6 +749,7 @@ static int nvme_trans_supported_vpd_pages(struct nvme_ns *ns,
 	inq_response[6] = INQ_DEVICE_IDENTIFICATION_PAGE;
 	inq_response[7] = INQ_EXTENDED_INQUIRY_DATA_PAGE;
 	inq_response[8] = INQ_BDEV_CHARACTERISTICS_PAGE;
+	inq_response[9] = INQ_BDEV_LIMITS_PAGE;
 
 	xfer_len = min(alloc_len, STANDARD_INQUIRY_LENGTH);
 	res = nvme_trans_copy_to_user(hdr, inq_response, xfer_len);

@@ -956,6 +959,25 @@ static int nvme_trans_ext_inq_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
 	return res;
 }
 
+static int nvme_trans_bdev_limits_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
+					u8 *inq_response, int alloc_len)
+{
+	__be32 max_sectors = cpu_to_be32(queue_max_hw_sectors(ns->queue));
+	__be32 max_discard = cpu_to_be32(ns->queue->limits.max_discard_sectors);
+	__be32 discard_desc_count = cpu_to_be32(0x100);
+
+	memset(inq_response, 0, STANDARD_INQUIRY_LENGTH);
+	inq_response[1] = VPD_BLOCK_LIMITS;
+	inq_response[3] = 0x3c; /* Page Length */
+	memcpy(&inq_response[8], &max_sectors, sizeof(u32));
+	memcpy(&inq_response[20], &max_discard, sizeof(u32));
+
+	if (max_discard)
+		memcpy(&inq_response[24], &discard_desc_count, sizeof(u32));
+
+	return nvme_trans_copy_to_user(hdr, inq_response, 0x3c);
+}
+
 static int nvme_trans_bdev_char_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
 					int alloc_len)
 {

@@ -2286,6 +2308,10 @@ static int nvme_trans_inquiry(struct nvme_ns *ns, struct sg_io_hdr *hdr,
 		case VPD_EXTENDED_INQUIRY:
 			res = nvme_trans_ext_inq_page(ns, hdr, alloc_len);
 			break;
+		case VPD_BLOCK_LIMITS:
+			res = nvme_trans_bdev_limits_page(ns, hdr, inq_response,
+								alloc_len);
+			break;
 		case VPD_BLOCK_DEV_CHARACTERISTICS:
 			res = nvme_trans_bdev_char_page(ns, hdr, alloc_len);
 			break;
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH v2 1/1 NVMe: Update SCSI Inquiry VPD 83 translation

The original translation reference resulted in collisions on VPD 83 for many devices today. Later specification revisions provided other ways to translate based on the device's specification revision to create different identifiers.

For 1.1 compliant devices, this patch will use the EUI64 field to create a unique NAA registered identifier. If 1.0, the SCSI Name String format is required to generate unique bits.

This fixes reported problems with customer device managers, but this is going to be even more important when multipath capable nvme devices become more common.

Signed-off-by Keith Busch <keith.busch at intel.com>

---
v1->v2: Used a macro for the NVMe version and fixed commit log typos.

 drivers/block/nvme-scsi.c |   94 ++++++++++++++++++++++++++++++---------------
 include/uapi/linux/nvme.h |    2 +
 2 files changed, 64 insertions(+), 32 deletions(-)
drivers/block/nvme-scsi.c +62 -32
index 046ae33..d194ac2 100644
@@ -782,11 +782,10 @@ static int nvme_trans_device_id_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
 	struct nvme_id_ctrl *id_ctrl;
 	int res = SNTI_TRANSLATION_SUCCESS;
 	int nvme_sc;
-	u8 ieee[4];
 	int xfer_len;
 	__be32 tmp_id = cpu_to_be32(ns->ns_id);
 
-	mem = dma_alloc_coherent(&dev->pci_dev->dev, sizeof(struct nvme_id_ns),
+	mem = dma_alloc_coherent(&dev->pci_dev->dev, 4096,
 					&dma_addr, GFP_KERNEL);
 	if (mem == NULL) {
 		res = -ENOMEM;

@@ -804,40 +803,71 @@ static int nvme_trans_device_id_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
 	}
 	id_ctrl = mem;
 
-	/* Since SCSI tried to save 4 bits... [SPC-4(r34) Table 591] */
-	ieee[0] = id_ctrl->ieee[0] << 4;
-	ieee[1] = id_ctrl->ieee[0] >> 4 | id_ctrl->ieee[1] << 4;
-	ieee[2] = id_ctrl->ieee[1] >> 4 | id_ctrl->ieee[2] << 4;
-	ieee[3] = id_ctrl->ieee[2] >> 4;
-
-	memset(inq_response, 0, STANDARD_INQUIRY_LENGTH);
+	memset(inq_response, 0, alloc_len);
 	inq_response[1] = INQ_DEVICE_IDENTIFICATION_PAGE;    /* Page Code */
-	inq_response[3] = 20;      /* Page Length */
-	/* Designation Descriptor start */
-	inq_response[4] = 0x01;    /* Proto ID=0h | Code set=1h */
-	inq_response[5] = 0x03;    /* PIV=0b | Asso=00b | Designator Type=3h */
-	inq_response[6] = 0x00;    /* Rsvd */
-	inq_response[7] = 16;      /* Designator Length */
-	/* Designator start */
-	inq_response[8] = 0x60 | ieee[3]; /* NAA=6h | IEEE ID MSB, High nibble*/
-	inq_response[9] = ieee[2];        /* IEEE ID */
-	inq_response[10] = ieee[1];       /* IEEE ID */
-	inq_response[11] = ieee[0];       /* IEEE ID| Vendor Specific ID... */
-	inq_response[12] = (dev->pci_dev->vendor & 0xFF00) >> 8;
-	inq_response[13] = (dev->pci_dev->vendor & 0x00FF);
-	inq_response[14] = dev->serial[0];
-	inq_response[15] = dev->serial[1];
-	inq_response[16] = dev->model[0];
-	inq_response[17] = dev->model[1];
-	memcpy(&inq_response[18], &tmp_id, sizeof(u32));
-	/* Last 2 bytes are zero */
 
-	xfer_len = min(alloc_len, STANDARD_INQUIRY_LENGTH);
+	if (readl(&dev->bar->vs) >= NVME_VERSION(1, 1)) {
+		/* 1.1 requires EUI64 */
+		struct nvme_id_ns *id_ns = mem;
+		u8 ieee[4];
+
+		nvme_sc = nvme_identify(dev, ns->ns_id, 0, dma_addr);
+		res = nvme_trans_status_code(hdr, nvme_sc);
+		if (res)
+			goto out_free;
+		if (nvme_sc) {
+			res = nvme_sc;
+			goto out_free;
+		}
+
+		/* Since SCSI tried to save 4 bits... [SPC-4(r34) Table 591] */
+		ieee[0] = id_ctrl->ieee[0] << 4;
+		ieee[1] = id_ctrl->ieee[0] >> 4 | id_ctrl->ieee[1] << 4;
+		ieee[2] = id_ctrl->ieee[1] >> 4 | id_ctrl->ieee[2] << 4;
+		ieee[3] = id_ctrl->ieee[2] >> 4;
+
+		inq_response[3] = 0x14;    /* Page Length */
+		/* Designation Descriptor start */
+		inq_response[4] = 0x01;    /* Proto ID=0h | Code set=1h */
+		inq_response[5] = 0x03;    /* PIV=0b | Asso=00b | Designator Type=3h */
+		inq_response[6] = 0x03;    /* Rsvd */
+		inq_response[7] = 0x10;    /* Designator Length */
+
+		/* Designator start */
+		inq_response[8] = 0x60 | ieee[3]; /* NAA=6h | IEEE ID MSB, High nibble*/
+		inq_response[9] = ieee[2];        /* IEEE ID */
+		inq_response[10] = ieee[1];       /* IEEE ID */
+		inq_response[11] = ieee[0];       /* IEEE ID| Vendor Specific ID... */
+		memcpy(&inq_response[12], id_ns->eui64, sizeof(id_ns->eui64));
+	} else {
+		u16 vid = dev->pci_dev->vendor;
+
+		if (alloc_len < 72) {
+			res = nvme_trans_completion(hdr,
+					SAM_STAT_CHECK_CONDITION,
+					ILLEGAL_REQUEST, SCSI_ASC_INVALID_CDB,
+					SCSI_ASCQ_CAUSE_NOT_REPORTABLE);
+			goto out_free;
+		}
+
+		inq_response[3] = 0x48;    /* Page Length */
+		/* Designation Descriptor start */
+		inq_response[4] = 0x03;    /* Proto ID=0h | Code set=3h */
+		inq_response[5] = 0x08;    /* PIV=0b | Asso=00b | Designator Type=8h */
+		inq_response[6] = 0x00;    /* Rsvd */
+		inq_response[7] = 0x44;    /* Designator Length */
+
+		sprintf(&inq_response[8], "%04x", vid);
+		memcpy(&inq_response[12], dev->model, sizeof(dev->model));
+		sprintf(&inq_response[52], "%04x", tmp_id);
+		memcpy(&inq_response[56], dev->serial, sizeof(dev->serial));
+	}
+
+	xfer_len = alloc_len;
 	res = nvme_trans_copy_to_user(hdr, inq_response, xfer_len);
 
  out_free:
-	dma_free_coherent(&dev->pci_dev->dev, sizeof(struct nvme_id_ns), mem,
-			  dma_addr);
+	dma_free_coherent(&dev->pci_dev->dev, 4096, mem, dma_addr);
  out_dma:
 	return res;
 }

@@ -2222,7 +2252,7 @@ static int nvme_trans_inquiry(struct nvme_ns *ns, struct sg_io_hdr *hdr,
 	page_code = GET_INQ_PAGE_CODE(cmd);
 	alloc_len = GET_INQ_ALLOC_LENGTH(cmd);
 
-	inq_response = kmalloc(STANDARD_INQUIRY_LENGTH, GFP_KERNEL);
+	inq_response = kmalloc(alloc_len, GFP_KERNEL);
 	if (inq_response == NULL) {
 		res = -ENOMEM;
 		goto out_mem;
include/uapi/linux/nvme.h +2 -0
index 26386cf..1f7ef1a 100644
@@ -556,4 +556,6 @@ struct nvme_passthru_cmd {
 #define NVME_IOCTL_SUBMIT_IO	_IOW('N', 0x42, struct nvme_user_io)
 #define NVME_IOCTL_IO_CMD	_IOWR('N', 0x43, struct nvme_passthru_cmd)
 
+#define NVME_VERSION(major, minor) (((major) << 16) | ((minor) << 8))
+
 #endif /* _UAPI_LINUX_NVME_H */
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH v2 1/1 NVMe: Update SCSI Inquiry VPD 83 translation

Quoted 13 lines · Keith Busch
drivers/block/nvme-scsi.c +13 -0
+		/* 1.1 requires EUI64 */
+		struct nvme_id_ns *id_ns = mem;
+		u8 ieee[4];
+
+		nvme_sc = nvme_identify(dev, ns->ns_id, 0, dma_addr);
+		res = nvme_trans_status_code(hdr, nvme_sc);
+		if (res)
+			goto out_free;
+		if (nvme_sc) {
+			res = nvme_sc;
+			goto out_free;
+		}
+

drivers/block/nvme-scsi.c static int nvme_trans_device_id_page(struct nvme_ns *ns, struct sg_io_hdr *hdr, · line 832

Quoted 10 lines
drivers/block/nvme-scsi.c +10 -0
+		/* Since SCSI tried to save 4 bits... [SPC-4(r34) Table 591] */
+		ieee[0] = id_ctrl->ieee[0] << 4;
+		ieee[1] = id_ctrl->ieee[0] >> 4 | id_ctrl->ieee[1] << 4;
+		ieee[2] = id_ctrl->ieee[1] >> 4 | id_ctrl->ieee[2] << 4;
+		ieee[3] = id_ctrl->ieee[2] >> 4;
+
+		inq_response[3] = 0x14;    /* Page Length */
+		/* Designation Descriptor start */
+		inq_response[4] = 0x01;    /* Proto ID=0h | Code set=1h */
+		inq_response[5] = 0x03;    /* PIV=0b | Asso=00b | Designator Type=3h */

We have an EUI64, but we're trying to return an NAA descriptor ... why not just return an EUI64 descriptor instead? ie:

inq_response[5] = 0x02;
And then we don't need to muck around with the ieee[] array at all, and can just copy the EUI64 into inq_response ... right?

drivers/block/nvme-scsi.c static int nvme_trans_device_id_page(struct nvme_ns *ns, struct sg_io_hdr *hdr, · line 833

Quoted 1 line
drivers/block/nvme-scsi.c +1 -0
+		inq_response[6] = 0x03;    /* Rsvd */

... should be 0 since it's reserved, right?

Quoted 70 lines
drivers/block/nvme-scsi.c +35 -3
+		inq_response[7] = 0x10;    /* Designator Length */
+
+		/* Designator start */
+		inq_response[8] = 0x60 | ieee[3]; /* NAA=6h | IEEE ID MSB, High nibble*/
+		inq_response[9] = ieee[2];        /* IEEE ID */
+		inq_response[10] = ieee[1];       /* IEEE ID */
+		inq_response[11] = ieee[0];       /* IEEE ID| Vendor Specific ID... */
+		memcpy(&inq_response[12], id_ns->eui64, sizeof(id_ns->eui64));
+	} else {
+		u16 vid = dev->pci_dev->vendor;
+
+		if (alloc_len < 72) {
+			res = nvme_trans_completion(hdr,
+					SAM_STAT_CHECK_CONDITION,
+					ILLEGAL_REQUEST, SCSI_ASC_INVALID_CDB,
+					SCSI_ASCQ_CAUSE_NOT_REPORTABLE);
+			goto out_free;
+		}
+
+		inq_response[3] = 0x48;    /* Page Length */
+		/* Designation Descriptor start */
+		inq_response[4] = 0x03;    /* Proto ID=0h | Code set=3h */
+		inq_response[5] = 0x08;    /* PIV=0b | Asso=00b | Designator Type=8h */
+		inq_response[6] = 0x00;    /* Rsvd */
+		inq_response[7] = 0x44;    /* Designator Length */
+
+		sprintf(&inq_response[8], "%04x", vid);
+		memcpy(&inq_response[12], dev->model, sizeof(dev->model));
+		sprintf(&inq_response[52], "%04x", tmp_id);
+		memcpy(&inq_response[56], dev->serial, sizeof(dev->serial));
+	}
+
+	xfer_len = alloc_len;
 	res = nvme_trans_copy_to_user(hdr, inq_response, xfer_len);
 
  out_free:
-	dma_free_coherent(&dev->pci_dev->dev, sizeof(struct nvme_id_ns), mem,
-			  dma_addr);
+	dma_free_coherent(&dev->pci_dev->dev, 4096, mem, dma_addr);
  out_dma:
 	return res;
 }

@@ -2222,7 +2252,7 @@ static int nvme_trans_inquiry(struct nvme_ns *ns, struct sg_io_hdr *hdr,
 	page_code = GET_INQ_PAGE_CODE(cmd);
 	alloc_len = GET_INQ_ALLOC_LENGTH(cmd);
 
-	inq_response = kmalloc(STANDARD_INQUIRY_LENGTH, GFP_KERNEL);
+	inq_response = kmalloc(alloc_len, GFP_KERNEL);
 	if (inq_response == NULL) {
 		res = -ENOMEM;
 		goto out_mem;
include/uapi/linux/nvme.h +2 -0
index 26386cf..1f7ef1a 100644
@@ -556,4 +556,6 @@ struct nvme_passthru_cmd {
 #define NVME_IOCTL_SUBMIT_IO	_IOW('N', 0x42, struct nvme_user_io)
 #define NVME_IOCTL_IO_CMD	_IOWR('N', 0x43, struct nvme_passthru_cmd)
 
+#define NVME_VERSION(major, minor) (((major) << 16) | ((minor) << 8))
+
 #endif /* _UAPI_LINUX_NVME_H */
Signature · 7 lines
1.7.10.4


_______________________________________________
Linux-nvme mailing list
Linux-nvme at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
author
#3 lore raw

PATCH v2 1/1 NVMe: Update SCSI Inquiry VPD 83 translation

Quoted 28 lines · Matthew Wilcox
Quoted 13 lines · Keith Busch
drivers/block/nvme-scsi.c +13 -0
+		/* 1.1 requires EUI64 */
+		struct nvme_id_ns *id_ns = mem;
+		u8 ieee[4];
+
+		nvme_sc = nvme_identify(dev, ns->ns_id, 0, dma_addr);
+		res = nvme_trans_status_code(hdr, nvme_sc);
+		if (res)
+			goto out_free;
+		if (nvme_sc) {
+			res = nvme_sc;
+			goto out_free;
+		}
+

drivers/block/nvme-scsi.c static int nvme_trans_device_id_page(struct nvme_ns *ns, struct sg_io_hdr *hdr, · line 832

Quoted 10 lines
drivers/block/nvme-scsi.c +10 -0
+		/* Since SCSI tried to save 4 bits... [SPC-4(r34) Table 591] */
+		ieee[0] = id_ctrl->ieee[0] << 4;
+		ieee[1] = id_ctrl->ieee[0] >> 4 | id_ctrl->ieee[1] << 4;
+		ieee[2] = id_ctrl->ieee[1] >> 4 | id_ctrl->ieee[2] << 4;
+		ieee[3] = id_ctrl->ieee[2] >> 4;
+
+		inq_response[3] = 0x14;    /* Page Length */
+		/* Designation Descriptor start */
+		inq_response[4] = 0x01;    /* Proto ID=0h | Code set=1h */
+		inq_response[5] = 0x03;    /* PIV=0b | Asso=00b | Designator Type=3h */

We have an EUI64, but we're trying to return an NAA descriptor ... why not just return an EUI64 descriptor instead? ie:

Quoted 3 lines

inq_response[5] = 0x02;
And then we don't need to muck around with the ieee[] array at all, and can just copy the EUI64 into inq_response ... right?

That makes more sense, so I'll send a v3 of this patch. The translation spec does not provide EUI as a valid translation, so I'll send a proposal to the sub-committee as well.

Could you clarify something from specifications so I get this right on the next revision? The EUI64 was an 'M' field in 1.1, but 'O' in 1.2. I read the spec to require a 1.2 device use either EUI64 or NGUID but not both. For 1.1, I think I can assume EUI64 is okay. Would it be sufficient for 1.2 to memcmp() the fields with a zero'ed buffer to know which one the namespace implements? Or is it possible that neither is implemented and I have to fall back to the SCSI name string designator type?

Now that I'm looking at the name string type again, the translation looks broken for 1.0 devices: SPC-4 says the first for bytes are either 'eui.', 'naa.' or 'iqn.', but the translation has it as the UTF-8 representation of the vendor ID.

Quoted 3 lines

drivers/block/nvme-scsi.c static int nvme_trans_device_id_page(struct nvme_ns *ns, struct sg_io_hdr *hdr, · line 833

Quoted 1 line
drivers/block/nvme-scsi.c +1 -0
+		inq_response[6] = 0x03;    /* Rsvd */

... should be 0 since it's reserved, right?

right.

#4 lore raw

PATCH v2 1/1 NVMe: Update SCSI Inquiry VPD 83 translation

Quoted 10 lines · Keith Busch
Quoted 6 lines

We have an EUI64, but we're trying to return an NAA descriptor ... why not just return an EUI64 descriptor instead? ie:

inq_response[5] = 0x02;
And then we don't need to muck around with the ieee[] array at all, and can just copy the EUI64 into inq_response ... right?

That makes more sense, so I'll send a v3 of this patch. The translation spec does not provide EUI as a valid translation, so I'll send a proposal to the sub-committee as well.

*sigh*. It was supposed to.

Quoted 7 lines

Could you clarify something from specifications so I get this right on the next revision? The EUI64 was an 'M' field in 1.1, but 'O' in 1.2. I read the spec to require a 1.2 device use either EUI64 or NGUID but not both. For 1.1, I think I can assume EUI64 is okay. Would it be sufficient for 1.2 to memcmp() the fields with a zero'ed buffer to know which one the namespace implements? Or is it possible that neither is implemented and I have to fall back to the SCSI name string designator type?

The namespace is supposed to support at least one; the idea is that drives with fixed namespaces use EUI64, drives which dynammically allocate namespaces use NGUID. Rather than doing memcmp(), can I suggest using bitmap_empty() to determine if the EUI64 is all zeroes?

Quoted 4 lines

Now that I'm looking at the name string type again, the translation looks broken for 1.0 devices: SPC-4 says the first for bytes are either 'eui.', 'naa.' or 'iqn.', but the translation has it as the UTF-8 representation of the vendor ID.

That sounds like a questoin for the spec wranglers :-(

#5 lore raw

PATCH 1/1 NVMe: Add SCSI VPD Block Limits Translation

In reply to Keith Busch
Quoted 24 lines · Keith Busch

This adds the translation for Inquriy VPD page b0 in accordance with the translation reference.

Signed-off-by Keith Busch <keith.busch at intel.com>
---
 drivers/block/nvme-scsi.c |   28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)
drivers/block/nvme-scsi.c +1 -0
index d194ac2..85c4dab 100644
@@ -55,6 +55,7 @@ static int sg_version_num = 30534;    /* 2 digits for each component */
 #define VPD_SERIAL_NUMBER                              0x80
 #define VPD_DEVICE_IDENTIFIERS                         0x83
 #define VPD_EXTENDED_INQUIRY                           0x86
+#define VPD_BLOCK_LIMITS                               0xB0
 #define VPD_BLOCK_DEV_CHARACTERISTICS                  0xB1

/* CDB offsets */

drivers/block/nvme-scsi.c +0 -0
@@ -132,9 +133,10 @@ static int sg_version_num = 30534; /* 2 digits for each component */
 #define INQ_UNIT_SERIAL_NUMBER_PAGE                    0x80

drivers/block/nvme-scsi.c static int sg_version_num = 30534; /* 2 digits for each component */ · line 142

Quoted 10 lines
drivers/block/nvme-scsi.c +2 -1
 #define INQ_DEVICE_IDENTIFICATION_PAGE                 0x83
 #define INQ_EXTENDED_INQUIRY_DATA_PAGE                 0x86
+#define INQ_BDEV_LIMITS_PAGE                           0xB0
 #define INQ_BDEV_CHARACTERISTICS_PAGE                  0xB1
 #define INQ_SERIAL_NUMBER_LENGTH                       0x14
-#define INQ_NUM_SUPPORTED_VPD_PAGES                    5
+#define INQ_NUM_SUPPORTED_VPD_PAGES                    6
 #define VERSION_SPC_4                                  0x06
 #define ACA_UNSUPPORTED                                        0
 #define STANDARD_INQUIRY_LENGTH                                36

Are there any specific reasons for the above SPC-4 stuff to be defined in the nvme driver instead of include/scsi where it seems to (naturally) belong? Just my 0.02 :).

Regards,
Andrey

Quoted 53 lines
drivers/block/nvme-scsi.c +24 -1
@@ -747,6 +749,7 @@ static int nvme_trans_supported_vpd_pages(struct nvme_ns *ns,
        inq_response[6] = INQ_DEVICE_IDENTIFICATION_PAGE;
        inq_response[7] = INQ_EXTENDED_INQUIRY_DATA_PAGE;
        inq_response[8] = INQ_BDEV_CHARACTERISTICS_PAGE;
+       inq_response[9] = INQ_BDEV_LIMITS_PAGE;
 
        xfer_len = min(alloc_len, STANDARD_INQUIRY_LENGTH);
        res = nvme_trans_copy_to_user(hdr, inq_response, xfer_len);

@@ -956,6 +959,25 @@ static int nvme_trans_ext_inq_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
        return res;
 }
 
+static int nvme_trans_bdev_limits_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
+                                       u8 *inq_response, int alloc_len)
+{
+       __be32 max_sectors = cpu_to_be32(queue_max_hw_sectors(ns->queue));
+       __be32 max_discard = cpu_to_be32(ns->queue->limits.max_discard_sectors);
+       __be32 discard_desc_count = cpu_to_be32(0x100);
+
+       memset(inq_response, 0, STANDARD_INQUIRY_LENGTH);
+       inq_response[1] = VPD_BLOCK_LIMITS;
+       inq_response[3] = 0x3c; /* Page Length */
+       memcpy(&inq_response[8], &max_sectors, sizeof(u32));
+       memcpy(&inq_response[20], &max_discard, sizeof(u32));
+
+       if (max_discard)
+               memcpy(&inq_response[24], &discard_desc_count, sizeof(u32));
+
+       return nvme_trans_copy_to_user(hdr, inq_response, 0x3c);
+}
+
 static int nvme_trans_bdev_char_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
                                        int alloc_len)
 {

@@ -2286,6 +2308,10 @@ static int nvme_trans_inquiry(struct nvme_ns *ns, struct sg_io_hdr *hdr,
                case VPD_EXTENDED_INQUIRY:
                        res = nvme_trans_ext_inq_page(ns, hdr, alloc_len);
                        break;
+               case VPD_BLOCK_LIMITS:
+                       res = nvme_trans_bdev_limits_page(ns, hdr, inq_response,
+                                                               alloc_len);
+                       break;
                case VPD_BLOCK_DEV_CHARACTERISTICS:
                        res = nvme_trans_bdev_char_page(ns, hdr, alloc_len);
                        break;
--

1.7.10.4

_______________________________________________
Linux-nvme mailing list
Linux-nvme at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

author
#6 lore raw

PATCH 1/1 NVMe: Add SCSI VPD Block Limits Translation

Quoted 10 lines · Andrey Kuzmin

drivers/block/nvme-scsi.c static int sg_version_num = 30534; /* 2 digits for each component */ · line 142

Quoted 5 lines · Keith Busch
drivers/block/nvme-scsi.c +1 -1
-#define INQ_NUM_SUPPORTED_VPD_PAGES                    5
+#define INQ_NUM_SUPPORTED_VPD_PAGES                    6
 #define VERSION_SPC_4                                  0x06
 #define ACA_UNSUPPORTED                                        0
 #define STANDARD_INQUIRY_LENGTH                                36

Are there any specific reasons for the above SPC-4 stuff to be defined in the nvme driver instead of include/scsi where it seems to (naturally) belong? Just my 0.02 :).

There is a lot of scsi cruft in the nvme driver, but I'm sticking to the local convention here until a refactor (which is coming later!).