nvme-rdma: split nvme_rdma_alloc_tagset

Split nvme_rdma_alloc_tagset into one helper for the admin tag_set and
one for the I/O tag set.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 1a792e08b93ca14837ff3a039e2e91feba9a240a..3100643be2993c9ff07820daee9ca82635f8dd69 100644 (file)
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -787,50 +787,54 @@ out_free_queues:
        return ret;
 }
 
-static struct blk_mq_tag_set *nvme_rdma_alloc_tagset(struct nvme_ctrl *nctrl,
-               bool admin)
+static int nvme_rdma_alloc_admin_tag_set(struct nvme_ctrl *nctrl)
 {
        struct nvme_rdma_ctrl *ctrl = to_rdma_ctrl(nctrl);
-       struct blk_mq_tag_set *set;
+       struct blk_mq_tag_set *set = &ctrl->admin_tag_set;
        int ret;
 
-       if (admin) {
-               set = &ctrl->admin_tag_set;
-               memset(set, 0, sizeof(*set));
-               set->ops = &nvme_rdma_admin_mq_ops;
-               set->queue_depth = NVME_AQ_MQ_TAG_DEPTH;
-               set->reserved_tags = NVMF_RESERVED_TAGS;
-               set->numa_node = nctrl->numa_node;
-               set->cmd_size = sizeof(struct nvme_rdma_request) +
-                               NVME_RDMA_DATA_SGL_SIZE;
-               set->driver_data = ctrl;
-               set->nr_hw_queues = 1;
-               set->timeout = NVME_ADMIN_TIMEOUT;
-               set->flags = BLK_MQ_F_NO_SCHED;
-       } else {
-               set = &ctrl->tag_set;
-               memset(set, 0, sizeof(*set));
-               set->ops = &nvme_rdma_mq_ops;
-               set->queue_depth = nctrl->sqsize + 1;
-               set->reserved_tags = NVMF_RESERVED_TAGS;
-               set->numa_node = nctrl->numa_node;
-               set->flags = BLK_MQ_F_SHOULD_MERGE;
-               set->cmd_size = sizeof(struct nvme_rdma_request) +
-                               NVME_RDMA_DATA_SGL_SIZE;
-               if (nctrl->max_integrity_segments)
-                       set->cmd_size += sizeof(struct nvme_rdma_sgl) +
-                                        NVME_RDMA_METADATA_SGL_SIZE;
-               set->driver_data = ctrl;
-               set->nr_hw_queues = nctrl->queue_count - 1;
-               set->timeout = NVME_IO_TIMEOUT;
-               set->nr_maps = nctrl->opts->nr_poll_queues ? HCTX_MAX_TYPES : 2;
-       }
-
+       memset(set, 0, sizeof(*set));
+       set->ops = &nvme_rdma_admin_mq_ops;
+       set->queue_depth = NVME_AQ_MQ_TAG_DEPTH;
+       set->reserved_tags = NVMF_RESERVED_TAGS;
+       set->numa_node = nctrl->numa_node;
+       set->cmd_size = sizeof(struct nvme_rdma_request) +
+                       NVME_RDMA_DATA_SGL_SIZE;
+       set->driver_data = ctrl;
+       set->nr_hw_queues = 1;
+       set->timeout = NVME_ADMIN_TIMEOUT;
+       set->flags = BLK_MQ_F_NO_SCHED;
        ret = blk_mq_alloc_tag_set(set);
-       if (ret)
-               return ERR_PTR(ret);
+       if (!ret)
+               ctrl->ctrl.admin_tagset = set;
+       return ret;
+}
 
-       return set;
+static int nvme_rdma_alloc_tag_set(struct nvme_ctrl *nctrl)
+{
+       struct nvme_rdma_ctrl *ctrl = to_rdma_ctrl(nctrl);
+       struct blk_mq_tag_set *set = &ctrl->tag_set;
+       int ret;
+
+       memset(set, 0, sizeof(*set));
+       set->ops = &nvme_rdma_mq_ops;
+       set->queue_depth = nctrl->sqsize + 1;
+       set->reserved_tags = NVMF_RESERVED_TAGS;
+       set->numa_node = nctrl->numa_node;
+       set->flags = BLK_MQ_F_SHOULD_MERGE;
+       set->cmd_size = sizeof(struct nvme_rdma_request) +
+                       NVME_RDMA_DATA_SGL_SIZE;
+       if (nctrl->max_integrity_segments)
+               set->cmd_size += sizeof(struct nvme_rdma_sgl) +
+                                NVME_RDMA_METADATA_SGL_SIZE;
+       set->driver_data = ctrl;
+       set->nr_hw_queues = nctrl->queue_count - 1;
+       set->timeout = NVME_IO_TIMEOUT;
+       set->nr_maps = nctrl->opts->nr_poll_queues ? HCTX_MAX_TYPES : 2;
+       ret = blk_mq_alloc_tag_set(set);
+       if (!ret)
+               ctrl->ctrl.tagset = set;
+       return ret;
 }
 
 static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl,
@@ -882,11 +886,9 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl,
                goto out_free_queue;
 
        if (new) {
-               ctrl->ctrl.admin_tagset = nvme_rdma_alloc_tagset(&ctrl->ctrl, true);
-               if (IS_ERR(ctrl->ctrl.admin_tagset)) {
-                       error = PTR_ERR(ctrl->ctrl.admin_tagset);
+               error = nvme_rdma_alloc_admin_tag_set(&ctrl->ctrl);
+               if (error)
                        goto out_free_async_qe;
-               }
 
                ctrl->ctrl.fabrics_q = blk_mq_init_queue(&ctrl->admin_tag_set);
                if (IS_ERR(ctrl->ctrl.fabrics_q)) {
@@ -969,11 +971,9 @@ static int nvme_rdma_configure_io_queues(struct nvme_rdma_ctrl *ctrl, bool new)
                return ret;
 
        if (new) {
-               ctrl->ctrl.tagset = nvme_rdma_alloc_tagset(&ctrl->ctrl, false);
-               if (IS_ERR(ctrl->ctrl.tagset)) {
-                       ret = PTR_ERR(ctrl->ctrl.tagset);
+               ret = nvme_rdma_alloc_tag_set(&ctrl->ctrl);
+               if (ret)
                        goto out_free_io_queues;
-               }
 
                ret = nvme_ctrl_init_connect_q(&(ctrl->ctrl));
                if (ret)