From: Hannes Reinecke <hare@suse.de>
To: John Garry <john.garry@huawei.com>,
axboe@kernel.dk, jejb@linux.ibm.com, martin.petersen@oracle.com,
don.brace@microsemi.com, kashyap.desai@broadcom.com,
sumit.saxena@broadcom.com, ming.lei@redhat.com,
bvanassche@acm.org, hare@suse.com, hch@lst.de,
shivasharan.srikanteshwara@broadcom.com
Cc: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org,
esc.storagedev@microsemi.com, chenxiang66@hisilicon.com,
megaraidlinux.pdl@broadcom.com
Subject: Re: [PATCH RFC v7 06/12] blk-mq: Record active_queues_shared_sbitmap per tag_set for when using shared sbitmap
Date: Thu, 11 Jun 2020 15:16:27 +0200 [thread overview]
Message-ID: <a10a20de-d8e2-8505-65ec-1c26bfbf6cfc@suse.de> (raw)
In-Reply-To: <1591810159-240929-7-git-send-email-john.garry@huawei.com>
On 6/10/20 7:29 PM, John Garry wrote:
> For when using a shared sbitmap, no longer should the number of active
> request queues per hctx be relied on for when judging how to share the tag
> bitmap.
>
> Instead maintain the number of active request queues per tag_set, and make
> the judgment based on that.
>
> And since the blk_mq_tags.active_queues is no longer maintained, do not
> show it in debugfs.
>
> Originally-from: Kashyap Desai <kashyap.desai@broadcom.com>
> Signed-off-by: John Garry <john.garry@huawei.com>
> ---
> block/blk-mq-debugfs.c | 25 ++++++++++++++++++++--
> block/blk-mq-tag.c | 47 ++++++++++++++++++++++++++++++++----------
> block/blk-mq.c | 2 ++
> include/linux/blk-mq.h | 1 +
> include/linux/blkdev.h | 1 +
> 5 files changed, 63 insertions(+), 13 deletions(-)
>
> diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
> index 0fa3af41ab65..05b4be0c03d9 100644
> --- a/block/blk-mq-debugfs.c
> +++ b/block/blk-mq-debugfs.c
> @@ -458,17 +458,37 @@ static void blk_mq_debugfs_tags_show(struct seq_file *m,
> }
> }
>
> +static void blk_mq_debugfs_tags_shared_sbitmap_show(struct seq_file *m,
> + struct blk_mq_tags *tags)
> +{
> + seq_printf(m, "nr_tags=%u\n", tags->nr_tags);
> + seq_printf(m, "nr_reserved_tags=%u\n", tags->nr_reserved_tags);
> +
> + seq_puts(m, "\nbitmap_tags:\n");
> + sbitmap_queue_show(tags->bitmap_tags, m);
> +
> + if (tags->nr_reserved_tags) {
> + seq_puts(m, "\nbreserved_tags:\n");
> + sbitmap_queue_show(tags->breserved_tags, m);
> + }
> +}
> +
> static int hctx_tags_show(void *data, struct seq_file *m)
> {
> struct blk_mq_hw_ctx *hctx = data;
> struct request_queue *q = hctx->queue;
> + struct blk_mq_tag_set *set = q->tag_set;
> int res;
>
> res = mutex_lock_interruptible(&q->sysfs_lock);
> if (res)
> goto out;
> - if (hctx->tags)
> - blk_mq_debugfs_tags_show(m, hctx->tags);
> + if (hctx->tags) {
> + if (blk_mq_is_sbitmap_shared(set))
> + blk_mq_debugfs_tags_shared_sbitmap_show(m, hctx->tags);
> + else
> + blk_mq_debugfs_tags_show(m, hctx->tags);
> + }
> mutex_unlock(&q->sysfs_lock);
>
> out:
> @@ -802,6 +822,7 @@ static const struct blk_mq_debugfs_attr blk_mq_debugfs_hctx_shared_sbitmap_attrs
> {"dispatch", 0400, .seq_ops = &hctx_dispatch_seq_ops},
> {"busy", 0400, hctx_busy_show},
> {"ctx_map", 0400, hctx_ctx_map_show},
> + {"tags", 0400, hctx_tags_show},
> {"sched_tags", 0400, hctx_sched_tags_show},
> {"sched_tags_bitmap", 0400, hctx_sched_tags_bitmap_show},
> {"io_poll", 0600, hctx_io_poll_show, hctx_io_poll_write},
I had been pondering this, too, when creating v6. Problem is that it'll
show the tags per hctx, but as they are shared I guess the list looks
pretty identical per hctx.
So I guess we should filter the tags per hctx to have only those active
on that hctx displayed. But when doing so we can only print the
in-flight tags, the others are not assigned to a hctx and as such we
can't make a decision on which hctx they'll end up.
> diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
> index 7db16e49f6f6..6ca06b1c3a99 100644
> --- a/block/blk-mq-tag.c
> +++ b/block/blk-mq-tag.c
> @@ -23,9 +23,19 @@
> */
> bool __blk_mq_tag_busy(struct blk_mq_hw_ctx *hctx)
> {
> - if (!test_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state) &&
> - !test_and_set_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state))
> - atomic_inc(&hctx->tags->active_queues);
> + struct request_queue *q = hctx->queue;
> + struct blk_mq_tag_set *set = q->tag_set;
> +
> + if (blk_mq_is_sbitmap_shared(set)){
> + if (!test_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags) &&
> + !test_and_set_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags))
> + atomic_inc(&set->active_queues_shared_sbitmap);
> +
> + } else {
> + if (!test_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state) &&
> + !test_and_set_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state))
> + atomic_inc(&hctx->tags->active_queues);
> + }
>
> return true;
> }
At one point someone would need to educate me what this double
'test_bit' and 'test_and_set_bit' is supposed to achieve.
Other than deliberately injecting a race condition ...
> @@ -47,11 +57,19 @@ void blk_mq_tag_wakeup_all(struct blk_mq_tags *tags, bool include_reserve)
> void __blk_mq_tag_idle(struct blk_mq_hw_ctx *hctx)
> {
> struct blk_mq_tags *tags = hctx->tags;
> -
> - if (!test_and_clear_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state))
> - return;
> -
> - atomic_dec(&tags->active_queues);
> + struct request_queue *q = hctx->queue;
> + struct blk_mq_tag_set *set = q->tag_set;
> +
> + if (blk_mq_is_sbitmap_shared(q->tag_set)){
> + if (!test_and_clear_bit(QUEUE_FLAG_HCTX_ACTIVE,
> + &q->queue_flags))
> + return;
> + atomic_dec(&set->active_queues_shared_sbitmap);
> + } else {
> + if (!test_and_clear_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state))
> + return;
> + atomic_dec(&tags->active_queues);
> + }
>
> blk_mq_tag_wakeup_all(tags, false);
> }
> @@ -65,12 +83,11 @@ static inline bool hctx_may_queue(struct blk_mq_alloc_data *data,
> {
> struct blk_mq_hw_ctx *hctx = data->hctx;
> struct request_queue *q = data->q;
> + struct blk_mq_tag_set *set = q->tag_set;
> unsigned int depth, users;
>
> if (!hctx || !(hctx->flags & BLK_MQ_F_TAG_QUEUE_SHARED))
> return true;
> - if (!test_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state))
> - return true;
>
> /*
> * Don't try dividing an ant
> @@ -78,7 +95,15 @@ static inline bool hctx_may_queue(struct blk_mq_alloc_data *data,
> if (bt->sb.depth == 1)
> return true;
>
> - users = atomic_read(&hctx->tags->active_queues);
> + if (blk_mq_is_sbitmap_shared(q->tag_set)) {
> + if (!test_bit(BLK_MQ_S_TAG_ACTIVE, &q->queue_flags))
> + return true;
> + users = atomic_read(&set->active_queues_shared_sbitmap);
> + } else {
> + if (!test_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state))
> + return true;
> + users = atomic_read(&hctx->tags->active_queues);
> + }
> if (!users)
> return true;
>
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index 0f7e062a1665..f73a2f9c58bd 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -3350,6 +3350,8 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set)
> goto out_free_mq_map;
>
> if (blk_mq_is_sbitmap_shared(set)) {
> + atomic_set(&set->active_queues_shared_sbitmap, 0);
> +
> if (!blk_mq_init_shared_sbitmap(set)) {
> ret = -ENOMEM;
> goto out_free_mq_rq_maps;
> diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
> index 7b31cdb92a71..66711c7234db 100644
> --- a/include/linux/blk-mq.h
> +++ b/include/linux/blk-mq.h
> @@ -252,6 +252,7 @@ struct blk_mq_tag_set {
> unsigned int timeout;
> unsigned int flags;
> void *driver_data;
> + atomic_t active_queues_shared_sbitmap;
>
> struct sbitmap_queue __bitmap_tags;
> struct sbitmap_queue __breserved_tags;
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index c536278bec9e..1b0087e8d01a 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -619,6 +619,7 @@ struct request_queue {
> #define QUEUE_FLAG_PCI_P2PDMA 25 /* device supports PCI p2p requests */
> #define QUEUE_FLAG_ZONE_RESETALL 26 /* supports Zone Reset All */
> #define QUEUE_FLAG_RQ_ALLOC_TIME 27 /* record rq->alloc_time_ns */
> +#define QUEUE_FLAG_HCTX_ACTIVE 28 /* at least one blk-mq hctx is active */
>
> #define QUEUE_FLAG_MQ_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \
> (1 << QUEUE_FLAG_SAME_COMP))
>
Other than that it looks fine.
Cheers,
Hannes
--
Dr. Hannes Reinecke Teamlead Storage & Networking
hare@suse.de +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
next prev parent reply other threads:[~2020-06-11 13:16 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-10 17:29 [PATCH RFC v7 00/12] blk-mq/scsi: Provide hostwide shared tags for SCSI HBAs John Garry
2020-06-10 17:29 ` [PATCH RFC v7 01/12] blk-mq: rename BLK_MQ_F_TAG_SHARED as BLK_MQ_F_TAG_QUEUE_SHARED John Garry
2020-06-10 17:29 ` [PATCH RFC v7 02/12] blk-mq: rename blk_mq_update_tag_set_depth() John Garry
2020-06-11 2:57 ` Ming Lei
2020-06-11 8:26 ` John Garry
2020-06-23 11:25 ` John Garry
2020-06-23 14:23 ` Hannes Reinecke
2020-06-24 8:13 ` Kashyap Desai
2020-06-29 16:18 ` John Garry
2020-08-10 16:51 ` Kashyap Desai
2020-08-11 8:01 ` John Garry
2020-08-11 16:34 ` Kashyap Desai
2020-06-10 17:29 ` [PATCH RFC v7 03/12] blk-mq: Use pointers for blk_mq_tags bitmap tags John Garry
2020-06-10 17:29 ` [PATCH RFC v7 04/12] blk-mq: Facilitate a shared sbitmap per tagset John Garry
2020-06-11 3:37 ` Ming Lei
2020-06-11 10:09 ` John Garry
2020-06-10 17:29 ` [PATCH RFC v7 05/12] blk-mq: Record nr_active_requests per queue for when using shared sbitmap John Garry
2020-06-11 4:04 ` Ming Lei
2020-06-11 10:22 ` John Garry
2020-06-10 17:29 ` [PATCH RFC v7 06/12] blk-mq: Record active_queues_shared_sbitmap per tag_set " John Garry
2020-06-11 13:16 ` Hannes Reinecke [this message]
2020-06-11 14:22 ` John Garry
2020-06-10 17:29 ` [PATCH RFC v7 07/12] blk-mq: Add support in hctx_tags_bitmap_show() for a " John Garry
2020-06-11 13:19 ` Hannes Reinecke
2020-06-11 14:33 ` John Garry
2020-06-12 6:06 ` Hannes Reinecke
2020-06-29 15:32 ` About sbitmap_bitmap_show() and cleared bits (was Re: [PATCH RFC v7 07/12] blk-mq: Add support in hctx_tags_bitmap_show() for a shared sbitmap) John Garry
2020-06-30 6:33 ` Hannes Reinecke
2020-06-30 7:30 ` John Garry
2020-06-30 11:36 ` John Garry
2020-06-30 14:55 ` Bart Van Assche
2020-07-13 9:41 ` [PATCH RFC v7 07/12] blk-mq: Add support in hctx_tags_bitmap_show() for a shared sbitmap John Garry
2020-07-13 12:20 ` Hannes Reinecke
2020-06-10 17:29 ` [PATCH RFC v7 08/12] scsi: Add template flag 'host_tagset' John Garry
2020-06-10 17:29 ` [PATCH RFC v7 09/12] scsi: hisi_sas: Switch v3 hw to MQ John Garry
2020-06-10 17:29 ` [PATCH RFC v7 10/12] megaraid_sas: switch fusion adapters " John Garry
2020-07-02 10:23 ` Kashyap Desai
2020-07-06 8:23 ` John Garry
2020-07-06 8:45 ` Hannes Reinecke
2020-07-06 9:26 ` John Garry
2020-07-06 9:40 ` Hannes Reinecke
2020-07-06 19:19 ` Kashyap Desai
2020-07-07 7:58 ` John Garry
2020-07-07 14:45 ` Kashyap Desai
2020-07-07 16:17 ` John Garry
2020-07-09 19:01 ` Kashyap Desai
2020-07-10 8:10 ` John Garry
2020-07-13 7:55 ` Kashyap Desai
2020-07-13 8:42 ` John Garry
2020-07-19 19:07 ` Kashyap Desai
2020-07-20 7:23 ` Kashyap Desai
2020-07-20 9:18 ` John Garry
2020-07-21 1:13 ` Ming Lei
2020-07-21 6:53 ` Kashyap Desai
2020-07-22 4:12 ` Ming Lei
2020-07-22 5:30 ` Kashyap Desai
2020-07-22 8:04 ` Ming Lei
2020-07-22 9:32 ` John Garry
2020-07-23 14:07 ` Ming Lei
2020-07-23 17:29 ` John Garry
2020-07-24 2:47 ` Ming Lei
2020-07-28 7:54 ` John Garry
2020-07-28 8:45 ` Ming Lei
2020-07-29 5:25 ` Kashyap Desai
2020-07-29 15:36 ` Ming Lei
2020-07-29 18:31 ` Kashyap Desai
2020-08-04 8:36 ` Ming Lei
2020-08-04 9:27 ` Kashyap Desai
2020-08-05 8:40 ` Ming Lei
2020-08-06 10:25 ` Kashyap Desai
2020-08-06 13:38 ` Ming Lei
2020-08-06 14:37 ` Kashyap Desai
2020-08-06 15:29 ` Ming Lei
2020-08-08 19:05 ` Kashyap Desai
2020-08-09 2:16 ` Ming Lei
2020-08-10 16:38 ` Kashyap Desai
2020-08-11 8:09 ` John Garry
2020-08-04 17:00 ` John Garry
2020-08-05 2:56 ` Ming Lei
2020-07-28 8:01 ` Kashyap Desai
2020-07-08 11:31 ` John Garry
2020-06-10 17:29 ` [PATCH RFC v7 11/12] smartpqi: enable host tagset John Garry
2020-07-14 13:16 ` John Garry
2020-07-14 13:31 ` John Garry
2020-07-14 18:16 ` Don.Brace
2020-07-15 7:28 ` John Garry
2020-07-14 14:02 ` Hannes Reinecke
2020-08-18 8:33 ` John Garry
2020-06-10 17:29 ` [PATCH RFC v7 12/12] hpsa: enable host_tagset and switch to MQ John Garry
2020-07-14 7:37 ` John Garry
2020-07-14 7:41 ` Hannes Reinecke
2020-07-14 7:52 ` John Garry
2020-07-14 8:06 ` Ming Lei
2020-07-14 9:53 ` John Garry
2020-07-14 10:14 ` Ming Lei
2020-07-14 10:43 ` Hannes Reinecke
2020-07-14 10:19 ` Hannes Reinecke
2020-07-14 10:35 ` John Garry
2020-07-14 10:44 ` Ming Lei
2020-07-14 10:52 ` John Garry
2020-07-14 12:04 ` Ming Lei
2020-08-03 20:39 ` Don.Brace
2020-08-04 9:27 ` John Garry
2020-08-04 15:18 ` Don.Brace
2020-08-05 11:21 ` John Garry
2020-08-14 21:04 ` Don.Brace
2020-08-17 8:00 ` John Garry
2020-08-17 18:39 ` Don.Brace
2020-08-18 7:14 ` Hannes Reinecke
2020-07-16 16:14 ` Don.Brace
2020-07-16 19:45 ` Don.Brace
2020-07-17 10:11 ` John Garry
2020-06-11 3:07 ` [PATCH RFC v7 00/12] blk-mq/scsi: Provide hostwide shared tags for SCSI HBAs Ming Lei
2020-06-11 9:35 ` John Garry
2020-06-12 18:47 ` Kashyap Desai
2020-06-15 2:13 ` Ming Lei
2020-06-15 6:57 ` Kashyap Desai
2020-06-16 1:00 ` Ming Lei
2020-06-17 11:26 ` Kashyap Desai
2020-06-22 6:24 ` Hannes Reinecke
2020-06-23 0:55 ` Ming Lei
2020-06-23 11:50 ` Kashyap Desai
2020-06-23 12:11 ` Kashyap Desai
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=a10a20de-d8e2-8505-65ec-1c26bfbf6cfc@suse.de \
--to=hare@suse.de \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=chenxiang66@hisilicon.com \
--cc=don.brace@microsemi.com \
--cc=esc.storagedev@microsemi.com \
--cc=hare@suse.com \
--cc=hch@lst.de \
--cc=jejb@linux.ibm.com \
--cc=john.garry@huawei.com \
--cc=kashyap.desai@broadcom.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=megaraidlinux.pdl@broadcom.com \
--cc=ming.lei@redhat.com \
--cc=shivasharan.srikanteshwara@broadcom.com \
--cc=sumit.saxena@broadcom.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: 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;
as well as URLs for NNTP newsgroup(s).