From: Sagi Grimberg <sagi@grimberg.me>
Date: Mon, 10 Jul 2017 09:22:37 +0300
Subject: nvme-rdma: introduce nvme_rdma_start_queue
Patch-mainline: v4.14-rc1
Git-commit: 68e16fcfaf9bbde573e89f783cf1ca60acb49cf5
References: FATE#323952, FATE#322506
This should pair with nvme_rdma_stop_queue. While this is not a complete
inverse, it still pairs up pretty well because in fabrics we don't have a
disconnect capsule (yet) but we simply teardown the transport association.
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/nvme/host/rdma.c | 36 ++++++++++++++++++++++++------------
1 file changed, 24 insertions(+), 12 deletions(-)
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -591,24 +591,38 @@ static void nvme_rdma_stop_io_queues(str
nvme_rdma_stop_queue(&ctrl->queues[i]);
}
-static int nvme_rdma_connect_io_queues(struct nvme_rdma_ctrl *ctrl)
+static int nvme_rdma_start_queue(struct nvme_rdma_ctrl *ctrl, int idx)
+{
+ int ret;
+
+ if (idx)
+ ret = nvmf_connect_io_queue(&ctrl->ctrl, idx);
+ else
+ ret = nvmf_connect_admin_queue(&ctrl->ctrl);
+
+ if (!ret)
+ set_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[idx].flags);
+ else
+ dev_info(ctrl->ctrl.device,
+ "failed to connect queue: %d ret=%d\n", idx, ret);
+ return ret;
+}
+
+static int nvme_rdma_start_io_queues(struct nvme_rdma_ctrl *ctrl)
{
int i, ret = 0;
for (i = 1; i < ctrl->ctrl.queue_count; i++) {
- ret = nvmf_connect_io_queue(&ctrl->ctrl, i);
- if (ret) {
- dev_info(ctrl->ctrl.device,
- "failed to connect i/o queue: %d\n", ret);
+ ret = nvme_rdma_start_queue(ctrl, i);
+ if (ret)
goto out_stop_queues;
- }
- set_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[i].flags);
}
return 0;
out_stop_queues:
- nvme_rdma_stop_io_queues(ctrl);
+ for (i--; i >= 1; i--)
+ nvme_rdma_stop_queue(&ctrl->queues[i]);
return ret;
}
@@ -766,12 +780,10 @@ static int nvme_rdma_configure_admin_que
goto out_free_queue;
}
- error = nvmf_connect_admin_queue(&ctrl->ctrl);
+ error = nvme_rdma_start_queue(ctrl, 0);
if (error)
goto out_cleanup_queue;
- set_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[0].flags);
-
error = nvmf_reg_read64(&ctrl->ctrl, NVME_REG_CAP,
&ctrl->ctrl.cap);
if (error) {
@@ -852,7 +864,7 @@ static int nvme_rdma_configure_io_queues
ctrl->ctrl.queue_count - 1);
}
- ret = nvme_rdma_connect_io_queues(ctrl);
+ ret = nvme_rdma_start_io_queues(ctrl);
if (ret)
goto out_cleanup_connect_q;