[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20141126034103.GA26585@redhat.com>
Date: Tue, 25 Nov 2014 22:41:04 -0500
From: Mike Snitzer <snitzer@...hat.com>
To: "Darrick J. Wong" <darrick.wong@...cle.com>
Cc: Alasdair Kergon <agk@...hat.com>, dm-devel@...hat.com,
linux-kernel@...r.kernel.org
Subject: Re: dm-bufio: fix memleak when using a dm_buffer's inline bio
On Tue, Nov 25 2014 at 8:45pm -0500,
Darrick J. Wong <darrick.wong@...cle.com> wrote:
> When dm-bufio sets out to use the bio built into a struct dm_buffer to
> issue an IO, it needs to call bio_reset after it's done with the bio
> so that we can free things attached to the bio such as the integrity
> payload. Therefore, inject our own endio callback to take care of
> the bio_reset after calling submit_io's end_io callback.
>
> Test case:
> 1. modprobe scsi_debug delay=0 dif=1 dix=199 ato=1 dev_size_mb=300
> 2. Set up a dm-bufio client, e.g. dm-verity, on the scsi_debug device
> 3. Repeatedly read metadata and watch kmalloc-192 leak!
>
> Fix is against 3.18-rc6.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@...cle.com>
Thanks for reporting/fixing this.
Alternatively I think we could just call bio_reset() in submit_io(),
e.g.:
diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c
index afe7971..e7036e3 100644
--- a/drivers/md/dm-bufio.c
+++ b/drivers/md/dm-bufio.c
@@ -579,6 +579,8 @@ static void submit_io(struct dm_buffer *b, int rw, sector_t block,
if (rw == WRITE && b->c->write_callback)
b->c->write_callback(b);
+ bio_reset(&b->bio);
+
if (b->c->block_size <= DM_BUFIO_INLINE_VECS * PAGE_SIZE &&
b->data_mode != DATA_MODE_VMALLOC)
use_inline_bio(b, rw, block, end_io);
What do you think?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists