linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Hannes Reinecke <hare@suse.com>
To: Johannes Thumshirn <jthumshirn@suse.de>,
	Hannes Reinecke <hare@suse.de>, Jan Kara <jack@suse.com>
Cc: Jens Axboe <axboe@kernel.dk>,
	linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH] block_dev: fix crash on chained bios with O_DIRECT
Date: Wed, 20 Mar 2019 09:51:34 +0100	[thread overview]
Message-ID: <e9953e6c-fd4c-cde5-976e-a5831d7c79a3@suse.com> (raw)
In-Reply-To: <9cec723b-d0d0-859f-37c2-bfdccb898071@suse.de>

On 3/20/19 9:45 AM, Johannes Thumshirn wrote:
> On 20/03/2019 09:12, Hannes Reinecke wrote:
>> __blkdev_direct_IO_simple() is allocating a bio on the stack.
>> When that bio needs to be split bio_chain_endio() invokes bio_put()
>> on this bio, causing the kernel to crash in mempool_free() as the
>> bio was never allocated from a mempool in the first place.
>> So call bio_get() before submitting to avoid this problem.
> 
> Hmm this sounds as if we're just papering over the real issue here,
> which is calling bio_free() for bios not allocated using bio_alloc_bioset().
> 
> How about the following untested patch:
> 
>  From 9c8434e5bf81595e97ea5647437d12bfce0e37b6 Mon Sep 17 00:00:00 2001
> From: Johannes Thumshirn <jthumshirn@suse.de>
> Date: Wed, 20 Mar 2019 09:40:18 +0100
> Subject: [PATCH] bio: Introduce BIO_ALLOCED flag and check it in bio_free
> 
> When we're submitting a bio from stack and this ends up being split, we
> call bio_put(). bio_put() will eventually call bio_free() if the reference
> count drops to 0. But freeing the bio is wrong, as it was never allocated
> out of the bio's mempool.
> 
> Flag each normally allocated bio as 'BIO_ALLOCATED' and skip freeing if the
> flag isn't set.
> 
> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
> ---
>   block/bio.c               | 4 ++++
>   include/linux/blk_types.h | 1 +
>   2 files changed, 5 insertions(+)
> 
> diff --git a/block/bio.c b/block/bio.c
> index 4db1008309ed..caa8bc076377 100644
> --- a/block/bio.c
> +++ b/block/bio.c
> @@ -253,6 +253,9 @@ static void bio_free(struct bio *bio)
>   	struct bio_set *bs = bio->bi_pool;
>   	void *p;
> 
> +	if (!bio_flagged(bio, BIO_ALLOCED))
> +		return;
> +
>   	bio_uninit(bio);
> 
>   	if (bs) {
> @@ -521,6 +524,7 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask,
> unsigned int nr_iovecs,
>   		bvl = bio->bi_inline_vecs;
>   	}
> 
> +	bio_set_flag(bio, BIO_ALLOCED);
>   	bio->bi_pool = bs;
>   	bio->bi_max_vecs = nr_iovecs;
>   	bio->bi_io_vec = bvl;
> diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
> index d66bf5f32610..14b4f87a1eab 100644
> --- a/include/linux/blk_types.h
> +++ b/include/linux/blk_types.h
> @@ -229,6 +229,7 @@ struct bio {
>   				 * of this bio. */
>   #define BIO_QUEUE_ENTERED 11	/* can use blk_queue_enter_live() */
>   #define BIO_TRACKED 12		/* set if bio goes through the rq_qos path */
> +#define BIO_ALLOCED 13		/* set if the bio was allocated by
> bio_alloc_bioset */
> 
>   /* See BVEC_POOL_OFFSET below before adding new flags */
> 
Yeah, should work, too.
But we should be calling bio_uninit() for all bios.

Will you be sending an updated patch?

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		               zSeries & Storage
hare@suse.com			               +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)

  reply	other threads:[~2019-03-20  8:51 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-20  8:12 [PATCH] block_dev: fix crash on chained bios with O_DIRECT Hannes Reinecke
2019-03-20  8:45 ` Johannes Thumshirn
2019-03-20  8:51   ` Hannes Reinecke [this message]
2019-03-20  8:53     ` Johannes Thumshirn
2019-03-20 11:47       ` Jan Kara
2019-03-20 13:19         ` Johannes Thumshirn
2019-03-20 19:57           ` Jens Axboe
2019-03-21  8:28             ` Johannes Thumshirn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e9953e6c-fd4c-cde5-976e-a5831d7c79a3@suse.com \
    --to=hare@suse.com \
    --cc=axboe@kernel.dk \
    --cc=hare@suse.de \
    --cc=jack@suse.com \
    --cc=jthumshirn@suse.de \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).