Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "blk_iocost: fix more out of bound shifts"

Browse source 
This reverts commit 31aab2e514.
This commit is contained in:
Ksawlii 2024-11-24 00:23:10 +01:00
parent 892d56770b
commit 3eaf19ddc8
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
block/blk-iocost.c
View file

@ -2022,7 +2022,7 @@ static void ioc_forgive_debts(struct ioc *ioc, u64 usage_us_sum, int nr_debtors,
struct ioc_now *now) struct ioc_now *now)
{ {
struct ioc_gq *iocg; struct ioc_gq *iocg;
u64 dur, usage_pct, nr_cycles, nr_cycles_shift; u64 dur, usage_pct, nr_cycles;
/* if no debtor, reset the cycle */ /* if no debtor, reset the cycle */
if (!nr_debtors) { if (!nr_debtors) {
@ -2084,12 +2084,10 @@ static void ioc_forgive_debts(struct ioc *ioc, u64 usage_us_sum, int nr_debtors,
old_debt = iocg->abs_vdebt; old_debt = iocg->abs_vdebt;
old_delay = iocg->delay; old_delay = iocg->delay;
nr_cycles_shift = min_t(u64, nr_cycles, BITS_PER_LONG - 1);
if (iocg->abs_vdebt) if (iocg->abs_vdebt)
iocg->abs_vdebt = iocg->abs_vdebt >> nr_cycles_shift ?: 1; iocg->abs_vdebt = iocg->abs_vdebt >> nr_cycles ?: 1;
if (iocg->delay) if (iocg->delay)
iocg->delay = iocg->delay >> nr_cycles_shift ?: 1; iocg->delay = iocg->delay >> nr_cycles ?: 1;
iocg_kick_waitq(iocg, true, now); iocg_kick_waitq(iocg, true, now);