From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754740AbcFGJkZ (ORCPT <rfc822;w@1wt.eu>);
	Tue, 7 Jun 2016 05:40:25 -0400
Received: from foss.arm.com ([217.140.101.70]:42477 "EHLO foss.arm.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753656AbcFGJkV (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 7 Jun 2016 05:40:21 -0400
Date: Tue, 7 Jun 2016 10:39:38 +0100
From: Catalin Marinas <catalin.marinas@arm.com>
To: Shaun Tancheff <shaun.tancheff@seagate.com>
Cc: Christoph Hellwig <hch@lst.de>, linux-block@vger.kernel.org,
        LKML <linux-kernel@vger.kernel.org>, Jens Axboe <axboe@fb.com>,
        Larry.Finger@lwfinger.net, bart.vanassche@sandisk.com,
        drysdale@google.com
Subject: Re: kmemleak report after 9082e87bfbf8 ("block: remove struct
 bio_batch")
Message-ID: <20160607093937.GA7122@localhost>
References: <20160606112620.GA29910@e104818-lin.cambridge.arm.com>
 <20160606141334.GA6579@lst.de>
 <20160606161245.GC29910@e104818-lin.cambridge.arm.com>
 <CAJVOszD16vfES8e6NcanBJ7P4HHmp635Ln7VVVyraaPnm0jriA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAJVOszD16vfES8e6NcanBJ7P4HHmp635Ln7VVVyraaPnm0jriA@mail.gmail.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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>