sched/fair: Use existing helper functions to access ->avg_rt and ->avg_dl

There are helper functions called cpu_util_dl() and cpu_util_rt() which give
the average utilization of DL and RT respectively. But there are a few
places in code where access to these variables is open-coded.

Instead use the helper function so that code becomes simpler and easier to
maintain later on.

No functional changes intended.

Signed-off-by: Shrikanth Hegde <sshegde@linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org>
Link: https://lore.kernel.org/r/20240101154624.100981-2-sshegde@linux.vnet.ibm.com

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 8e30e2bb77a09a808b76b6552275fd9d153684e5..127e727fb7b4902b187e65c48e24c497317d7b37 100644 (file)
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -9237,10 +9237,10 @@ 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))
@@ -9506,8 +9506,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))