Skip to contentSkip to conversation

blk-throtl: avoid double charge of bio IOPS due to split

PATCH In review brookxu 2 participants 2 messages Jan 10, 2022

Subsystems (3)
lore
Share & tools
lore

brookxu

author
#0 lore raw

PATCH 1/1 blk-throtl: avoid double charge of bio IOPS due to split

From: Chunguang Xu <[email protected]>

After commit 900e08075202("block: move queue enter logic into blk_mq_submit_bio()"), submit_bio_checks() moved to __submit_bio_fops() and blk_mq_submit_bio(). The IOs go through blk_mq_submit_bio() may be splited before entering blk-throtl, so we need to check whether the BIO is throttled, and only update the io_split_cnt for the THROTTLED bio to avoid double charge.

---
 block/blk-throttle.c | 3 +++
 1 file changed, 3 insertions(+)
block/blk-throttle.c +3 -0
index 39bb6e6..2b12fc7 100644
@@ -2049,6 +2049,9 @@ void blk_throtl_charge_bio_split(struct bio *bio)
 	struct throtl_service_queue *parent_sq;
 	bool rw = bio_data_dir(bio);
 
+	if (!bio_flagged(bio, BIO_THROTTLED))
+		return;
+
 	do {
 		if (!parent->has_rules[rw])
 			break;
Signature · 1 line
1.8.3.1
#1 lore raw

Hi Chunguang,

Quoted 8 lines · brookxu

From: Chunguang Xu <[email protected]>

After commit 900e08075202("block: move queue enter logic into blk_mq_submit_bio()"), submit_bio_checks() moved to __submit_bio_fops() and blk_mq_submit_bio(). The IOs go through blk_mq_submit_bio() may be splited before entering blk-throtl, so we need to check whether the BIO is throttled, and only update the io_split_cnt for the THROTTLED bio to avoid double charge.

Today Jens has merged the patch[1] of "block: don't protect submit_bio_checks by q_usage_counter", so the behavior is switched back to previous behavior: running bio check before calling blk_mq_submit_bio() or ->submit_bio().

Then looks your patch isn't needn't any more.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git/commit/?h=for-5.17/block&id=9d497e2941c30a060ba62d5485b3bc9d91ffb09e

Thanks,
Ming