Commit bc1af009 authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

nvme: revalidate namespace stream parameters 



The stream parameters are based on the currently formatted logical block
size. Recheck these parameters on namespace revalidation so the
registered constraints will be accurate.

Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 38adf94e

drivers/nvme/host/core.c

+27 −27
Original line number Diff line number Diff line
@@ -1810,6 +1810,32 @@ static bool nvme_ns_ids_equal(struct nvme_ns_ids *a, struct nvme_ns_ids *b) 
		memcmp(&a->eui64, &b->eui64, sizeof(a->eui64)) == 0;

}



static int nvme_setup_streams_ns(struct nvme_ctrl *ctrl, struct nvme_ns *ns)

{

	struct streams_directive_params s;

	int ret;



	if (!ctrl->nr_streams)

		return 0;



	ret = nvme_get_stream_params(ctrl, &s, ns->head->ns_id);

	if (ret)

		return ret;



	ns->sws = le32_to_cpu(s.sws);

	ns->sgs = le16_to_cpu(s.sgs);



	if (ns->sws) {

		unsigned int bs = 1 << ns->lba_shift;



		blk_queue_io_min(ns->queue, bs * ns->sws);

		if (ns->sgs)

			blk_queue_io_opt(ns->queue, bs * ns->sws * ns->sgs);

	}



	return 0;

}



static void nvme_update_disk_info(struct gendisk *disk,

		struct nvme_ns *ns, struct nvme_id_ns *id)

{
@@ -1824,6 +1850,7 @@ static void nvme_update_disk_info(struct gendisk *disk, 
	blk_mq_freeze_queue(disk->queue);

	blk_integrity_unregister(disk);



	nvme_setup_streams_ns(ns->ctrl, ns);

	if (id->nabo == 0) {

		/*

		 * Bit 1 indicates whether NAWUPF is defined for this namespace
@@ -3546,32 +3573,6 @@ static struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid) 
	return ret;

}



static int nvme_setup_streams_ns(struct nvme_ctrl *ctrl, struct nvme_ns *ns)

{

	struct streams_directive_params s;

	int ret;



	if (!ctrl->nr_streams)

		return 0;



	ret = nvme_get_stream_params(ctrl, &s, ns->head->ns_id);

	if (ret)

		return ret;



	ns->sws = le32_to_cpu(s.sws);

	ns->sgs = le16_to_cpu(s.sgs);



	if (ns->sws) {

		unsigned int bs = 1 << ns->lba_shift;



		blk_queue_io_min(ns->queue, bs * ns->sws);

		if (ns->sgs)

			blk_queue_io_opt(ns->queue, bs * ns->sws * ns->sgs);

	}



	return 0;

}



static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)

{

	struct nvme_ns *ns;
@@ -3615,7 +3616,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) 
	ret = nvme_init_ns_head(ns, nsid, id);

	if (ret)

		goto out_free_id;

	nvme_setup_streams_ns(ctrl, ns);

	nvme_set_disk_name(disk_name, ns, ctrl, &flags);



	disk = alloc_disk_node(0, node);

CRA Git | Maintained and supported by SUSTech CRA and CCSE