From: Alexander Gordeev <agordeev@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Alexander Gordeev <agordeev@redhat.com>, linux-block@vger.kernel.org
Subject: [PATCH v2 6/8] blk-mq: Rework blk_mq_realloc_hw_ctxs()
Date: Fri, 30 Sep 2016 15:23:28 +0200 [thread overview]
Message-ID: <7459c980dd965b5f7b91e3bf1c3114d658535229.1475241231.git.agordeev@redhat.com> (raw)
In-Reply-To: <cover.1475241231.git.agordeev@redhat.com>
Rework blk_mq_realloc_hw_ctxs() so deallocation is done in order
reverse to allocation and indentation is bit more easy to read.
CC: linux-block@vger.kernel.org
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
---
block/blk-mq.c | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 15c03c2..4b07901 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1895,6 +1895,7 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,
struct request_queue *q)
{
int i, j;
+ struct blk_mq_hw_ctx *hctx;
struct blk_mq_hw_ctx **hctxs = q->queue_hw_ctx;
blk_mq_sysfs_unregister(q);
@@ -1908,33 +1909,36 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,
if (node == NUMA_NO_NODE)
node = set->numa_node;
- hctxs[i] = kzalloc_node(sizeof(struct blk_mq_hw_ctx),
- GFP_KERNEL, node);
- if (!hctxs[i])
+ hctx = kzalloc_node(sizeof(*hctx), GFP_KERNEL, node);
+ if (!hctx)
break;
- if (blk_mq_init_hctx(q, set, hctxs[i], i, node)) {
- kfree(hctxs[i]);
- hctxs[i] = NULL;
+ if (blk_mq_init_hctx(q, set, hctx, i, node)) {
+ kfree(hctx);
break;
}
- blk_mq_hctx_kobj_init(hctxs[i]);
+
+ blk_mq_hctx_kobj_init(hctx);
+ hctxs[i] = hctx;
}
for (j = i; j < q->nr_hw_queues; j++) {
- struct blk_mq_hw_ctx *hctx = hctxs[j];
+ hctx = hctxs[i];
- if (hctx) {
- if (hctx->tags) {
- blk_mq_free_rq_map(set, hctx->tags, j);
- set->tags[j] = NULL;
- }
- blk_mq_exit_hctx(q, set, hctx, j);
- kobject_put(&hctx->kobj);
- kfree(hctx->ctxs);
- kfree(hctx);
- hctxs[j] = NULL;
+ if (!hctx)
+ continue;
+ hctxs[i] = NULL;
+ kobject_put(&hctx->kobj);
+
+ if (hctx->tags) {
+ blk_mq_free_rq_map(set, hctx->tags, j);
+ set->tags[j] = NULL;
}
+
+ blk_mq_exit_hctx(q, set, hctx, j);
+
+ kfree(hctx->ctxs);
+ kfree(hctx);
}
q->nr_hw_queues = i;
blk_mq_sysfs_register(q);
--
1.8.3.1
next prev parent reply other threads:[~2016-09-30 13:24 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-30 13:23 [PATCH v2 0/8] blk-mq: Minor cleanups Alexander Gordeev
2016-09-30 13:23 ` [PATCH v2 1/8] block: Get rid of unused request_queue::nr_queues member Alexander Gordeev
2016-10-05 21:37 ` Sagi Grimberg
2016-09-30 13:23 ` [PATCH v2 2/8] blk-mq: Remove a redundant assignment Alexander Gordeev
2016-10-05 21:37 ` Sagi Grimberg
2016-09-30 13:23 ` [PATCH v2 3/8] blk-mq: Fix hardware context data node selection Alexander Gordeev
2016-10-05 21:38 ` Sagi Grimberg
2016-09-30 13:23 ` [PATCH v2 4/8] blk-mq: Cleanup a loop exit condition Alexander Gordeev
2016-10-05 21:41 ` Sagi Grimberg
2016-09-30 13:23 ` [PATCH v2 5/8] blk-mq: Cleanup blk_mq_hw_ctx::cpumask (de-)allocation Alexander Gordeev
2016-10-05 21:43 ` Sagi Grimberg
2016-09-30 13:23 ` Alexander Gordeev [this message]
2016-10-05 21:47 ` [PATCH v2 6/8] blk-mq: Rework blk_mq_realloc_hw_ctxs() Sagi Grimberg
2016-10-06 8:25 ` Alexander Gordeev
2016-10-06 10:11 ` Sagi Grimberg
2016-10-09 21:30 ` [PATCH v3 " Alexander Gordeev
2016-09-30 13:23 ` [PATCH v2 7/8] blk-mq: Pair blk_mq_hctx_kobj_init() with blk_mq_hctx_kobj_put() Alexander Gordeev
2016-10-05 21:47 ` Sagi Grimberg
2016-10-09 21:31 ` [PATCH v3 " Alexander Gordeev
2016-09-30 13:23 ` [PATCH v2 8/8] blk-mq: Cleanup (de-)allocation of blk_mq_hw_ctx::ctxs Alexander Gordeev
2016-10-05 21:48 ` Sagi Grimberg
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=7459c980dd965b5f7b91e3bf1c3114d658535229.1475241231.git.agordeev@redhat.com \
--to=agordeev@redhat.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@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).