Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1586036
| Path | csiph.com!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Ming Lei <tom.leiming@gmail.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 4/4] blk-mq: free hctx->cpumask in release handler of hctx's kobject |
| Date | Wed, 22 Feb 2017 11:20:01 +0100 |
| Message-ID | <tdCbD-6u-3@gated-at.bofh.it> (permalink) |
| References | <tdCbD-6u-5@gated-at.bofh.it> |
| X-Original-To | Jens Axboe <axboe@fb.com>, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Christoph Hellwig <hch@infradead.org>, Omar Sandoval <osandov@osandov.com> |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=b8tm1UD079ZtofS9n/cboHFASnjw8pCwJzEps8ZEM30=; b=Aw1z8dKJeqvIHWeK5WgpPdL5X9ODPgK0lN+ZeqVOA7DDH7VYp5LOdxqCCqgHP4f1cb URqa2zkRca7eB6ZyL2zI3xJH0Bi3IsQJoNwn2xSktKHGbFQryHwj1yXoqHpQ1goVWWi6 esJuRV+11XJ7dGM8bbdEi8OSbtbn+bb9JMklB3aLc3avv8D02heLdxbhpotR/zoMZIc6 MlPWQniRwIgdvdJdwZhhTI2JJTiMhmmoiCXrHBEQVjJ3uNhxHb90ZRAaQ0H7YOHbU9ay tUAnW440lm0/E8a7iVRnUlt1QABBF0tGdALCUR4lKwRs5lAqxTp4ruks2hoTAcjRXkc1 xu9A== |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=b8tm1UD079ZtofS9n/cboHFASnjw8pCwJzEps8ZEM30=; b=ek1m2VQd8GpDctH/3tNPKqr+GnWTp+QtdDemwP3tr+J/u2/FgiCfns7EuUKalQqXbU lEZdHmUTVR+F/vdloAIx3zgrcjLhLump3h2/6C3pJr9snwwnTrghoCL4vw3JH+ir5R+/ +zJPBW7norbABDRF17q8ETD35byxrvIt7rZ+lOsGFfltOwl60Bk9wgWK1ttXeknNB3rL yYMbjAm1RMbBfQ/In3xSBS6VTcWwaZLcyyAvW7lhPFDp0xrYEv4fvOC7iL3nZCcVTVyl gF+4OeblR813ZgvWj7UZgi09y+JkBtnD6zN9nsmFf1lneipxuun5EyoriqXcxhipNPaB ANxQ== |
| X-Gm-Message-State | AMke39nClUmiWLzJTfiyMb4HLma8EE1lzmJeC8T31kj6Xw10HA9Uj7ie1OQS+3ov1liW/Q== |
| X-Received | by 10.99.185.1 with SMTP id z1mr34658485pge.133.1487758471228; Wed, 22 Feb 2017 02:14:31 -0800 (PST) |
| X-Mailer | git-send-email 2.7.4 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 61 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | Ming Lei <tom.leiming@gmail.com> |
| X-Original-Date | Wed, 22 Feb 2017 18:14:02 +0800 |
| X-Original-Message-ID | <1487758442-5855-5-git-send-email-tom.leiming@gmail.com> |
| X-Original-References | <1487758442-5855-1-git-send-email-tom.leiming@gmail.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1586036 |
Show key headers only | View raw
It is obviously that hctx->cpumask is per hctx, and both
share same lifetime, so this patch moves freeing of hctx->cpumask
into release handler of hctx's kobject.
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
---
block/blk-mq-sysfs.c | 1 +
block/blk-mq.c | 12 ------------
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index cb19ec16a7fc..d745ab81033a 100644
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -21,6 +21,7 @@ static void blk_mq_hw_sysfs_release(struct kobject *kobj)
{
struct blk_mq_hw_ctx *hctx = container_of(kobj, struct blk_mq_hw_ctx,
kobj);
+ free_cpumask_var(hctx->cpumask);
kfree(hctx->ctxs);
kfree(hctx);
}
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 993bb4d4d909..db97f53e99d0 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1851,16 +1851,6 @@ static void blk_mq_exit_hw_queues(struct request_queue *q,
}
}
-static void blk_mq_free_hw_queues(struct request_queue *q,
- struct blk_mq_tag_set *set)
-{
- struct blk_mq_hw_ctx *hctx;
- unsigned int i;
-
- queue_for_each_hw_ctx(q, hctx, i)
- free_cpumask_var(hctx->cpumask);
-}
-
static int blk_mq_init_hctx(struct request_queue *q,
struct blk_mq_tag_set *set,
struct blk_mq_hw_ctx *hctx, unsigned hctx_idx)
@@ -2229,7 +2219,6 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,
if (hctx->tags)
blk_mq_free_map_and_requests(set, j);
blk_mq_exit_hctx(q, set, hctx, j);
- free_cpumask_var(hctx->cpumask);
kobject_put(&hctx->kobj);
hctxs[j] = NULL;
@@ -2342,7 +2331,6 @@ void blk_mq_free_queue(struct request_queue *q)
blk_mq_del_queue_tag_set(q);
blk_mq_exit_hw_queues(q, set, set->nr_hw_queues);
- blk_mq_free_hw_queues(q, set);
}
/* Basically redo blk_mq_init_queue with queue frozen */
--
2.7.4
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
[PATCH 4/4] blk-mq: free hctx->cpumask in release handler of hctx's kobject Ming Lei <tom.leiming@gmail.com> - 2017-02-22 11:20 +0100
csiph-web