Commit 73d90386 authored by Damien Le Moal's avatar Damien Le Moal Committed by Jens Axboe
Browse files

nvme: cleanup zone information initialization 



For a zoned namespace, in nvme_update_ns_info(), call
nvme_update_zone_info() after executing nvme_update_disk_info() so that
the namespace queue logical and physical block size limits are set.
This allows setting the namespace queue max_zone_append_sectors limit
in nvme_update_zone_info() instead of nvme_revalidate_zones(),
simplifying this function. Also use blk_queue_set_zoned() to set the
namespace zoned model.

Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@edc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f1836426

drivers/nvme/host/core.c

+6 −5
Original line number Diff line number Diff line
@@ -2176,17 +2176,18 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id) 
	ns->lba_shift = id->lbaf[lbaf].ds;

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



	ret = nvme_configure_metadata(ns, id);

	if (ret)

		goto out_unfreeze;

	nvme_set_chunk_sectors(ns, id);

	nvme_update_disk_info(ns->disk, ns, id);



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

		ret = nvme_update_zone_info(ns, lbaf);

		if (ret)

			goto out_unfreeze;

	}



	ret = nvme_configure_metadata(ns, id);

	if (ret)

		goto out_unfreeze;

	nvme_set_chunk_sectors(ns, id);

	nvme_update_disk_info(ns->disk, ns, id);

	blk_mq_unfreeze_queue(ns->disk->queue);



	if (blk_queue_is_zoned(ns->queue)) {

drivers/nvme/host/zns.c

+3 −8
Original line number Diff line number Diff line
@@ -9,13 +9,7 @@ 


int nvme_revalidate_zones(struct nvme_ns *ns)

{

	struct request_queue *q = ns->queue;

	int ret;



	ret = blk_revalidate_disk_zones(ns->disk, NULL);

	if (!ret)

		blk_queue_max_zone_append_sectors(q, ns->ctrl->max_zone_append);

	return ret;

	return blk_revalidate_disk_zones(ns->disk, NULL);

}



static int nvme_set_max_append(struct nvme_ctrl *ctrl)
@@ -109,10 +103,11 @@ int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf) 
		goto free_data;

	}



	q->limits.zoned = BLK_ZONED_HM;

	blk_queue_set_zoned(ns->disk, BLK_ZONED_HM);

	blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q);

	blk_queue_max_open_zones(q, le32_to_cpu(id->mor) + 1);

	blk_queue_max_active_zones(q, le32_to_cpu(id->mar) + 1);

	blk_queue_max_zone_append_sectors(q, ns->ctrl->max_zone_append);

free_data:

	kfree(id);

	return status;