Merge branch 'for-6.11/block' into for-next

axboe · axboe · commit c7df0bf42866 · 2024-06-28T14:55:05.000-06:00
* for-6.11/block:
  blk-throttle: fix lower control under super low iops limit
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
@@ -704,6 +704,9 @@ static unsigned long tg_within_iops_limit(struct throtl_grp *tg, struct bio *bio
 
 	/* Calc approx time to dispatch */
 	jiffy_wait = jiffy_elapsed_rnd - jiffy_elapsed;
+
+	/* make sure at least one io can be dispatched after waiting */
+	jiffy_wait = max(jiffy_wait, HZ / iops_limit + 1);
 	return jiffy_wait;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -704,6 +704,9 @@ static unsigned long tg_within_iops_limit(struct throtl_grp tg, struct bio bio`
`704`	`704`
`705`	`705`	`/* Calc approx time to dispatch */`
`706`	`706`	`jiffy_wait = jiffy_elapsed_rnd - jiffy_elapsed;`
	`707`	`+`
	`708`	`+ /* make sure at least one io can be dispatched after waiting */`
	`709`	`+ jiffy_wait = max(jiffy_wait, HZ / iops_limit + 1);`
`707`	`710`	`return jiffy_wait;`
`708`	`711`	`}`
`709`	`712`