Skip to contentSkip to conversation

blk-mq: Properly init requests from blk_mq_alloc_request_hctx()

PATCH Applied John Garry 4 participants 4 messages Oct 26, 2022 – Oct 28, 2022 Block layer

lore
Share & tools
lore

John Garry

author
#0 lore raw

PATCH v2 1/1 blk-mq: Properly init requests from blk_mq_alloc_request_hctx()

Function blk_mq_alloc_request_hctx() is missing zeroing/init of rq->bio, biotail, __sector, and __data_len members, which blk_mq_alloc_request() has, so duplicate what we do in blk_mq_alloc_request().

Fixes 1f5bd336b9150 ("blk-mq: add blk_mq_alloc_request_hctx")

---
Difference to v1:
- init rq members in blk_mq_alloc_request_hctx(), rather than blk_mq_rq_ctx_init() (Ming Lei)

block/blk-mq.c +6 -1
index 497c413bce80..a1b6afe43913 100644
@@ -611,6 +611,7 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q,
 		.nr_tags	= 1,
 	};
 	u64 alloc_time_ns = 0;
+	struct request *rq;
 	unsigned int cpu;
 	unsigned int tag;
 	int ret;
@@ -660,8 +661,12 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q,
 	tag = blk_mq_get_tag(&data);
 	if (tag == BLK_MQ_NO_TAG)
 		goto out_queue_exit;
-	return blk_mq_rq_ctx_init(&data, blk_mq_tags_from_data(&data), tag,
+	rq = blk_mq_rq_ctx_init(&data, blk_mq_tags_from_data(&data), tag,
 					alloc_time_ns);
+	rq->__data_len = 0;
+	rq->__sector = (sector_t) -1;
+	rq->bio = rq->biotail = NULL;
+	return rq;
 
 out_queue_exit:
 	blk_queue_exit(q);
Signature · 1 line
2.25.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 7 lines · John Garry

Function blk_mq_alloc_request_hctx() is missing zeroing/init of rq->bio, biotail, __sector, and __data_len members, which blk_mq_alloc_request() has, so duplicate what we do in blk_mq_alloc_request().

Fixes 1f5bd336b9150 ("blk-mq: add blk_mq_alloc_request_hctx")
maintainer Applied
#3 lore raw
In reply to John Garry
Quoted 5 lines · John Garry

Function blk_mq_alloc_request_hctx() is missing zeroing/init of rq->bio, biotail, __sector, and __data_len members, which blk_mq_alloc_request() has, so duplicate what we do in blk_mq_alloc_request().

Applied, thanks!

[1/1] blk-mq: Properly init requests from blk_mq_alloc_request_hctx()

      commit: e3c5a78cdb6237bfb9641b63cccf366325229eec

Best regards,

Signature · 1 line
Jens Axboe