Commit e06b425b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: catch -ENODEV from nvme_revalidate_zones again 



nvme_revalidate_zones can also return -ENODEV if e.g. zone sizes aren't
constant or not a power of two.  In that case we should jump to marking
the gendisk hidden and only support pass through.

Fixes: 602e57c9 ("nvme: also mark passthrough-only namespaces ready in nvme_update_ns_info")
Reported-by: default avatarJoel Granados <j.granados@samsung.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJoel Granados <j.granados@samsung.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 4cf42ec3

drivers/nvme/host/core.c

+7 −6
Original line number Diff line number Diff line
@@ -1940,8 +1940,10 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id) 


	if (ns->head->ids.csi == NVME_CSI_ZNS) {

		ret = nvme_update_zone_info(ns, lbaf);

		if (ret)

			goto out_unfreeze;

		if (ret) {

			blk_mq_unfreeze_queue(ns->disk->queue);

			goto out;

		}

	}



	set_disk_ro(ns->disk, (id->nsattr & NVME_NS_ATTR_RO) ||
@@ -1952,7 +1954,7 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id) 
	if (blk_queue_is_zoned(ns->queue)) {

		ret = nvme_revalidate_zones(ns);

		if (ret && !nvme_first_scan(ns->disk))

			return ret;

			goto out;

	}



	if (nvme_ns_head_multipath(ns->head)) {
@@ -1967,9 +1969,9 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id) 
		disk_update_readahead(ns->head->disk);

		blk_mq_unfreeze_queue(ns->head->disk->queue);

	}

	return 0;



out_unfreeze:

	ret = 0;

out:

	/*

	 * If probing fails due an unsupported feature, hide the block device,

	 * but still allow other access.
@@ -1979,7 +1981,6 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id) 
		set_bit(NVME_NS_READY, &ns->flags);

		ret = 0;

	}

	blk_mq_unfreeze_queue(ns->disk->queue);

	return ret;

}