From: Ming Lei <ming.lei@redhat.com> To: Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>, "Martin K . Petersen" <martin.petersen@oracle.com>, linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org Cc: Sagi Grimberg <sagi@grimberg.me>, Daniel Wagner <dwagner@suse.de>, Wen Xiong <wenxiong@us.ibm.com>, John Garry <john.garry@huawei.com>, Hannes Reinecke <hare@suse.de>, Keith Busch <kbusch@kernel.org>, Damien Le Moal <damien.lemoal@wdc.com>, Ming Lei <ming.lei@redhat.com> Subject: [PATCH V2 6/6] blk-mq: don't deactivate hctx if managed irq isn't used Date: Fri, 2 Jul 2021 23:05:55 +0800 [thread overview] Message-ID: <20210702150555.2401722-7-ming.lei@redhat.com> (raw) In-Reply-To: <20210702150555.2401722-1-ming.lei@redhat.com> No need to deactivate one hctx if managed irq isn't used because non-managed irq can be migrated to online cpus. So we don't need to register cpu hotplug handler for CPUHP_AP_BLK_MQ_ONLINE if managed irq isn't used. Given BLK_MQ_F_MANAGED_IRQ is more generic and straightforward, it covers !BLK_MQ_F_STACKING perfectly because managed irq is only used in underlying controller, so remove BLK_MQ_F_STACKING. Signed-off-by: Ming Lei <ming.lei@redhat.com> --- block/blk-mq-debugfs.c | 1 - block/blk-mq.c | 4 ++-- drivers/block/loop.c | 2 +- drivers/md/dm-rq.c | 2 +- include/linux/blk-mq.h | 5 ----- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 17f57af3a4d6..3641a16c2910 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -245,7 +245,6 @@ static const char *const hctx_flag_name[] = { HCTX_FLAG_NAME(TAG_QUEUE_SHARED), HCTX_FLAG_NAME(BLOCKING), HCTX_FLAG_NAME(NO_SCHED), - HCTX_FLAG_NAME(STACKING), HCTX_FLAG_NAME(TAG_HCTX_SHARED), HCTX_FLAG_NAME(MANAGED_IRQ), }; diff --git a/block/blk-mq.c b/block/blk-mq.c index 1d45d2922ca7..e672ebd93342 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2636,7 +2636,7 @@ static int blk_mq_hctx_notify_dead(unsigned int cpu, struct hlist_node *node) static void blk_mq_remove_cpuhp(struct blk_mq_hw_ctx *hctx) { - if (!(hctx->flags & BLK_MQ_F_STACKING)) + if (hctx->flags & BLK_MQ_F_MANAGED_IRQ) cpuhp_state_remove_instance_nocalls(CPUHP_AP_BLK_MQ_ONLINE, &hctx->cpuhp_online); cpuhp_state_remove_instance_nocalls(CPUHP_BLK_MQ_DEAD, @@ -2731,7 +2731,7 @@ static int blk_mq_init_hctx(struct request_queue *q, { hctx->queue_num = hctx_idx; - if (!(hctx->flags & BLK_MQ_F_STACKING)) + if (hctx->flags & BLK_MQ_F_MANAGED_IRQ) cpuhp_state_add_instance_nocalls(CPUHP_AP_BLK_MQ_ONLINE, &hctx->cpuhp_online); cpuhp_state_add_instance_nocalls(CPUHP_BLK_MQ_DEAD, &hctx->cpuhp_dead); diff --git a/drivers/block/loop.c b/drivers/block/loop.c index cc0e8c39a48b..02509bc54242 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -2268,7 +2268,7 @@ static int loop_add(struct loop_device **l, int i) lo->tag_set.queue_depth = 128; lo->tag_set.numa_node = NUMA_NO_NODE; lo->tag_set.cmd_size = sizeof(struct loop_cmd); - lo->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_STACKING; + lo->tag_set.flags = BLK_MQ_F_SHOULD_MERGE; lo->tag_set.driver_data = lo; err = blk_mq_alloc_tag_set(&lo->tag_set); diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c index 0dbd48cbdff9..294d4858c067 100644 --- a/drivers/md/dm-rq.c +++ b/drivers/md/dm-rq.c @@ -540,7 +540,7 @@ int dm_mq_init_request_queue(struct mapped_device *md, struct dm_table *t) md->tag_set->ops = &dm_mq_ops; md->tag_set->queue_depth = dm_get_blk_mq_queue_depth(); md->tag_set->numa_node = md->numa_node_id; - md->tag_set->flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_STACKING; + md->tag_set->flags = BLK_MQ_F_SHOULD_MERGE; md->tag_set->nr_hw_queues = dm_get_blk_mq_nr_hw_queues(); md->tag_set->driver_data = md; diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 62fc0393cc3a..d75ab9fd64fc 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -397,11 +397,6 @@ struct blk_mq_ops { enum { BLK_MQ_F_SHOULD_MERGE = 1 << 0, BLK_MQ_F_TAG_QUEUE_SHARED = 1 << 1, - /* - * Set when this device requires underlying blk-mq device for - * completing IO: - */ - BLK_MQ_F_STACKING = 1 << 2, BLK_MQ_F_TAG_HCTX_SHARED = 1 << 3, BLK_MQ_F_MANAGED_IRQ = 1 << 4, BLK_MQ_F_BLOCKING = 1 << 5, -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Ming Lei <ming.lei@redhat.com> To: Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>, "Martin K . Petersen" <martin.petersen@oracle.com>, linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org Cc: Sagi Grimberg <sagi@grimberg.me>, Daniel Wagner <dwagner@suse.de>, Wen Xiong <wenxiong@us.ibm.com>, John Garry <john.garry@huawei.com>, Hannes Reinecke <hare@suse.de>, Keith Busch <kbusch@kernel.org>, Damien Le Moal <damien.lemoal@wdc.com>, Ming Lei <ming.lei@redhat.com> Subject: [PATCH V2 6/6] blk-mq: don't deactivate hctx if managed irq isn't used Date: Fri, 2 Jul 2021 23:05:55 +0800 [thread overview] Message-ID: <20210702150555.2401722-7-ming.lei@redhat.com> (raw) In-Reply-To: <20210702150555.2401722-1-ming.lei@redhat.com> No need to deactivate one hctx if managed irq isn't used because non-managed irq can be migrated to online cpus. So we don't need to register cpu hotplug handler for CPUHP_AP_BLK_MQ_ONLINE if managed irq isn't used. Given BLK_MQ_F_MANAGED_IRQ is more generic and straightforward, it covers !BLK_MQ_F_STACKING perfectly because managed irq is only used in underlying controller, so remove BLK_MQ_F_STACKING. Signed-off-by: Ming Lei <ming.lei@redhat.com> --- block/blk-mq-debugfs.c | 1 - block/blk-mq.c | 4 ++-- drivers/block/loop.c | 2 +- drivers/md/dm-rq.c | 2 +- include/linux/blk-mq.h | 5 ----- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 17f57af3a4d6..3641a16c2910 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -245,7 +245,6 @@ static const char *const hctx_flag_name[] = { HCTX_FLAG_NAME(TAG_QUEUE_SHARED), HCTX_FLAG_NAME(BLOCKING), HCTX_FLAG_NAME(NO_SCHED), - HCTX_FLAG_NAME(STACKING), HCTX_FLAG_NAME(TAG_HCTX_SHARED), HCTX_FLAG_NAME(MANAGED_IRQ), }; diff --git a/block/blk-mq.c b/block/blk-mq.c index 1d45d2922ca7..e672ebd93342 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2636,7 +2636,7 @@ static int blk_mq_hctx_notify_dead(unsigned int cpu, struct hlist_node *node) static void blk_mq_remove_cpuhp(struct blk_mq_hw_ctx *hctx) { - if (!(hctx->flags & BLK_MQ_F_STACKING)) + if (hctx->flags & BLK_MQ_F_MANAGED_IRQ) cpuhp_state_remove_instance_nocalls(CPUHP_AP_BLK_MQ_ONLINE, &hctx->cpuhp_online); cpuhp_state_remove_instance_nocalls(CPUHP_BLK_MQ_DEAD, @@ -2731,7 +2731,7 @@ static int blk_mq_init_hctx(struct request_queue *q, { hctx->queue_num = hctx_idx; - if (!(hctx->flags & BLK_MQ_F_STACKING)) + if (hctx->flags & BLK_MQ_F_MANAGED_IRQ) cpuhp_state_add_instance_nocalls(CPUHP_AP_BLK_MQ_ONLINE, &hctx->cpuhp_online); cpuhp_state_add_instance_nocalls(CPUHP_BLK_MQ_DEAD, &hctx->cpuhp_dead); diff --git a/drivers/block/loop.c b/drivers/block/loop.c index cc0e8c39a48b..02509bc54242 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -2268,7 +2268,7 @@ static int loop_add(struct loop_device **l, int i) lo->tag_set.queue_depth = 128; lo->tag_set.numa_node = NUMA_NO_NODE; lo->tag_set.cmd_size = sizeof(struct loop_cmd); - lo->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_STACKING; + lo->tag_set.flags = BLK_MQ_F_SHOULD_MERGE; lo->tag_set.driver_data = lo; err = blk_mq_alloc_tag_set(&lo->tag_set); diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c index 0dbd48cbdff9..294d4858c067 100644 --- a/drivers/md/dm-rq.c +++ b/drivers/md/dm-rq.c @@ -540,7 +540,7 @@ int dm_mq_init_request_queue(struct mapped_device *md, struct dm_table *t) md->tag_set->ops = &dm_mq_ops; md->tag_set->queue_depth = dm_get_blk_mq_queue_depth(); md->tag_set->numa_node = md->numa_node_id; - md->tag_set->flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_STACKING; + md->tag_set->flags = BLK_MQ_F_SHOULD_MERGE; md->tag_set->nr_hw_queues = dm_get_blk_mq_nr_hw_queues(); md->tag_set->driver_data = md; diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 62fc0393cc3a..d75ab9fd64fc 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -397,11 +397,6 @@ struct blk_mq_ops { enum { BLK_MQ_F_SHOULD_MERGE = 1 << 0, BLK_MQ_F_TAG_QUEUE_SHARED = 1 << 1, - /* - * Set when this device requires underlying blk-mq device for - * completing IO: - */ - BLK_MQ_F_STACKING = 1 << 2, BLK_MQ_F_TAG_HCTX_SHARED = 1 << 3, BLK_MQ_F_MANAGED_IRQ = 1 << 4, BLK_MQ_F_BLOCKING = 1 << 5, -- 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-07-02 15:08 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-02 15:05 [PATCH V2 0/6] blk-mq: fix blk_mq_alloc_request_hctx Ming Lei 2021-07-02 15:05 ` Ming Lei 2021-07-02 15:05 ` [PATCH V2 1/6] blk-mq: prepare for not deactivating hctx if managed irq isn't used Ming Lei 2021-07-02 15:05 ` Ming Lei 2021-07-02 15:05 ` [PATCH V2 2/6] nvme: pci: pass BLK_MQ_F_MANAGED_IRQ to blk-mq Ming Lei 2021-07-02 15:05 ` Ming Lei 2021-07-02 15:05 ` [PATCH V2 3/6] scsi: add flag of .use_managed_irq to 'struct Scsi_Host' Ming Lei 2021-07-02 15:05 ` Ming Lei 2021-07-05 9:25 ` John Garry 2021-07-05 9:25 ` John Garry 2021-07-05 9:55 ` Ming Lei 2021-07-05 9:55 ` Ming Lei 2021-07-06 5:37 ` Christoph Hellwig 2021-07-06 5:37 ` Christoph Hellwig 2021-07-06 7:41 ` Ming Lei 2021-07-06 7:41 ` Ming Lei 2021-07-06 10:32 ` Hannes Reinecke 2021-07-06 10:32 ` Hannes Reinecke 2021-07-07 10:53 ` Ming Lei 2021-07-07 10:53 ` Ming Lei 2021-07-02 15:05 ` [PATCH V2 4/6] scsi: set shost->use_managed_irq if driver uses managed irq Ming Lei 2021-07-02 15:05 ` Ming Lei 2021-07-05 7:35 ` John Garry 2021-07-05 7:35 ` John Garry 2021-07-06 5:38 ` Christoph Hellwig 2021-07-06 5:38 ` Christoph Hellwig 2021-07-02 15:05 ` [PATCH V2 5/6] virtio: add one field into virtio_device for recording if device " Ming Lei 2021-07-02 15:05 ` Ming Lei 2021-07-02 15:05 ` Ming Lei 2021-07-02 15:55 ` Michael S. Tsirkin 2021-07-02 15:55 ` Michael S. Tsirkin 2021-07-02 15:55 ` Michael S. Tsirkin 2021-07-05 2:48 ` Ming Lei 2021-07-05 2:48 ` Ming Lei 2021-07-05 2:48 ` Ming Lei 2021-07-05 3:59 ` Jason Wang 2021-07-05 3:59 ` Jason Wang 2021-07-05 3:59 ` Jason Wang 2021-07-06 5:42 ` Christoph Hellwig 2021-07-06 5:42 ` Christoph Hellwig 2021-07-06 5:42 ` Christoph Hellwig 2021-07-06 7:53 ` Ming Lei 2021-07-06 7:53 ` Ming Lei 2021-07-06 7:53 ` Ming Lei 2021-07-07 9:06 ` Thomas Gleixner 2021-07-07 9:06 ` Thomas Gleixner 2021-07-07 9:06 ` Thomas Gleixner 2021-07-07 9:42 ` Ming Lei 2021-07-07 9:42 ` Ming Lei 2021-07-07 9:42 ` Ming Lei 2021-07-07 14:05 ` Christoph Hellwig 2021-07-07 14:05 ` Christoph Hellwig 2021-07-07 14:05 ` Christoph Hellwig 2021-07-08 6:34 ` Ming Lei 2021-07-08 6:34 ` Ming Lei 2021-07-08 6:34 ` Ming Lei 2021-07-02 15:05 ` Ming Lei [this message] 2021-07-02 15:05 ` [PATCH V2 6/6] blk-mq: don't deactivate hctx if managed irq isn't used Ming Lei
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=20210702150555.2401722-7-ming.lei@redhat.com \ --to=ming.lei@redhat.com \ --cc=axboe@kernel.dk \ --cc=damien.lemoal@wdc.com \ --cc=dwagner@suse.de \ --cc=hare@suse.de \ --cc=hch@lst.de \ --cc=john.garry@huawei.com \ --cc=kbusch@kernel.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=linux-scsi@vger.kernel.org \ --cc=martin.petersen@oracle.com \ --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.