Commit a9e0e6bc authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: let namespace probing continue for unsupported features 



Instead of failing to scan the namespace entirely when unsupported
features are detected, just mark the gendisk hidden but allow other
access like the upcoming per-namespace character device.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarJavier González <javier.gonz@samsung.com>
parent f5b9a51d

drivers/nvme/host/core.c

+10 −1
Original line number Diff line number Diff line
@@ -1832,7 +1832,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)) {
@@ -1847,6 +1847,15 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id) 


out_unfreeze:

	blk_mq_unfreeze_queue(ns->disk->queue);

out:

	/*

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

	 * but still allow other access.

	 */

	if (ret == -ENODEV) {

		ns->disk->flags |= GENHD_FL_HIDDEN;

		ret = 0;

	}

	return ret;

}

drivers/nvme/host/zns.c

+2 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf) 
		dev_warn(ns->ctrl->device,

			"zone operations:%x not supported for namespace:%u\n",

			le16_to_cpu(id->zoc), ns->head->ns_id);

		status = -EINVAL;

		status = -ENODEV;

		goto free_data;

	}
@@ -105,7 +105,7 @@ int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf) 
		dev_warn(ns->ctrl->device,

			"invalid zone size:%llu for namespace:%u\n",

			ns->zsze, ns->head->ns_id);

		status = -EINVAL;

		status = -ENODEV;

		goto free_data;

	}