Skip to content

Commit f2022a9

Browse files
fatherMatrixopsiff
authored andcommitted
dm: fix unconditional IO throttle caused by REQ_PREFLUSH
[ Upstream commit 88f7f56 ] When a bio with REQ_PREFLUSH is submitted to dm, __send_empty_flush() generates a flush_bio with REQ_OP_WRITE | REQ_PREFLUSH | REQ_SYNC, which causes the flush_bio to be throttled by wbt_wait(). An example from v5.4, similar problem also exists in upstream: crash> bt 2091206 PID: 2091206 TASK: ffff2050df92a300 CPU: 109 COMMAND: "kworker/u260:0" #0 [ffff800084a2f7f0] __switch_to at ffff80004008aeb8 #1 [ffff800084a2f820] __schedule at ffff800040bfa0c4 #2 [ffff800084a2f880] schedule at ffff800040bfa4b4 #3 [ffff800084a2f8a0] io_schedule at ffff800040bfa9c4 #4 [ffff800084a2f8c0] rq_qos_wait at ffff8000405925bc deepin-community#5 [ffff800084a2f940] wbt_wait at ffff8000405bb3a0 deepin-community#6 [ffff800084a2f9a0] __rq_qos_throttle at ffff800040592254 deepin-community#7 [ffff800084a2f9c0] blk_mq_make_request at ffff80004057cf38 deepin-community#8 [ffff800084a2fa60] generic_make_request at ffff800040570138 deepin-community#9 [ffff800084a2fae0] submit_bio at ffff8000405703b4 deepin-community#10 [ffff800084a2fb50] xlog_write_iclog at ffff800001280834 [xfs] deepin-community#11 [ffff800084a2fbb0] xlog_sync at ffff800001280c3c [xfs] deepin-community#12 [ffff800084a2fbf0] xlog_state_release_iclog at ffff800001280df4 [xfs] deepin-community#13 [ffff800084a2fc10] xlog_write at ffff80000128203c [xfs] deepin-community#14 [ffff800084a2fcd0] xlog_cil_push at ffff8000012846dc [xfs] deepin-community#15 [ffff800084a2fda0] xlog_cil_push_work at ffff800001284a2c [xfs] deepin-community#16 [ffff800084a2fdb0] process_one_work at ffff800040111d08 deepin-community#17 [ffff800084a2fe00] worker_thread at ffff8000401121cc deepin-community#18 [ffff800084a2fe70] kthread at ffff800040118de4 After commit 2def284 ("xfs: don't allow log IO to be throttled"), the metadata submitted by xlog_write_iclog() should not be throttled. But due to the existence of the dm layer, throttling flush_bio indirectly causes the metadata bio to be throttled. Fix this by conditionally adding REQ_IDLE to flush_bio.bi_opf, which makes wbt_should_throttle() return false to avoid wbt_wait(). Signed-off-by: Jinliang Zheng <[email protected]> Reviewed-by: Tianxiang Peng <[email protected]> Reviewed-by: Hao Peng <[email protected]> Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Sasha Levin <[email protected]> (cherry picked from commit 52aa28f7b1708d76e315d78b5ed397932a1a97c3)
1 parent e55d5b6 commit f2022a9

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/md/dm.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,14 +1536,18 @@ static void __send_empty_flush(struct clone_info *ci)
15361536
{
15371537
struct dm_table *t = ci->map;
15381538
struct bio flush_bio;
1539+
blk_opf_t opf = REQ_OP_WRITE | REQ_PREFLUSH | REQ_SYNC;
1540+
1541+
if ((ci->io->orig_bio->bi_opf & (REQ_IDLE | REQ_SYNC)) ==
1542+
(REQ_IDLE | REQ_SYNC))
1543+
opf |= REQ_IDLE;
15391544

15401545
/*
15411546
* Use an on-stack bio for this, it's safe since we don't
15421547
* need to reference it after submit. It's just used as
15431548
* the basis for the clone(s).
15441549
*/
1545-
bio_init(&flush_bio, ci->io->md->disk->part0, NULL, 0,
1546-
REQ_OP_WRITE | REQ_PREFLUSH | REQ_SYNC);
1550+
bio_init(&flush_bio, ci->io->md->disk->part0, NULL, 0, opf);
15471551

15481552
ci->bio = &flush_bio;
15491553
ci->sector_count = 0;

0 commit comments

Comments
 (0)