From: Ming Lei <ming.lei@redhat.com> To: Jens Axboe <axboe@kernel.dk>, linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, Christoph Hellwig <hch@lst.de> Cc: Ming Lei <ming.lei@redhat.com>, Sagi Grimberg <sagi@grimberg.me>, Daniel Wagner <dwagner@suse.de>, Wen Xiong <wenxiong@us.ibm.com>, John Garry <john.garry@huawei.com> Subject: [PATCH 2/2] nvme: pass BLK_MQ_F_NOT_USE_MANAGED_IRQ for fc/rdma/tcp/loop Date: Tue, 29 Jun 2021 15:49:51 +0800 [thread overview] Message-ID: <20210629074951.1981284-3-ming.lei@redhat.com> (raw) In-Reply-To: <20210629074951.1981284-1-ming.lei@redhat.com> All the 4 host drivers don't use managed irq for completing request, so it is correct to pass the flag to blk-mq. Secondly with this flag, blk-mq will help us dispatch connect request allocated via blk_mq_alloc_request_hctx() to driver even though all CPU in the specified hctx's cpumask are offline. Cc: Sagi Grimberg <sagi@grimberg.me> Cc: Daniel Wagner <dwagner@suse.de> Cc: Wen Xiong <wenxiong@us.ibm.com> Cc: John Garry <john.garry@huawei.com> Signed-off-by: Ming Lei <ming.lei@redhat.com> --- drivers/nvme/host/fc.c | 3 ++- drivers/nvme/host/rdma.c | 3 ++- drivers/nvme/host/tcp.c | 3 ++- drivers/nvme/target/loop.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 256e87721a01..c563a2b6e9fc 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2876,7 +2876,8 @@ nvme_fc_create_io_queues(struct nvme_fc_ctrl *ctrl) ctrl->tag_set.queue_depth = ctrl->ctrl.opts->queue_size; ctrl->tag_set.reserved_tags = NVMF_RESERVED_TAGS; ctrl->tag_set.numa_node = ctrl->ctrl.numa_node; - ctrl->tag_set.flags = BLK_MQ_F_SHOULD_MERGE; + ctrl->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | + BLK_MQ_F_NOT_USE_MANAGED_IRQ; ctrl->tag_set.cmd_size = struct_size((struct nvme_fcp_op_w_sgl *)NULL, priv, ctrl->lport->ops->fcprqst_priv_sz); diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 37943dc4c2c1..4b7bdc829109 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -817,7 +817,8 @@ static struct blk_mq_tag_set *nvme_rdma_alloc_tagset(struct nvme_ctrl *nctrl, 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->flags = BLK_MQ_F_SHOULD_MERGE | + BLK_MQ_F_NOT_USE_MANAGED_IRQ; set->cmd_size = sizeof(struct nvme_rdma_request) + NVME_RDMA_DATA_SGL_SIZE; if (nctrl->max_integrity_segments) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 34f4b3402f7c..0125463b7d77 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1600,7 +1600,8 @@ static struct blk_mq_tag_set *nvme_tcp_alloc_tagset(struct nvme_ctrl *nctrl, 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->flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_BLOCKING | + BLK_MQ_F_NOT_USE_MANAGED_IRQ; set->cmd_size = sizeof(struct nvme_tcp_request); set->driver_data = ctrl; set->nr_hw_queues = nctrl->queue_count - 1; diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c index cb30cb942e1d..bf032249e010 100644 --- a/drivers/nvme/target/loop.c +++ b/drivers/nvme/target/loop.c @@ -524,7 +524,8 @@ static int nvme_loop_create_io_queues(struct nvme_loop_ctrl *ctrl) ctrl->tag_set.queue_depth = ctrl->ctrl.opts->queue_size; ctrl->tag_set.reserved_tags = NVMF_RESERVED_TAGS; ctrl->tag_set.numa_node = ctrl->ctrl.numa_node; - ctrl->tag_set.flags = BLK_MQ_F_SHOULD_MERGE; + ctrl->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | + BLK_MQ_F_NOT_USE_MANAGED_IRQ; ctrl->tag_set.cmd_size = sizeof(struct nvme_loop_iod) + NVME_INLINE_SG_CNT * sizeof(struct scatterlist); ctrl->tag_set.driver_data = ctrl; -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Ming Lei <ming.lei@redhat.com> To: Jens Axboe <axboe@kernel.dk>, linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, Christoph Hellwig <hch@lst.de> Cc: Ming Lei <ming.lei@redhat.com>, Sagi Grimberg <sagi@grimberg.me>, Daniel Wagner <dwagner@suse.de>, Wen Xiong <wenxiong@us.ibm.com>, John Garry <john.garry@huawei.com> Subject: [PATCH 2/2] nvme: pass BLK_MQ_F_NOT_USE_MANAGED_IRQ for fc/rdma/tcp/loop Date: Tue, 29 Jun 2021 15:49:51 +0800 [thread overview] Message-ID: <20210629074951.1981284-3-ming.lei@redhat.com> (raw) In-Reply-To: <20210629074951.1981284-1-ming.lei@redhat.com> All the 4 host drivers don't use managed irq for completing request, so it is correct to pass the flag to blk-mq. Secondly with this flag, blk-mq will help us dispatch connect request allocated via blk_mq_alloc_request_hctx() to driver even though all CPU in the specified hctx's cpumask are offline. Cc: Sagi Grimberg <sagi@grimberg.me> Cc: Daniel Wagner <dwagner@suse.de> Cc: Wen Xiong <wenxiong@us.ibm.com> Cc: John Garry <john.garry@huawei.com> Signed-off-by: Ming Lei <ming.lei@redhat.com> --- drivers/nvme/host/fc.c | 3 ++- drivers/nvme/host/rdma.c | 3 ++- drivers/nvme/host/tcp.c | 3 ++- drivers/nvme/target/loop.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 256e87721a01..c563a2b6e9fc 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2876,7 +2876,8 @@ nvme_fc_create_io_queues(struct nvme_fc_ctrl *ctrl) ctrl->tag_set.queue_depth = ctrl->ctrl.opts->queue_size; ctrl->tag_set.reserved_tags = NVMF_RESERVED_TAGS; ctrl->tag_set.numa_node = ctrl->ctrl.numa_node; - ctrl->tag_set.flags = BLK_MQ_F_SHOULD_MERGE; + ctrl->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | + BLK_MQ_F_NOT_USE_MANAGED_IRQ; ctrl->tag_set.cmd_size = struct_size((struct nvme_fcp_op_w_sgl *)NULL, priv, ctrl->lport->ops->fcprqst_priv_sz); diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 37943dc4c2c1..4b7bdc829109 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -817,7 +817,8 @@ static struct blk_mq_tag_set *nvme_rdma_alloc_tagset(struct nvme_ctrl *nctrl, 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->flags = BLK_MQ_F_SHOULD_MERGE | + BLK_MQ_F_NOT_USE_MANAGED_IRQ; set->cmd_size = sizeof(struct nvme_rdma_request) + NVME_RDMA_DATA_SGL_SIZE; if (nctrl->max_integrity_segments) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 34f4b3402f7c..0125463b7d77 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1600,7 +1600,8 @@ static struct blk_mq_tag_set *nvme_tcp_alloc_tagset(struct nvme_ctrl *nctrl, 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->flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_BLOCKING | + BLK_MQ_F_NOT_USE_MANAGED_IRQ; set->cmd_size = sizeof(struct nvme_tcp_request); set->driver_data = ctrl; set->nr_hw_queues = nctrl->queue_count - 1; diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c index cb30cb942e1d..bf032249e010 100644 --- a/drivers/nvme/target/loop.c +++ b/drivers/nvme/target/loop.c @@ -524,7 +524,8 @@ static int nvme_loop_create_io_queues(struct nvme_loop_ctrl *ctrl) ctrl->tag_set.queue_depth = ctrl->ctrl.opts->queue_size; ctrl->tag_set.reserved_tags = NVMF_RESERVED_TAGS; ctrl->tag_set.numa_node = ctrl->ctrl.numa_node; - ctrl->tag_set.flags = BLK_MQ_F_SHOULD_MERGE; + ctrl->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | + BLK_MQ_F_NOT_USE_MANAGED_IRQ; ctrl->tag_set.cmd_size = sizeof(struct nvme_loop_iod) + NVME_INLINE_SG_CNT * sizeof(struct scatterlist); ctrl->tag_set.driver_data = ctrl; -- 2.31.1 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-06-29 7:50 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-29 7:49 [PATCH 0/2] blk-mq: fix blk_mq_alloc_request_hctx Ming Lei 2021-06-29 7:49 ` Ming Lei 2021-06-29 7:49 ` [PATCH 1/2] blk-mq: not deactivate hctx if the device doesn't use managed irq Ming Lei 2021-06-29 7:49 ` Ming Lei 2021-06-29 12:39 ` Hannes Reinecke 2021-06-29 12:39 ` Hannes Reinecke 2021-06-29 14:17 ` Ming Lei 2021-06-29 14:17 ` Ming Lei 2021-06-29 15:49 ` John Garry 2021-06-29 15:49 ` John Garry 2021-06-30 0:32 ` Ming Lei 2021-06-30 0:32 ` Ming Lei 2021-06-30 9:25 ` John Garry 2021-06-30 9:25 ` John Garry 2021-07-01 9:52 ` Christoph Hellwig 2021-07-01 9:52 ` Christoph Hellwig 2021-06-29 23:30 ` Damien Le Moal 2021-06-29 23:30 ` Damien Le Moal 2021-06-30 18:58 ` Sagi Grimberg 2021-06-30 18:58 ` Sagi Grimberg 2021-06-30 21:57 ` Damien Le Moal 2021-06-30 21:57 ` Damien Le Moal 2021-07-01 14:20 ` Keith Busch 2021-07-01 14:20 ` Keith Busch 2021-06-29 7:49 ` Ming Lei [this message] 2021-06-29 7:49 ` [PATCH 2/2] nvme: pass BLK_MQ_F_NOT_USE_MANAGED_IRQ for fc/rdma/tcp/loop Ming Lei 2021-06-30 8:15 ` Hannes Reinecke 2021-06-30 8:15 ` Hannes Reinecke 2021-06-30 8:47 ` Ming Lei 2021-06-30 8:47 ` Ming Lei 2021-06-30 8:18 ` [PATCH 0/2] blk-mq: fix blk_mq_alloc_request_hctx Hannes Reinecke 2021-06-30 8:18 ` Hannes Reinecke 2021-06-30 8:42 ` Ming Lei 2021-06-30 8:42 ` Ming Lei 2021-06-30 9:43 ` Hannes Reinecke 2021-06-30 9:43 ` Hannes Reinecke 2021-06-30 9:53 ` Ming Lei 2021-06-30 9:53 ` Ming Lei 2021-06-30 18:59 ` Sagi Grimberg 2021-06-30 18:59 ` Sagi Grimberg 2021-06-30 19:46 ` Hannes Reinecke 2021-06-30 19:46 ` Hannes Reinecke 2021-06-30 23:59 ` Ming Lei 2021-06-30 23:59 ` Ming Lei 2021-07-01 8:00 ` Hannes Reinecke 2021-07-01 8:00 ` Hannes Reinecke 2021-07-01 9:13 ` Ming Lei 2021-07-01 9:13 ` Ming Lei 2021-07-02 9:47 ` Daniel Wagner 2021-07-02 9:47 ` Daniel Wagner
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=20210629074951.1981284-3-ming.lei@redhat.com \ --to=ming.lei@redhat.com \ --cc=axboe@kernel.dk \ --cc=dwagner@suse.de \ --cc=hch@lst.de \ --cc=john.garry@huawei.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=sagi@grimberg.me \ --cc=wenxiong@us.ibm.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.