From: Ming Lei <ming.lei@redhat.com>
To: John Garry <john.garry@huawei.com>
Cc: axboe@kernel.dk, linux-block@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org,
hare@suse.de
Subject: Re: [PATCH v4 11/13] blk-mq: Refactor and rename blk_mq_free_map_and_{requests->rqs}()
Date: Sun, 26 Sep 2021 10:05:31 +0800 [thread overview]
Message-ID: <YU/Va9T+zcRNExUF@T590> (raw)
In-Reply-To: <1632472110-244938-12-git-send-email-john.garry@huawei.com>
On Fri, Sep 24, 2021 at 04:28:28PM +0800, John Garry wrote:
> Refactor blk_mq_free_map_and_requests() such that it can be used at many
> sites at which the tag map and rqs are freed.
>
> Also rename to blk_mq_free_map_and_rqs(), which is shorter and matches the
> alloc equivalent.
>
> Suggested-by: Ming Lei <ming.lei@redhat.com>
> Signed-off-by: John Garry <john.garry@huawei.com>
> Reviewed-by: Hannes Reinecke <hare@suse.de>
> ---
> block/blk-mq-tag.c | 3 +--
> block/blk-mq.c | 40 ++++++++++++++++++++++++----------------
> block/blk-mq.h | 4 +++-
> 3 files changed, 28 insertions(+), 19 deletions(-)
>
> diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
> index db99f1246795..a0ecc6d88f84 100644
> --- a/block/blk-mq-tag.c
> +++ b/block/blk-mq-tag.c
> @@ -607,8 +607,7 @@ int blk_mq_tag_update_depth(struct blk_mq_hw_ctx *hctx,
> if (!new)
> return -ENOMEM;
>
> - blk_mq_free_rqs(set, *tagsptr, hctx->queue_num);
> - blk_mq_free_rq_map(*tagsptr, set->flags);
> + blk_mq_free_map_and_rqs(set, *tagsptr, hctx->queue_num);
> *tagsptr = new;
> } else {
> /*
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index 46772773b9c4..464ea20b9bcb 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -2878,15 +2878,15 @@ static bool __blk_mq_alloc_map_and_rqs(struct blk_mq_tag_set *set,
> return set->tags[hctx_idx];
> }
>
> -static void blk_mq_free_map_and_requests(struct blk_mq_tag_set *set,
> - unsigned int hctx_idx)
> +void blk_mq_free_map_and_rqs(struct blk_mq_tag_set *set,
> + struct blk_mq_tags *tags,
> + unsigned int hctx_idx)
> {
> unsigned int flags = set->flags;
>
> - if (set->tags && set->tags[hctx_idx]) {
> - blk_mq_free_rqs(set, set->tags[hctx_idx], hctx_idx);
> - blk_mq_free_rq_map(set->tags[hctx_idx], flags);
> - set->tags[hctx_idx] = NULL;
> + if (tags) {
> + blk_mq_free_rqs(set, tags, hctx_idx);
> + blk_mq_free_rq_map(tags, flags);
> }
> }
>
> @@ -2967,8 +2967,10 @@ static void blk_mq_map_swqueue(struct request_queue *q)
> * fallback in case of a new remap fails
> * allocation
> */
> - if (i && set->tags[i])
> - blk_mq_free_map_and_requests(set, i);
> + if (i && set->tags[i]) {
> + blk_mq_free_map_and_rqs(set, set->tags[i], i);
> + set->tags[i] = NULL;
> + }
>
> hctx->tags = NULL;
> continue;
> @@ -3264,8 +3266,8 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,
> struct blk_mq_hw_ctx *hctx = hctxs[j];
>
> if (hctx) {
> - if (hctx->tags)
> - blk_mq_free_map_and_requests(set, j);
> + blk_mq_free_map_and_rqs(set, set->tags[j], j);
> + set->tags[j] = NULL;
> blk_mq_exit_hctx(q, set, hctx, j);
> hctxs[j] = NULL;
> }
> @@ -3361,8 +3363,10 @@ static int __blk_mq_alloc_rq_maps(struct blk_mq_tag_set *set)
> return 0;
>
> out_unwind:
> - while (--i >= 0)
> - blk_mq_free_map_and_requests(set, i);
> + while (--i >= 0) {
> + blk_mq_free_map_and_rqs(set, set->tags[i], i);
> + set->tags[i] = NULL;
> + }
>
> return -ENOMEM;
> }
> @@ -3557,8 +3561,10 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set)
> return 0;
>
> out_free_mq_rq_maps:
> - for (i = 0; i < set->nr_hw_queues; i++)
> - blk_mq_free_map_and_requests(set, i);
> + for (i = 0; i < set->nr_hw_queues; i++) {
> + blk_mq_free_map_and_rqs(set, set->tags[i], i);
> + set->tags[i] = NULL;
> + }
> out_free_mq_map:
> for (i = 0; i < set->nr_maps; i++) {
> kfree(set->map[i].mq_map);
> @@ -3590,8 +3596,10 @@ void blk_mq_free_tag_set(struct blk_mq_tag_set *set)
> {
> int i, j;
>
> - for (i = 0; i < set->nr_hw_queues; i++)
> - blk_mq_free_map_and_requests(set, i);
> + for (i = 0; i < set->nr_hw_queues; i++) {
> + blk_mq_free_map_and_rqs(set, set->tags[i], i);
> + set->tags[i] = NULL;
> + }
There are 5 callers in which 'set->tags[i]' is cleared, so just
wondering why you don't clear set->tags[i] at default in
blk_mq_free_map_and_rqs(). And just call __blk_mq_free_map_and_rqs()
for the only other user?
Thanks,
Ming
next prev parent reply other threads:[~2021-09-26 2:05 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-24 8:28 [PATCH v4 00/13] blk-mq: Reduce static requests memory footprint for shared sbitmap John Garry
2021-09-24 8:28 ` [PATCH v4 01/13] blk-mq: Change rqs check in blk_mq_free_rqs() John Garry
2021-09-24 8:28 ` [PATCH v4 02/13] block: Rename BLKDEV_MAX_RQ -> BLKDEV_DEFAULT_RQ John Garry
2021-09-24 8:28 ` [PATCH v4 03/13] blk-mq: Relocate shared sbitmap resize in blk_mq_update_nr_requests() John Garry
2021-09-24 8:28 ` [PATCH v4 04/13] blk-mq: Invert check " John Garry
2021-09-24 8:28 ` [PATCH v4 05/13] blk-mq-sched: Rename blk_mq_sched_alloc_{tags -> map_and_rqs}() John Garry
2021-09-24 10:08 ` Hannes Reinecke
2021-09-24 8:28 ` [PATCH v4 06/13] blk-mq-sched: Rename blk_mq_sched_free_{requests -> rqs}() John Garry
2021-09-26 1:15 ` Ming Lei
2021-09-24 8:28 ` [PATCH v4 07/13] blk-mq: Pass driver tags to blk_mq_clear_rq_mapping() John Garry
2021-09-26 1:42 ` Ming Lei
2021-09-24 8:28 ` [PATCH v4 08/13] blk-mq: Don't clear driver tags own mapping John Garry
2021-09-26 1:43 ` Ming Lei
2021-09-24 8:28 ` [PATCH v4 09/13] blk-mq: Add blk_mq_tag_update_sched_shared_sbitmap() John Garry
2021-09-24 8:28 ` [PATCH v4 10/13] blk-mq: Add blk_mq_alloc_map_and_rqs() John Garry
2021-09-26 2:00 ` Ming Lei
2021-09-24 8:28 ` [PATCH v4 11/13] blk-mq: Refactor and rename blk_mq_free_map_and_{requests->rqs}() John Garry
2021-09-26 2:05 ` Ming Lei [this message]
2021-09-27 9:02 ` John Garry
2021-09-27 9:19 ` Ming Lei
2021-09-27 9:40 ` John Garry
2021-09-24 8:28 ` [PATCH v4 12/13] blk-mq: Use shared tags for shared sbitmap support John Garry
2021-09-24 10:23 ` Hannes Reinecke
2021-09-24 10:39 ` John Garry
2021-09-29 13:36 ` John Garry
2021-09-26 3:25 ` Ming Lei
2021-09-27 9:13 ` John Garry
2021-09-27 9:26 ` Ming Lei
2021-09-27 9:41 ` John Garry
2021-09-24 8:28 ` [PATCH v4 13/13] blk-mq: Stop using pointers for blk_mq_tags bitmap tags John Garry
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=YU/Va9T+zcRNExUF@T590 \
--to=ming.lei@redhat.com \
--cc=axboe@kernel.dk \
--cc=hare@suse.de \
--cc=john.garry@huawei.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
/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).