Unverified Commit 39d4ff27 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7356 blk-iocost: Fix an UBSAN shift-out-of-bounds warning 

Merge Pull Request from: @ci-robot 
 
PR sync from: Guo Mengqi <guomengqi3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PDQ5HDWHOZEJG3PWZFCZBUMIBPZB66CE/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9DNCI 
 
Link:https://gitee.com/openeuler/kernel/pulls/7356

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 55b1bcbb 121cde81

block/blk-iocost.c

+7 −0
Original line number Diff line number Diff line
@@ -1315,6 +1315,13 @@ static bool iocg_kick_delay(struct ioc_gq *iocg, struct ioc_now *now) 


	lockdep_assert_held(&iocg->waitq.lock);



	/*

	 * If the delay is set by another CPU, we may be in the past. No need to

	 * change anything if so. This avoids decay calculation underflow.

	 */

	if (time_before64(now->now, iocg->delay_at))

		return false;



	/* calculate the current delay in effect - 1/2 every second */

	tdelta = now->now - iocg->delay_at;

	if (iocg->delay)