Commit 91512027 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Li Nan
Browse files

nvme: use blk_mq_alloc_disk 

mainline inclusion
from mainline-v5.15-rc1
commit 5f432cce
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I81XCK

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5f432cceb3e9de5223fa50d882c4a43cab39a3ee



----------------------------------------

Switch to use the blk_mq_alloc_disk helper for allocating the
request_queue and gendisk.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Link: https://lore.kernel.org/r/20210816131910.615153-2-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
conflict:
 drivers/nvme/host/core.c
Signed-off-by: default avatarZhong Jinghua <zhongjinghua@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parent 535d039a

drivers/nvme/host/core.c

+13 −20
Original line number Diff line number Diff line
@@ -3904,9 +3904,14 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid, 
	if (!ns)

		goto out_free_id;



	ns->queue = blk_mq_init_queue(ctrl->tagset);

	if (IS_ERR(ns->queue))

	disk = blk_mq_alloc_disk(ctrl->tagset, ns);

	if (IS_ERR(disk))

		goto out_free_ns;

	disk->fops = &nvme_fops;

	disk->private_data = ns;



	ns->disk = disk;

	ns->queue = disk->queue;



	if (ctrl->opts && ctrl->opts->data_digest)

		blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, ns->queue);
@@ -3915,34 +3920,25 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid, 
	if (ctrl->ops->flags & NVME_F_PCI_P2PDMA)

		blk_queue_flag_set(QUEUE_FLAG_PCI_P2PDMA, ns->queue);



	ns->queue->queuedata = ns;

	ns->ctrl = ctrl;

	kref_init(&ns->kref);



	ret = nvme_init_ns_head(ns, nsid, ids, id->nmic & NVME_NS_NMIC_SHARED);

	if (ret)

		goto out_free_queue;

		goto out_cleanup_disk;

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



	disk = alloc_disk_node(0, node);

	if (!disk)

		goto out_unlink_ns;



	disk->fops = &nvme_fops;

	disk->private_data = ns;

	disk->queue = ns->queue;

	disk->flags = flags;

	memcpy(disk->disk_name, disk_name, DISK_NAME_LEN);

	ns->disk = disk;



	if (nvme_update_ns_info(ns, id))

		goto out_put_disk;

		goto out_unlink_ns;



	if ((ctrl->quirks & NVME_QUIRK_LIGHTNVM) && id->vs[0] == 0x1) {

		ret = nvme_nvm_register(ns, disk_name, node);

		if (ret) {

			dev_warn(ctrl->device, "LightNVM init failure\n");

			goto out_put_disk;

			goto out_unlink_ns;

		}

	}
@@ -3958,10 +3954,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid, 
	kfree(id);



	return;

 out_put_disk:

	/* prevent double queue cleanup */

	ns->disk->queue = NULL;

	put_disk(ns->disk);



 out_unlink_ns:

	mutex_lock(&ctrl->subsys->lock);

	list_del_rcu(&ns->siblings);
@@ -3969,8 +3962,8 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid, 
		list_del_init(&ns->head->entry);

	mutex_unlock(&ctrl->subsys->lock);

	nvme_put_ns_head(ns->head);

 out_free_queue:

	blk_cleanup_queue(ns->queue);

 out_cleanup_disk:

	blk_cleanup_disk(disk);

 out_free_ns:

	kfree(ns);

 out_free_id: