nvme-tcp: split nvme_tcp_alloc_tagset

Split nvme_tcp_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/tcp.c b/drivers/nvme/host/tcp.c
index 7c8ffb99ae3a1c24fe5282a959d4a519f3bf27ca..e82dcfcda29bce906a645e5be61a1f218a6a9a99 100644 (file)
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -1687,45 +1687,49 @@ static int nvme_tcp_start_queue(struct nvme_ctrl *nctrl, int idx)
        return ret;
 }
 
-static struct blk_mq_tag_set *nvme_tcp_alloc_tagset(struct nvme_ctrl *nctrl,
-               bool admin)
+static int nvme_tcp_alloc_admin_tag_set(struct nvme_ctrl *nctrl)
 {
        struct nvme_tcp_ctrl *ctrl = to_tcp_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_tcp_admin_mq_ops;
-               set->queue_depth = NVME_AQ_MQ_TAG_DEPTH;
-               set->reserved_tags = NVMF_RESERVED_TAGS;
-               set->numa_node = nctrl->numa_node;
-               set->flags = BLK_MQ_F_BLOCKING;
-               set->cmd_size = sizeof(struct nvme_tcp_request);
-               set->driver_data = ctrl;
-               set->nr_hw_queues = 1;
-               set->timeout = NVME_ADMIN_TIMEOUT;
-       } else {
-               set = &ctrl->tag_set;
-               memset(set, 0, sizeof(*set));
-               set->ops = &nvme_tcp_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 | BLK_MQ_F_BLOCKING;
-               set->cmd_size = sizeof(struct nvme_tcp_request);
-               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_tcp_admin_mq_ops;
+       set->queue_depth = NVME_AQ_MQ_TAG_DEPTH;
+       set->reserved_tags = NVMF_RESERVED_TAGS;
+       set->numa_node = nctrl->numa_node;
+       set->flags = BLK_MQ_F_BLOCKING;
+       set->cmd_size = sizeof(struct nvme_tcp_request);
+       set->driver_data = ctrl;
+       set->nr_hw_queues = 1;
+       set->timeout = NVME_ADMIN_TIMEOUT;
        ret = blk_mq_alloc_tag_set(set);
-       if (ret)
-               return ERR_PTR(ret);
+       if (!ret)
+               nctrl->admin_tagset = set;
+       return ret;
+}
 
-       return set;
+static int nvme_tcp_alloc_tag_set(struct nvme_ctrl *nctrl)
+{
+       struct nvme_tcp_ctrl *ctrl = to_tcp_ctrl(nctrl);
+       struct blk_mq_tag_set *set = &ctrl->tag_set;
+       int ret;
+
+       memset(set, 0, sizeof(*set));
+       set->ops = &nvme_tcp_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 | BLK_MQ_F_BLOCKING;
+       set->cmd_size = sizeof(struct nvme_tcp_request);
+       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)
+               nctrl->tagset = set;
+       return ret;
 }
 
 static void nvme_tcp_free_admin_queue(struct nvme_ctrl *ctrl)
@@ -1901,11 +1905,9 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new)
                return ret;
 
        if (new) {
-               ctrl->tagset = nvme_tcp_alloc_tagset(ctrl, false);
-               if (IS_ERR(ctrl->tagset)) {
-                       ret = PTR_ERR(ctrl->tagset);
+               ret = nvme_tcp_alloc_tag_set(ctrl);
+               if (ret)
                        goto out_free_io_queues;
-               }
 
                ret = nvme_ctrl_init_connect_q(ctrl);
                if (ret)
@@ -1970,11 +1972,9 @@ static int nvme_tcp_configure_admin_queue(struct nvme_ctrl *ctrl, bool new)
                return error;
 
        if (new) {
-               ctrl->admin_tagset = nvme_tcp_alloc_tagset(ctrl, true);
-               if (IS_ERR(ctrl->admin_tagset)) {
-                       error = PTR_ERR(ctrl->admin_tagset);
+               error = nvme_tcp_alloc_admin_tag_set(ctrl);
+               if (error)
                        goto out_free_queue;
-               }
 
                ctrl->fabrics_q = blk_mq_init_queue(ctrl->admin_tagset);
                if (IS_ERR(ctrl->fabrics_q)) {