NVMe: Format fix when going from 4k sector size to 512 bytes

PATCH Superseded Jeff Lien 2 participants 2 messages Dec 15, 2017 – Dec 19, 2017 NVMe

Share & tools

Jeff Lien

author

2017-12-15 22:15 UTC #0 lore raw

PATCH v2 1/1 NVMe: Format fix when going from 4k sector size to 512 bytes

If you format a device with a 4k sector size back to 512 bytes, the queue limit values for physical block size and IO sizes were not getting updated; only the logical block size was being updated. This patch adds code to update the physical block and IO sizes.

Signed-off-by Jeff Lien <jeff.lien at wdc.com>

---
 drivers/nvme/host/core.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

drivers/nvme/host/core.c +6 -1

index f837d666cbd4..f289d30584c1 100644
@@ -1336,6 +1336,7 @@ static void nvme_update_disk_info(struct gendisk *disk,
 {
 	sector_t capacity = le64_to_cpup(&id->nsze) << (ns->lba_shift - 9);
 	unsigned stream_alignment = 0;
+	unsigned short bs;
 
 	if (ns->ctrl->nr_streams && ns->sws && ns->sgs)
 		stream_alignment = ns->sws * ns->sgs;

@@ -1343,7 +1344,11 @@ static void nvme_update_disk_info(struct gendisk *disk,
 	blk_mq_freeze_queue(disk->queue);
 	blk_integrity_unregister(disk);
 
-	blk_queue_logical_block_size(disk->queue, 1 << ns->lba_shift);
+	bs = 1 << ns->lba_shift;
+	blk_queue_logical_block_size(disk->queue, bs);
+	blk_queue_physical_block_size(disk->queue, bs);
+	blk_queue_io_min(disk->queue, bs);
+
 	if (ns->ms && !ns->ext &&
 	    (ns->ctrl->ops->flags & NVME_F_METADATA_SUPPORTED))
 		nvme_init_integrity(disk, ns->ms, ns->pi_type);

Signature · 1 line

2.14.2.746.g8fb8a94

Martin K. Petersen

2017-12-19 04:04 UTC #1 lore raw

PATCH v2 1/1 NVMe: Format fix when going from 4k sector size to 512 bytes

Jeff,

Quoted 2 lines

If you format a device with a 4k sector size back to 512 bytes, the queue limit values for physical block size and IO sizes were not

s/IO sizes/minimum IO size/

Quoted 2 lines

getting updated; only the logical block size was being updated. This patch adds code to update the physical block and IO sizes.

s/and IO sizes/and minimum IO sizes/

Otherwise OK.

Reviewed-by Martin K. Petersen <martin.petersen at oracle.com>

Signature · 1 line

Martin K. Petersen	Oracle Linux Engineering