| From ec210602b4a38a66b7ad123983f67218bc95384a Mon Sep 17 00:00:00 2001 |
| From: Sagi Grimberg <sagi@grimberg.me> |
| Date: Mon, 11 Mar 2019 15:02:25 -0700 |
| Subject: nvme: set 0 capacity if namespace block size exceeds PAGE_SIZE |
| |
| [ 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 | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c |
| index 2c43e12b70afc..8782d86a8ca38 100644 |
| --- a/drivers/nvme/host/core.c |
| +++ b/drivers/nvme/host/core.c |
| @@ -1591,6 +1591,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); |
| |
| @@ -1601,7 +1605,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); |
| -- |
| 2.20.1 |
| |