Commit eb867ee9 authored by Joel Granados's avatar Joel Granados Committed by Jens Axboe
Browse files

nvme: enable generic interface (/dev/ngXnY) for unknown command sets 



Extend nvme_alloc_ns() and nvme_validate_ns() for unknown command-set as
well. Both are made to use a new helper (nvme_update_ns_info_cs_indep)
which is similar to nvme_update_ns_info but performs fewer operations
to get the generic interface up.

Suggested-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJoel Granados <j.granados@samsung.com>
Signed-off-by: default avatarKanchan Joshi <joshi.k@samsung.com>
[hch: rebased on other refactoring patches]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJavier González <javier.gonz@samsung.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1e4ea66a

drivers/nvme/host/core.c

+34 −7
Original line number Diff line number Diff line
@@ -1954,6 +1954,31 @@ static void nvme_set_chunk_sectors(struct nvme_ns *ns, struct nvme_id_ns *id) 
	blk_queue_chunk_sectors(ns->queue, iob);

}



static int nvme_update_ns_info_generic(struct nvme_ns *ns,

		struct nvme_ns_info *info)

{

	blk_mq_freeze_queue(ns->disk->queue);

	nvme_set_queue_limits(ns->ctrl, ns->queue);

	set_disk_ro(ns->disk, nvme_ns_is_readonly(ns, info));

	blk_mq_unfreeze_queue(ns->disk->queue);



	if (nvme_ns_head_multipath(ns->head)) {

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

		set_disk_ro(ns->head->disk, nvme_ns_is_readonly(ns, info));

		nvme_mpath_revalidate_paths(ns);

		blk_stack_limits(&ns->head->disk->queue->limits,

				 &ns->queue->limits, 0);

		ns->head->disk->flags |= GENHD_FL_HIDDEN;

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

	}



	/* Hide the block-interface for these devices */

	ns->disk->flags |= GENHD_FL_HIDDEN;

	set_bit(NVME_NS_READY, &ns->flags);



	return 0;

}



static int nvme_update_ns_info_block(struct nvme_ns *ns,

		struct nvme_ns_info *info)

{
@@ -2023,18 +2048,19 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_ns_info *info) 
	switch (info->ids.csi) {

	case NVME_CSI_ZNS:

		if (!IS_ENABLED(CONFIG_BLK_DEV_ZONED)) {

			dev_warn(ns->ctrl->device,

	"nsid %u not supported without CONFIG_BLK_DEV_ZONED\n",

			dev_info(ns->ctrl->device,

	"block device for nsid %u not supported without CONFIG_BLK_DEV_ZONED\n",

				info->nsid);

			return -ENODEV;

			return nvme_update_ns_info_generic(ns, info);

		}

		return nvme_update_ns_info_block(ns, info);

	case NVME_CSI_NVM:

		return nvme_update_ns_info_block(ns, info);

	default:

		dev_warn(ns->ctrl->device, "unknown csi %u for nsid %u\n",

			info->ids.csi, info->nsid);

		return -ENODEV;

		dev_info(ns->ctrl->device,

			"block device for nsid %u not supported (csi %u)\n",

			info->nsid, info->ids.csi);

		return nvme_update_ns_info_generic(ns, info);

	}

}
@@ -4341,7 +4367,8 @@ static void nvme_scan_ns(struct nvme_ctrl *ctrl, unsigned nsid) 
	 * data structure to find all the generic information that is needed to

	 * set up a namespace.  If not fall back to the legacy version.

	 */

	if (ctrl->cap & NVME_CAP_CRMS_CRIMS) {

	if ((ctrl->cap & NVME_CAP_CRMS_CRIMS) ||

	    (info.ids.csi != NVME_CSI_NVM && info.ids.csi != NVME_CSI_ZNS)) {

		if (nvme_ns_info_from_id_cs_indep(ctrl, &info))

			return;

	} else {