From b17935d598316ca3cef42110af7b3139a44d75da Mon Sep 17 00:00:00 2001 From: Baolin Wang Date: Mon, 7 Sep 2020 16:10:17 +0800 Subject: [PATCH 2101/2944] blk-throttle: Avoid checking bps/iops limitation if bps or iops is unlimited fix #30641350 commit 87fbeb8813bd8d48cb4b5c884793cc6b5126f6b8 upstream Do not need check the bps or iops limitation if bps or iops is unlimited. Signed-off-by: Baolin Wang Signed-off-by: Jens Axboe Reviewed-by: Joseph Qi --- block/blk-throttle.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 5f54bfb..ed52d3c 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -948,6 +948,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 */ @@ -990,6 +996,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 */ -- 1.8.3.1