Skip to contentSkip to conversation

NVMe: Fix VPD B0 max sectors translation

PATCH New Keith Busch 2 participants 2 messages Apr 23, 2015

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

Keith Busch

author
#0 lore raw

PATCH 1/1 NVMe: Fix VPD B0 max sectors translation

Use the namespace's block format for reporting the max transfer length.

Max unmap count is left as-is since NVMe doesn't provide a max, so the value the driver provided the block layer is valid for any format.

Reported-by Martin K. Petersen <martin.petersen at oracle.com>
Signed-off-by Keith Busch <keith.busch at intel.com>
---
 drivers/block/nvme-scsi.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/block/nvme-scsi.c +2 -1
index 6b736b0..88f13c5 100644
@@ -944,7 +944,8 @@ static int nvme_trans_ext_inq_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
 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_sectors = cpu_to_be32(
+		nvme_block_nr(ns, 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);
Signature · 1 line
1.7.10.4
maintainer
#1 lore raw

PATCH 1/1 NVMe: Fix VPD B0 max sectors translation

Quoted 16 lines · Keith Busch

Use the namespace's block format for reporting the max transfer length.

Max unmap count is left as-is since NVMe doesn't provide a max, so the value the driver provided the block layer is valid for any format.

Reported-by Martin K. Petersen <martin.petersen at oracle.com>
Signed-off-by Keith Busch <keith.busch at intel.com>
---
  drivers/block/nvme-scsi.c |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
drivers/block/nvme-scsi.c +0 -0
index 6b736b0..88f13c5 100644

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

Quoted 8 lines
drivers/block/nvme-scsi.c +2 -1
@@ -944,7 +944,8 @@ static int nvme_trans_ext_inq_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
  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_sectors = cpu_to_be32(
+		nvme_block_nr(ns, 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);

Applied for 4.1, thanks.

Signature · 1 line
Jens Axboe