summaryrefslogtreecommitdiffstats
path: root/block/bio.c
diff options
context:
space:
mode:
authorShaohua Li <shli@fb.com>2017-07-10 20:40:17 +0200
committerJens Axboe <axboe@kernel.dk>2017-07-10 20:43:33 +0200
commitb222dd2fdd53a40dd8f1d3082ae98e52883cce0d (patch)
treee039acfaf93c762a2983be9d678ad8cac01855ab /block/bio.c
parentMerge branch 'nvme-4.13' of git://git.infradead.org/nvme into for-linus (diff)
downloadlinux-b222dd2fdd53a40dd8f1d3082ae98e52883cce0d.tar.xz
linux-b222dd2fdd53a40dd8f1d3082ae98e52883cce0d.zip
block: call bio_uninit in bio_endio
bio_free isn't a good place to free cgroup info. There are a lot of cases bio is allocated in special way (for example, in stack) and never gets called by bio_put hence bio_free, we are leaking memory. This patch moves the free to bio endio, which should be called anyway. The bio_uninit call in bio_free is kept, in case the bio never gets called bio endio. This assumes ->bi_end_io() doesn't access cgroup info, which seems true in my audit. This along with Christoph's integrity patch should fix the memory leak issue. Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Shaohua Li <shli@fb.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/bio.c')
-rw-r--r--block/bio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/block/bio.c b/block/bio.c
index 9cabf5d0be20..9a63597aaacc 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1833,6 +1833,8 @@ again:
}
blk_throtl_bio_endio(bio);
+ /* release cgroup info */
+ bio_uninit(bio);
if (bio->bi_end_io)
bio->bi_end_io(bio);
}