author: Baolin Wang <baolin.wang@linux.alibaba.com> 2020-09-07 16:10:17 +0800
committer: Jens Axboe <axboe@kernel.dk> 2020-09-14 19:36:54 -0600
commit: 87fbeb8813bd8d48cb4b5c884793cc6b5126f6b8
parent: 4599ea49d4b00a6fbaab2977e7f8359cfc7e8916
Commit Summary:
Diffstat:
1 file changed, 12 insertions, 0 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 8719e37c3564..36ba61c5cdbd 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -901,6 +901,12 @@ static bool tg_with_in_iops_limit(struct throtl_grp *tg, struct bio *bio,
unsigned long jiffy_elapsed, jiffy_wait, jiffy_elapsed_rnd;
u64 tmp;
+ if (iops_limit == UINT_MAX) {
+ if (wait)
+ *wait = 0;
+ return true;
+ }
+
jiffy_elapsed = jiffies - tg->slice_start[rw];
/* Round up to the next throttle slice, wait time must be nonzero */
@@ -943,6 +949,12 @@ static bool tg_with_in_bps_limit(struct throtl_grp *tg, struct bio *bio,
unsigned long jiffy_elapsed, jiffy_wait, jiffy_elapsed_rnd;
unsigned int bio_size = throtl_bio_data_size(bio);
+ if (bps_limit == U64_MAX) {
+ if (wait)
+ *wait = 0;
+ return true;
+ }
+
jiffy_elapsed = jiffy_elapsed_rnd = jiffies - tg->slice_start[rw];
/* Slice has just started. Consider one slice interval */