From: Weiping Zhang <zhangweiping@didiglobal.com>
To: <axboe@kernel.dk>, <tom.leiming@gmail.com>, <bvanassche@acm.org>
Cc: <linux-block@vger.kernel.org>
Subject: [PATCH v5 1/5] block: free both rq_map and request
Date: Tue, 5 May 2020 14:43:16 +0800 [thread overview]
Message-ID: <b679d39aff2fc337e68f1e5f8c519b36a880b138.1588660550.git.zhangweiping@didiglobal.com> (raw)
In-Reply-To: <cover.1588660550.git.zhangweiping@didiglobal.com>
Allocation:
__blk_mq_alloc_rq_map
blk_mq_alloc_rq_map
blk_mq_alloc_rq_map
tags = blk_mq_init_tags : kzalloc_node:
tags->rqs = kcalloc_node
tags->static_rqs = kcalloc_node
blk_mq_alloc_rqs
p = alloc_pages_node
tags->static_rqs[i] = p + offset;
Free:
blk_mq_free_rq_map
kfree(tags->rqs);
kfree(tags->static_rqs);
blk_mq_free_tags
kfree(tags);
The page allocated in blk_mq_alloc_rqs cannot be released,
so we should use blk_mq_free_map_and_requests here.
blk_mq_free_map_and_requests
blk_mq_free_rqs
__free_pages : cleanup for blk_mq_alloc_rqs
blk_mq_free_rq_map : cleanup for blk_mq_alloc_rq_map
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Weiping Zhang <zhangweiping@didiglobal.com>
---
block/blk-mq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index a7785df2c944..f789b3e1b3ab 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2995,7 +2995,7 @@ static int __blk_mq_alloc_rq_maps(struct blk_mq_tag_set *set)
out_unwind:
while (--i >= 0)
- blk_mq_free_rq_map(set->tags[i]);
+ blk_mq_free_map_and_requests(set, i);
return -ENOMEM;
}
--
2.18.1
next prev parent reply other threads:[~2020-05-05 6:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-05 6:43 [PATCH v5 0/5] Fix potential kernel panic when increase hardware queue Weiping Zhang
2020-05-05 6:43 ` Weiping Zhang [this message]
2020-05-07 6:10 ` [PATCH v5 1/5] block: free both rq_map and request Christoph Hellwig
2020-05-05 6:43 ` [PATCH v5 2/5] block: save previous hardware queue count before udpate Weiping Zhang
2020-05-07 6:11 ` Christoph Hellwig
2020-05-05 6:45 ` [PATCH v5 4/5] block: rename __blk_mq_alloc_rq_map Weiping Zhang
2020-05-07 6:11 ` Christoph Hellwig
2020-05-07 12:59 ` Weiping Zhang
2020-05-05 6:46 ` [PATCH v5 5/5] block: rename blk_mq_alloc_rq_maps Weiping Zhang
2020-05-07 6:11 ` Christoph Hellwig
2020-05-05 7:02 ` [PATCH v5 3/5] block: alloc map and request for new hardware queue Weiping Zhang
2020-05-05 7:38 ` [RESEND PATCH " Weiping Zhang
2020-05-07 6:13 ` [PATCH " Christoph Hellwig
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=b679d39aff2fc337e68f1e5f8c519b36a880b138.1588660550.git.zhangweiping@didiglobal.com \
--to=zhangweiping@didiglobal.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=linux-block@vger.kernel.org \
--cc=tom.leiming@gmail.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).