* [PATCH v2] blkcg: fix memleak for iolatency
@ 2020-08-11 2:21 Yufen Yu
2020-08-19 13:37 ` Yufen Yu
2020-08-19 14:10 ` Jens Axboe
0 siblings, 2 replies; 3+ messages in thread
From: Yufen Yu @ 2020-08-11 2:21 UTC (permalink / raw)
To: jbacik, tj, axboe; +Cc: linux-block
Normally, blkcg_iolatency_exit() will free related memory in iolatency
when cleanup queue. But if blk_throtl_init() return error and queue init
fail, blkcg_iolatency_exit() will not do that for us. Then it cause
memory leak.
Fixes: d70675121546 ("block: introduce blk-iolatency io controller")
Signed-off-by: Yufen Yu <yuyufen@huawei.com>
---
block/blk-cgroup.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 619a79b51068..c195365c9817 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1152,13 +1152,15 @@ int blkcg_init_queue(struct request_queue *q)
if (preloaded)
radix_tree_preload_end();
- ret = blk_iolatency_init(q);
+ ret = blk_throtl_init(q);
if (ret)
goto err_destroy_all;
- ret = blk_throtl_init(q);
- if (ret)
+ ret = blk_iolatency_init(q);
+ if (ret) {
+ blk_throtl_exit(q);
goto err_destroy_all;
+ }
return 0;
err_destroy_all:
--
2.25.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] blkcg: fix memleak for iolatency
2020-08-11 2:21 [PATCH v2] blkcg: fix memleak for iolatency Yufen Yu
@ 2020-08-19 13:37 ` Yufen Yu
2020-08-19 14:10 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Yufen Yu @ 2020-08-19 13:37 UTC (permalink / raw)
To: jbacik, tj, axboe; +Cc: linux-block
ping
On 2020/8/11 10:21, Yufen Yu wrote:
> Normally, blkcg_iolatency_exit() will free related memory in iolatency
> when cleanup queue. But if blk_throtl_init() return error and queue init
> fail, blkcg_iolatency_exit() will not do that for us. Then it cause
> memory leak.
>
> Fixes: d70675121546 ("block: introduce blk-iolatency io controller")
> Signed-off-by: Yufen Yu <yuyufen@huawei.com>
> ---
> block/blk-cgroup.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
> index 619a79b51068..c195365c9817 100644
> --- a/block/blk-cgroup.c
> +++ b/block/blk-cgroup.c
> @@ -1152,13 +1152,15 @@ int blkcg_init_queue(struct request_queue *q)
> if (preloaded)
> radix_tree_preload_end();
>
> - ret = blk_iolatency_init(q);
> + ret = blk_throtl_init(q);
> if (ret)
> goto err_destroy_all;
>
> - ret = blk_throtl_init(q);
> - if (ret)
> + ret = blk_iolatency_init(q);
> + if (ret) {
> + blk_throtl_exit(q);
> goto err_destroy_all;
> + }
> return 0;
>
> err_destroy_all:
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] blkcg: fix memleak for iolatency
2020-08-11 2:21 [PATCH v2] blkcg: fix memleak for iolatency Yufen Yu
2020-08-19 13:37 ` Yufen Yu
@ 2020-08-19 14:10 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2020-08-19 14:10 UTC (permalink / raw)
To: Yufen Yu, jbacik, tj; +Cc: linux-block
On 8/10/20 7:21 PM, Yufen Yu wrote:
> Normally, blkcg_iolatency_exit() will free related memory in iolatency
> when cleanup queue. But if blk_throtl_init() return error and queue init
> fail, blkcg_iolatency_exit() will not do that for us. Then it cause
> memory leak.
Applied, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-19 14:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-11 2:21 [PATCH v2] blkcg: fix memleak for iolatency Yufen Yu
2020-08-19 13:37 ` Yufen Yu
2020-08-19 14:10 ` Jens Axboe
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).