Skip to content

Commit 7f2a6a6

Browse files
liu-song-6axboe
authored andcommitted
blk-mq: allow 4x BLK_MAX_REQUEST_COUNT at blk_plug for multiple_queues
Limiting number of request to BLK_MAX_REQUEST_COUNT at blk_plug hurts performance for large md arrays. [1] shows resync speed of md array drops for md array with more than 16 HDDs. Fix this by allowing more request at plug queue. The multiple_queue flag is used to only apply higher limit to multiple queue cases. [1] https://lore.kernel.org/linux-raid/CAFDAVznS71BXW8Jxv6k9dXc2iR3ysX3iZRBww_rzA8WifBFxGg@mail.gmail.com/ Tested-by: Marcin Wanat <[email protected]> Signed-off-by: Song Liu <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent 0dca446 commit 7f2a6a6

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

block/blk-mq.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2135,6 +2135,18 @@ static void blk_add_rq_to_plug(struct blk_plug *plug, struct request *rq)
21352135
}
21362136
}
21372137

2138+
/*
2139+
* Allow 4x BLK_MAX_REQUEST_COUNT requests on plug queue for multiple
2140+
* queues. This is important for md arrays to benefit from merging
2141+
* requests.
2142+
*/
2143+
static inline unsigned short blk_plug_max_rq_count(struct blk_plug *plug)
2144+
{
2145+
if (plug->multiple_queues)
2146+
return BLK_MAX_REQUEST_COUNT * 4;
2147+
return BLK_MAX_REQUEST_COUNT;
2148+
}
2149+
21382150
/**
21392151
* blk_mq_submit_bio - Create and send a request to block device.
21402152
* @bio: Bio pointer.
@@ -2231,7 +2243,7 @@ blk_qc_t blk_mq_submit_bio(struct bio *bio)
22312243
else
22322244
last = list_entry_rq(plug->mq_list.prev);
22332245

2234-
if (request_count >= BLK_MAX_REQUEST_COUNT || (last &&
2246+
if (request_count >= blk_plug_max_rq_count(plug) || (last &&
22352247
blk_rq_bytes(last) >= BLK_PLUG_FLUSH_SIZE)) {
22362248
blk_flush_plug_list(plug, false);
22372249
trace_block_plug(q);

0 commit comments

Comments
 (0)