Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1415945
| From | Catalin Marinas <catalin.marinas@arm.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: kmemleak report after 9082e87bfbf8 ("block: remove struct bio_batch") |
| Date | 2016-06-07 11:50 +0200 |
| Message-ID | <rHlO2-109-15@gated-at.bofh.it> (permalink) |
| References | <rH0Tf-4eU-5@gated-at.bofh.it> <rH3xN-62c-69@gated-at.bofh.it> <rH5pT-7hl-31@gated-at.bofh.it> <rH6lY-7QH-39@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Mon, Jun 06, 2016 at 12:09:49PM -0500, Shaun Tancheff wrote:
> I'm pretty sure it is missing a bio_put() after submit_bio_wait().
>
> Please excuse the hack-y patch but I think you need to do something
> like this ...
> (Note tabs eaten by gmail).
>
> diff --git a/block/blk-lib.c b/block/blk-lib.c
> index 23d7f30..9e29dc3 100644
> --- a/block/blk-lib.c
> +++ b/block/blk-lib.c
> @@ -113,6 +113,7 @@ int blkdev_issue_discard(struct block_device
> *bdev, sector_t sector,
> ret = submit_bio_wait(type, bio);
> if (ret == -EOPNOTSUPP)
> ret = 0;
> + bio_put(bio);
> }
> blk_finish_plug(&plug);
>
> @@ -165,8 +166,10 @@ int blkdev_issue_write_same(struct block_device
> *bdev, sector_t sector,
> }
> }
>
> - if (bio)
> + if (bio) {
> ret = submit_bio_wait(REQ_WRITE | REQ_WRITE_SAME, bio);
> + bio_put(bio);
> + }
> return ret != -EOPNOTSUPP ? ret : 0;
> }
> EXPORT_SYMBOL(blkdev_issue_write_same);
> @@ -206,8 +209,11 @@ static int __blkdev_issue_zeroout(struct
> block_device *bdev, sector_t sector,
> }
> }
>
> - if (bio)
> - return submit_bio_wait(WRITE, bio);
> + if (bio) {
> + ret = submit_bio_wait(WRITE, bio);
> + bio_put(bio);
> + return ret;
> + }
> return 0;
> }
This patch appears to fix the memory leak on my machine.
Tested-by: Catalin Marinas <catalin.marinas@arm.com>
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
kmemleak report after 9082e87bfbf8 ("block: remove struct bio_batch") Catalin Marinas <catalin.marinas@arm.com> - 2016-06-06 13:30 +0200
Re: kmemleak report after 9082e87bfbf8 ("block: remove struct bio_batch") Christoph Hellwig <hch@lst.de> - 2016-06-06 16:20 +0200
Re: kmemleak report after 9082e87bfbf8 ("block: remove struct bio_batch") Catalin Marinas <catalin.marinas@arm.com> - 2016-06-06 18:20 +0200
Re: kmemleak report after 9082e87bfbf8 ("block: remove struct bio_batch") Shaun Tancheff <shaun.tancheff@seagate.com> - 2016-06-06 19:20 +0200
Re: kmemleak report after 9082e87bfbf8 ("block: remove struct bio_batch") Christoph Hellwig <hch@lst.de> - 2016-06-06 19:30 +0200
Re: kmemleak report after 9082e87bfbf8 ("block: remove struct bio_batch") Catalin Marinas <catalin.marinas@arm.com> - 2016-06-06 19:40 +0200
Re: kmemleak report after 9082e87bfbf8 ("block: remove struct bio_batch") Jens Axboe <axboe@kernel.dk> - 2016-06-06 20:20 +0200
Re: kmemleak report after 9082e87bfbf8 ("block: remove struct bio_batch") Catalin Marinas <catalin.marinas@arm.com> - 2016-06-07 11:50 +0200
Re: kmemleak report after 9082e87bfbf8 ("block: remove struct bio_batch") Larry Finger <Larry.Finger@lwfinger.net> - 2016-06-07 16:20 +0200
Re: kmemleak report after 9082e87bfbf8 ("block: remove struct bio_batch") David Drysdale <drysdale@google.com> - 2016-06-07 17:50 +0200
Re: kmemleak report after 9082e87bfbf8 ("block: remove struct bio_batch") Larry Finger <Larry.Finger@lwfinger.net> - 2016-06-07 06:10 +0200
Re: kmemleak report after 9082e87bfbf8 ("block: remove struct bio_batch") Christoph Hellwig <hch@lst.de> - 2016-06-07 08:40 +0200
csiph-web