Skip to contentSkip to conversation

block_dev: fix crash on chained bios with O_DIRECT

PATCH In review Hannes Reinecke 5 participants 8 messages Mar 20, 2019 – Mar 21, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 block_dev: fix crash on chained bios with O_DIRECT

__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.

---
 fs/block_dev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
fs/block_dev.c +2 -1
index c546cdce77e6..4b3a04c3b8bd 100644
@@ -235,6 +235,7 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter,
 	if (iocb->ki_flags & IOCB_HIPRI)
 		bio.bi_opf |= REQ_HIPRI;
 
+	bio_get(&bio);
 	qc = submit_bio(&bio);
 	for (;;) {
 		set_current_state(TASK_UNINTERRUPTIBLE);
@@ -254,7 +255,7 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter,
 
 	if (unlikely(bio.bi_status))
 		ret = blk_status_to_errno(bio.bi_status);
-
+	bio_put(&bio);
 out:
 	if (vecs != inline_vecs)
 		kfree(vecs);
Signature · 1 line
2.16.4
#1 lore raw
Quoted 5 lines · Hannes Reinecke

__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 <[email protected]>
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.

---
 block/bio.c               | 4 ++++
 include/linux/blk_types.h | 1 +
 2 files changed, 5 insertions(+)
block/bio.c +3 -0
index 4db1008309ed..caa8bc076377 100644
@@ -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;

include/linux/blk_types.h +1 -0
index d66bf5f32610..14b4f87a1eab 100644
@@ -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 */

Signature · 11 lines
2.16.4



-- 
Johannes Thumshirn                            SUSE Labs Filesystems
[email protected]                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
#2 lore raw
Quoted 65 lines · Johannes Thumshirn
Quoted 5 lines · Hannes Reinecke

__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 <[email protected]>
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.

---
  block/bio.c               | 4 ++++
  include/linux/blk_types.h | 1 +
  2 files changed, 5 insertions(+)
block/bio.c +4 -0
index 4db1008309ed..caa8bc076377 100644
@@ -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;
include/linux/blk_types.h +1 -0
index d66bf5f32610..14b4f87a1eab 100644
@@ -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 */

Quoted 2 lines

/* 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

Signature · 5 lines
Dr. Hannes Reinecke		               zSeries & Storage
[email protected]			               +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)
#3 lore raw
Quoted 2 lines · Hannes Reinecke

Yeah, should work, too.
But we should be calling bio_uninit() for all bios.

Yup, probably.

Quoted 1 line

Will you be sending an updated patch?

Let's wait what other's thing first.

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
[email protected]                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
reviewer
#4 lore raw
Quoted 9 lines · Johannes Thumshirn
Quoted 2 lines · Hannes Reinecke

Yeah, should work, too.
But we should be calling bio_uninit() for all bios.

Yup, probably.

Quoted 1 line

Will you be sending an updated patch?

Let's wait what other's thing first.

FWIW I'm OK with either solution. Yours seems a bit more future-proof so I like it a bit more.

Honza

Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR
#5 lore raw
Quoted 5 lines · Jan Kara
Quoted 4 lines · Johannes Thumshirn
Quoted 2 lines · Hannes Reinecke

Yeah, should work, too.
But we should be calling bio_uninit() for all bios.

Quoted 8 lines
Quoted 5 lines

Yup, probably.

Quoted 1 line

Will you be sending an updated patch?

Let's wait what other's thing first.

FWIW I'm OK with either solution. Yours seems a bit more future-proof so I like it a bit more.

FWIW Bit 13 for the Flag doesn't work, need to find a free one before doing a proper submission.

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
[email protected]                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
maintainer
#6 lore raw
Quoted 10 lines · Johannes Thumshirn
Quoted 9 lines · Jan Kara
Quoted 8 lines · Johannes Thumshirn
Quoted 2 lines · Hannes Reinecke

Yeah, should work, too.
But we should be calling bio_uninit() for all bios.

Yup, probably.

Quoted 1 line

Will you be sending an updated patch?

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Let's wait what other's thing first.

FWIW I'm OK with either solution. Yours seems a bit more future-proof so I like it a bit more.

FWIW Bit 13 for the Flag doesn't work, need to find a free one before doing a proper submission.

Yeah, you're going to overlap and crash... We really should have a build bug on for that.

We don't have any free ones. I've got a patch in io_uring-next that uses the last one.

That said, I do greatly prefer your approach to solving the issue.

Signature · 1 line
Jens Axboe
#7 lore raw
Quoted 5 lines · Jens Axboe

Yeah, you're going to overlap and crash... We really should have a build bug on for that.

We don't have any free ones. I've got a patch in io_uring-next that uses the last one.

Damn it, I have updated the patch to use 0 as well.

Quoted 1 line

That said, I do greatly prefer your approach to solving the issue.

Any ideas to proceed from here?

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
[email protected]                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850