[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <170306711877.398.11023074478817453654.tip-bot2@tip-bot2>
Date: Wed, 20 Dec 2023 10:11:58 -0000
From: "tip-bot2 for Shrikanth Hegde" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Shrikanth Hegde <sshegde@...ux.vnet.ibm.com>,
Ingo Molnar <mingo@...nel.org>, x86@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip: sched/core] sched/fair: Use existing helper functions to access
->avg_rt and ->avg_dl
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 6b5943af9198d21b4fdb1ce14ee11d11119cc709
Gitweb: https://git.kernel.org/tip/6b5943af9198d21b4fdb1ce14ee11d11119cc709
Author: Shrikanth Hegde <sshegde@...ux.vnet.ibm.com>
AuthorDate: Wed, 20 Dec 2023 12:25:22 +05:30
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Wed, 20 Dec 2023 11:04:05 +01:00
sched/fair: Use existing helper functions to access ->avg_rt and ->avg_dl
This is a minor code simplification. There are helper functions called
cpu_util_dl() and cpu_util_rt() which gives the average utilization of DL
and RT respectively. But there are few places in code where these
variables are open-coded.
Instead use the helper function so that code becomes simpler and easier to
maintain later on.
No change in functionality intended.
Signed-off-by: Shrikanth Hegde <sshegde@...ux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Link: https://lore.kernel.org/r/20231220065522.351915-1-sshegde@linux.vnet.ibm.com
---
kernel/sched/fair.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index bcea3d5..0263106 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -9212,19 +9212,17 @@ static inline bool cfs_rq_has_blocked(struct cfs_rq *cfs_rq)
static inline bool others_have_blocked(struct rq *rq)
{
- if (READ_ONCE(rq->avg_rt.util_avg))
+ if (cpu_util_rt(rq))
return true;
- if (READ_ONCE(rq->avg_dl.util_avg))
+ if (cpu_util_dl(rq))
return true;
if (thermal_load_avg(rq))
return true;
-#ifdef CONFIG_HAVE_SCHED_AVG_IRQ
- if (READ_ONCE(rq->avg_irq.util_avg))
+ if (cpu_util_irq(rq))
return true;
-#endif
return false;
}
@@ -9481,8 +9479,8 @@ static unsigned long scale_rt_capacity(int cpu)
* avg_thermal.load_avg tracks thermal pressure and the weighted
* average uses the actual delta max capacity(load).
*/
- used = READ_ONCE(rq->avg_rt.util_avg);
- used += READ_ONCE(rq->avg_dl.util_avg);
+ used = cpu_util_rt(rq);
+ used += cpu_util_dl(rq);
used += thermal_load_avg(rq);
if (unlikely(used >= max))
Powered by blists - more mailing lists