Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f02fffb authored by Sagi Grimberg's avatar Sagi Grimberg
Browse files

nvme-rdma: don't free tagset on resets 



We're not supposed to do that.

Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 18398af2

drivers/nvme/host/rdma.c

+30 −19
Original line number Diff line number Diff line
@@ -712,16 +712,20 @@ static struct blk_mq_tag_set *nvme_rdma_alloc_tagset(struct nvme_ctrl *nctrl, 
	return ERR_PTR(ret);

}



static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl)

static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl,

		bool remove)

{

	nvme_rdma_free_qe(ctrl->queues[0].device->dev, &ctrl->async_event_sqe,

			sizeof(struct nvme_command), DMA_TO_DEVICE);

	nvme_rdma_stop_and_free_queue(&ctrl->queues[0]);

	if (remove) {

		blk_cleanup_queue(ctrl->ctrl.admin_q);

		nvme_rdma_free_tagset(&ctrl->ctrl, true);

	}

}



static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl)

static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl,

		bool new)

{

	int error;
@@ -734,6 +738,7 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl) 
	ctrl->max_fr_pages = min_t(u32, NVME_RDMA_MAX_SEGMENTS,

		ctrl->device->dev->attrs.max_fast_reg_page_list_len);



	if (new) {

		ctrl->ctrl.admin_tagset = nvme_rdma_alloc_tagset(&ctrl->ctrl, true);

		if (IS_ERR(ctrl->ctrl.admin_tagset))

			goto out_free_queue;
@@ -743,6 +748,12 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl) 
			error = PTR_ERR(ctrl->ctrl.admin_q);

			goto out_free_tagset;

		}

	} else {

		error = blk_mq_reinit_tagset(&ctrl->admin_tag_set,

					     nvme_rdma_reinit_request);

		if (error)

			goto out_free_queue;

	}



	error = nvmf_connect_admin_queue(&ctrl->ctrl);

	if (error)
@@ -781,10 +792,10 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl) 
	return 0;



out_cleanup_queue:

	if (new)

		blk_cleanup_queue(ctrl->ctrl.admin_q);

out_free_tagset:

	/* disconnect and drain the queue before freeing the tagset */

	nvme_rdma_stop_queue(&ctrl->queues[0]);

	if (new)

		nvme_rdma_free_tagset(&ctrl->ctrl, true);

out_free_queue:

	nvme_rdma_free_queue(&ctrl->queues[0]);
@@ -1676,7 +1687,7 @@ static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown) 
	blk_mq_tagset_busy_iter(&ctrl->admin_tag_set,

				nvme_cancel_request, &ctrl->ctrl);

	blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);

	nvme_rdma_destroy_admin_queue(ctrl);

	nvme_rdma_destroy_admin_queue(ctrl, shutdown);

}



static void __nvme_rdma_remove_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown)
@@ -1750,7 +1761,7 @@ static void nvme_rdma_reset_ctrl_work(struct work_struct *work) 
	nvme_stop_ctrl(&ctrl->ctrl);

	nvme_rdma_shutdown_ctrl(ctrl, false);



	ret = nvme_rdma_configure_admin_queue(ctrl);

	ret = nvme_rdma_configure_admin_queue(ctrl, false);

	if (ret) {

		/* ctrl is already shutdown, just remove the ctrl */

		INIT_WORK(&ctrl->delete_work, nvme_rdma_remove_ctrl_work);
@@ -1891,7 +1902,7 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev, 
	if (!ctrl->queues)

		goto out_uninit_ctrl;



	ret = nvme_rdma_configure_admin_queue(ctrl);

	ret = nvme_rdma_configure_admin_queue(ctrl, true);

	if (ret)

		goto out_kfree_queues;
@@ -1948,7 +1959,7 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev, 
	return &ctrl->ctrl;



out_remove_admin_queue:

	nvme_rdma_destroy_admin_queue(ctrl);

	nvme_rdma_destroy_admin_queue(ctrl, true);

out_kfree_queues:

	kfree(ctrl->queues);

out_uninit_ctrl: