Commit 2dd710d4 authored by Khazhismel Kumykov's avatar Khazhismel Kumykov Committed by Jens Axboe

blk-throttle: check for overflow in calculate_bytes_allowed

Inexact, we may reject some not-overflowing values incorrectly, but
they'll be on the order of exabytes allowed anyways.

This fixes divide error crash on x86 if bps_limit is not configured or
is set too high in the rare case that jiffy_elapsed is greater than HZ.

Fixes: e8368b57 ("blk-throttle: use calculate_io/bytes_allowed() for throtl_trim_slice()")
Fixes: 8d6bbaad ("blk-throttle: prevent overflow while calculating wait time")
Signed-off-by: default avatarKhazhismel Kumykov <khazhy@google.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20231020223617.2739774-1-khazhy@google.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c3414550
...@@ -723,6 +723,12 @@ static unsigned int calculate_io_allowed(u32 iops_limit, ...@@ -723,6 +723,12 @@ static unsigned int calculate_io_allowed(u32 iops_limit,
static u64 calculate_bytes_allowed(u64 bps_limit, unsigned long jiffy_elapsed) static u64 calculate_bytes_allowed(u64 bps_limit, unsigned long jiffy_elapsed)
{ {
/*
* Can result be wider than 64 bits?
* We check against 62, not 64, due to ilog2 truncation.
*/
if (ilog2(bps_limit) + ilog2(jiffy_elapsed) - ilog2(HZ) > 62)
return U64_MAX;
return mul_u64_u64_div_u64(bps_limit, (u64)jiffy_elapsed, (u64)HZ); return mul_u64_u64_div_u64(bps_limit, (u64)jiffy_elapsed, (u64)HZ);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment