From: Christoph Hellwig <hch@lst.de>
To: Sagi Grimberg <sagi@grimberg.me>
Cc: Christoph Hellwig <hch@lst.de>, Keith Busch <kbusch@kernel.org>,
James Smart <james.smart@broadcom.com>,
linux-nvme@lists.infradead.org
Subject: Re: [PATCH 01/13] nvme: add common helpers to allocate and free tagsets
Date: Thu, 22 Sep 2022 07:48:37 +0200 [thread overview]
Message-ID: <20220922054837.GC27338@lst.de> (raw)
In-Reply-To: <cc827eb3-96d2-ff65-7204-05213bc018e8@grimberg.me>
On Wed, Sep 21, 2022 at 11:25:11AM +0300, Sagi Grimberg wrote:
>> + if (ops->map_queues)
>> + set->nr_maps = ctrl->opts->nr_poll_queues ? HCTX_MAX_TYPES : 2;
>> + ret = blk_mq_alloc_tag_set(set);
>> + if (ret)
>> + return ret;
>> +
>
> if (ctrl->ops->flags & NVME_F_FABRICS) {
Incremental fixup:
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index f8d9f32adc87c..91c2cb59c4eb6 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -4877,10 +4877,12 @@ int nvme_alloc_io_tag_set(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set,
if (ret)
return ret;
- ctrl->connect_q = blk_mq_init_queue(set);
- if (IS_ERR(ctrl->connect_q)) {
- ret = PTR_ERR(ctrl->connect_q);
- goto out_free_tag_set;
+ if (ctrl->ops->flags & NVME_F_FABRICS) {
+ ctrl->connect_q = blk_mq_init_queue(set);
+ if (IS_ERR(ctrl->connect_q)) {
+ ret = PTR_ERR(ctrl->connect_q);
+ goto out_free_tag_set;
+ }
}
ctrl->tagset = set;
next prev parent reply other threads:[~2022-09-22 5:48 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-20 17:15 consolidate tagset / misc request_queue allocation Christoph Hellwig
2022-09-20 17:15 ` [PATCH 01/13] nvme: add common helpers to allocate and free tagsets Christoph Hellwig
2022-09-20 21:42 ` Chaitanya Kulkarni
2022-09-21 3:37 ` Chao Leng
2022-09-22 5:45 ` Christoph Hellwig
2022-09-22 8:02 ` Chao Leng
2022-09-22 14:18 ` Christoph Hellwig
2022-09-21 8:25 ` Sagi Grimberg
2022-09-22 5:48 ` Christoph Hellwig [this message]
2022-09-22 8:09 ` Chao Leng
2022-09-22 14:19 ` Christoph Hellwig
2022-09-20 17:16 ` [PATCH 02/13] nvme-tcp: remove the unused queue_size member in nvme_tcp_queue Christoph Hellwig
2022-09-20 21:43 ` Chaitanya Kulkarni
2022-09-21 9:24 ` Sagi Grimberg
2022-09-20 17:16 ` [PATCH 03/13] nvme-tcp: store the generic nvme_ctrl in set->driver_data Christoph Hellwig
2022-09-20 21:43 ` Chaitanya Kulkarni
2022-09-21 9:25 ` Sagi Grimberg
2022-09-20 17:16 ` [PATCH 04/13] nvme-tcp: use the tagset alloc/free helpers Christoph Hellwig
2022-09-20 21:44 ` Chaitanya Kulkarni
2022-09-21 9:26 ` Sagi Grimberg
2022-09-20 17:16 ` [PATCH 05/13] nvme-rdma: store the generic nvme_ctrl in set->driver_data Christoph Hellwig
2022-09-20 21:44 ` Chaitanya Kulkarni
2022-09-21 9:26 ` Sagi Grimberg
2022-09-20 17:16 ` [PATCH 06/13] nvme-rdma: use the tagset alloc/free helpers Christoph Hellwig
2022-09-20 21:45 ` Chaitanya Kulkarni
2022-09-21 9:29 ` Sagi Grimberg
2022-09-20 17:16 ` [PATCH 07/13] nvme-fc: keep ctrl->sqsize in sync with opts->queue_size Christoph Hellwig
2022-09-21 9:30 ` Sagi Grimberg
2022-09-22 22:48 ` James Smart
2022-09-20 17:16 ` [PATCH 08/13] nvme-fc: store the generic nvme_ctrl in set->driver_data Christoph Hellwig
2022-09-21 9:32 ` Sagi Grimberg
2022-09-22 22:51 ` James Smart
2022-09-20 17:16 ` [PATCH 09/13] nvme-fc: use the tagset alloc/free helpers Christoph Hellwig
2022-09-21 9:33 ` Sagi Grimberg
2022-09-22 22:56 ` James Smart
2022-09-20 17:16 ` [PATCH 10/13] nvme-loop: initialize sqsize later Christoph Hellwig
2022-09-20 21:45 ` Chaitanya Kulkarni
2022-09-21 9:33 ` Sagi Grimberg
2022-09-20 17:16 ` [PATCH 11/13] nvme-loop: store the generic nvme_ctrl in set->driver_data Christoph Hellwig
2022-09-20 21:46 ` Chaitanya Kulkarni
2022-09-21 9:34 ` Sagi Grimberg
2022-09-20 17:16 ` [PATCH 12/13] nvme-loop: use the tagset alloc/free helpers Christoph Hellwig
2022-09-20 21:46 ` Chaitanya Kulkarni
2022-09-21 9:34 ` Sagi Grimberg
2022-09-20 17:16 ` [PATCH 13/13] nvme: remove nvme_ctrl_init_connect_q Christoph Hellwig
2022-09-20 21:46 ` Chaitanya Kulkarni
2022-09-21 9:34 ` Sagi Grimberg
2022-09-27 7:27 ` consolidate tagset / misc request_queue allocation Christoph Hellwig
2022-09-28 6:47 ` Sagi Grimberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220922054837.GC27338@lst.de \
--to=hch@lst.de \
--cc=james.smart@broadcom.com \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox