nvme-rdma: Free the I/O tags when we delete the controller (a34ca17a) · Commits · 戴 / test

If we wait until we free the controller (free_ctrl) we might lose our rdma device without any notification while we still have open resources (tags mrs and dma mappings). Instead, destroy the tags with their rdma resources once we delete the device and not when freeing it. Note that we don't do that in nvme_rdma_shutdown_ctrl because controller reset uses it as well and we want to give active I/O a chance to complete successfully. Signed-off-by:

Sagi Grimberg <sagi@grimberg.me> Reviewed-by:

Christoph Hellwig <hch@lst.de>

drivers/nvme/host/rdma.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -686,11 +686,6 @@ static void nvme_rdma_free_ctrl(struct nvme_ctrl *nctrl)
		list_del(&ctrl->list);
		mutex_unlock(&nvme_rdma_ctrl_mutex);

		if (ctrl->ctrl.tagset) {
		blk_cleanup_queue(ctrl->ctrl.connect_q);
		blk_mq_free_tag_set(&ctrl->tag_set);
		nvme_rdma_dev_put(ctrl->device);
		}
		kfree(ctrl->queues);
		nvmf_free_options(nctrl->opts);
		free_ctrl:
		@@ -1665,6 +1660,13 @@ static void __nvme_rdma_remove_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown)
		nvme_uninit_ctrl(&ctrl->ctrl);
		if (shutdown)
		nvme_rdma_shutdown_ctrl(ctrl);

		if (ctrl->ctrl.tagset) {
		blk_cleanup_queue(ctrl->ctrl.connect_q);
		blk_mq_free_tag_set(&ctrl->tag_set);
		nvme_rdma_dev_put(ctrl->device);
		}

		nvme_put_ctrl(&ctrl->ctrl);
		}

Admin message