Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a47e071 authored by Odin Ugedal's avatar Odin Ugedal Committed by Greg Kroah-Hartman
Browse files

sched/fair: Fix CFS bandwidth hrtimer expiry type 



[ Upstream commit 72d0ad7cb5bad265adb2014dbe46c4ccb11afaba ]

The time remaining until expiry of the refresh_timer can be negative.
Casting the type to an unsigned 64-bit value will cause integer
underflow, making the runtime_refresh_within return false instead of
true. These situations are rare, but they do happen.

This does not cause user-facing issues or errors; other than
possibly unthrottling cfs_rq's using runtime from the previous period(s),
making the CFS bandwidth enforcement less strict in those (special)
situations.

Signed-off-by: default avatarOdin Ugedal <odin@uged.al>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarBen Segall <bsegall@google.com>
Link: https://lore.kernel.org/r/20210629121452.18429-1-odin@uged.al


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5b7d0658

kernel/sched/fair.c

+2 −2
Original line number Diff line number Diff line
@@ -4786,7 +4786,7 @@ static const u64 cfs_bandwidth_slack_period = 5 * NSEC_PER_MSEC; 
static int runtime_refresh_within(struct cfs_bandwidth *cfs_b, u64 min_expire)

{

	struct hrtimer *refresh_timer = &cfs_b->period_timer;

	u64 remaining;

	s64 remaining;



	/* if the call-back is running a quota refresh is already occurring */

	if (hrtimer_callback_running(refresh_timer))
@@ -4794,7 +4794,7 @@ static int runtime_refresh_within(struct cfs_bandwidth *cfs_b, u64 min_expire) 


	/* is a quota refresh about to occur? */

	remaining = ktime_to_ns(hrtimer_expires_remaining(refresh_timer));

	if (remaining < min_expire)

	if (remaining < (s64)min_expire)

		return 1;



	return 0;