nvme: set 0 capacity if namespace block size exceeds PAGE_SIZE
authorSagi Grimberg <sagi@grimberg.me>
Mon, 11 Mar 2019 22:02:25 +0000 (15:02 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 31 May 2019 13:46:15 +0000 (06:46 -0700)
[ Upstream commit 01fa017484ad98fccdeaab32db0077c574b6bd6f ]

If our target exposed a namespace with a block size that is greater
than PAGE_SIZE, set 0 capacity on the namespace as we do not support it.

This issue encountered when the nvmet namespace was backed by a tempfile.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/nvme/host/core.c

index 2cdb3032ca0fc9ae88a38c3c80cebdfba0e9fdcd..abfb46378cc1324d0bf18b1189aad5655ebeebf5 100644 (file)
@@ -1480,6 +1480,10 @@ static void nvme_update_disk_info(struct gendisk *disk,
        sector_t capacity = le64_to_cpup(&id->nsze) << (ns->lba_shift - 9);
        unsigned short bs = 1 << ns->lba_shift;
 
+       if (ns->lba_shift > PAGE_SHIFT) {
+               /* unsupported block size, set capacity to 0 later */
+               bs = (1 << 9);
+       }
        blk_mq_freeze_queue(disk->queue);
        blk_integrity_unregister(disk);
 
@@ -1490,7 +1494,8 @@ static void nvme_update_disk_info(struct gendisk *disk,
        if (ns->ms && !ns->ext &&
            (ns->ctrl->ops->flags & NVME_F_METADATA_SUPPORTED))
                nvme_init_integrity(disk, ns->ms, ns->pi_type);
-       if (ns->ms && !nvme_ns_has_pi(ns) && !blk_get_integrity(disk))
+       if ((ns->ms && !nvme_ns_has_pi(ns) && !blk_get_integrity(disk)) ||
+           ns->lba_shift > PAGE_SHIFT)
                capacity = 0;
 
        set_capacity(disk, capacity);