Skip to contentSkip to conversation

block: initialize current->bio_list[1] in __submit_bio_noacct_mq

PATCH Applied Christoph Hellwig 2 participants 2 messages Jul 2, 2020 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 block: initialize current->bio_list[1] in __submit_bio_noacct_mq

bio_alloc_bioset references current->bio_list[1], so we need to initialize it for the blk-mq submission path as well.

Fixes ff93ea0ce763 ("block: shortcut __submit_bio_noacct for blk-mq drivers")
---
 block/blk-core.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
block/blk-core.c +3 -4
index bf882b8d84450c..9f1bf8658b611a 100644
@@ -1155,11 +1155,10 @@ static blk_qc_t __submit_bio_noacct(struct bio *bio)
 static blk_qc_t __submit_bio_noacct_mq(struct bio *bio)
 {
 	struct gendisk *disk = bio->bi_disk;
-	struct bio_list bio_list;
+	struct bio_list bio_list[2] = { };
 	blk_qc_t ret = BLK_QC_T_NONE;
 
-	bio_list_init(&bio_list);
-	current->bio_list = &bio_list;
+	current->bio_list = bio_list;
 
 	do {
 		WARN_ON_ONCE(bio->bi_disk != disk);
@@ -1174,7 +1173,7 @@ static blk_qc_t __submit_bio_noacct_mq(struct bio *bio)
 		}
 
 		ret = blk_mq_submit_bio(bio);
-	} while ((bio = bio_list_pop(&bio_list)));
+	} while ((bio = bio_list_pop(&bio_list[0])));
 
 	current->bio_list = NULL;
 	return ret;
Signature · 1 line
2.26.2
maintainer Applied
#1 lore raw
Quoted 2 lines · Christoph Hellwig

bio_alloc_bioset references current->bio_list[1], so we need to initialize it for the blk-mq submission path as well.

Applied, thanks.

Signature · 1 line
Jens Axboe