The following commit has been merged into the sched/core branch of tip:
Commit-ID: 76cc4f91488af0a808bec97794bfe434dece7d67
Gitweb: https://git.kernel.org/tip/76cc4f91488af0a808bec97794bfe434dece7d67
Author: Ingo Molnar <mingo@xxxxxxxxxx>
AuthorDate: Thu, 28 Mar 2024 11:41:31 +01:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Thu, 28 Mar 2024 11:41:31 +01:00
sched/fair: Rename {set|get}_rd_overload() to {set|get}_rd_overloaded()
Follow the rename of the root_domain::overloaded flag.
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Qais Yousef <qyousef@xxxxxxxxxxx>
Cc: Shrikanth Hegde <sshegde@xxxxxxxxxxxxx>
Cc: Vincent Guittot <vincent.guittot@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/ZgVHq65XKsOZpfgK@xxxxxxxxx
---
kernel/sched/fair.c | 4 ++--
kernel/sched/sched.h | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 0cc0582..bf10665 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -10657,7 +10657,7 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sd
if (!env->sd->parent) {
/* update overload indicator if we are at root domain */
- set_rd_overload(env->dst_rq->rd, sg_status & SG_OVERLOAD);
+ set_rd_overloaded(env->dst_rq->rd, sg_status & SG_OVERLOAD);
/* Update over-utilization (tipping point, U >= 0) indicator */
set_rd_overutilized_status(env->dst_rq->rd,
@@ -12390,7 +12390,7 @@ static int sched_balance_newidle(struct rq *this_rq, struct rq_flags *rf)
rcu_read_lock();
sd = rcu_dereference_check_sched_domain(this_rq->sd);
- if (!get_rd_overload(this_rq->rd) ||
+ if (!get_rd_overloaded(this_rq->rd) ||
(sd && this_rq->avg_idle < sd->max_newidle_lb_cost)) {
if (sd)
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index cddc479..c7e7ae1 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -930,14 +930,14 @@ extern void rq_attach_root(struct rq *rq, struct root_domain *rd);
extern void sched_get_rd(struct root_domain *rd);
extern void sched_put_rd(struct root_domain *rd);
-static inline int get_rd_overload(struct root_domain *rd)
+static inline int get_rd_overloaded(struct root_domain *rd)
{
return READ_ONCE(rd->overloaded);
}
-static inline void set_rd_overload(struct root_domain *rd, int status)
+static inline void set_rd_overloaded(struct root_domain *rd, int status)
{
- if (get_rd_overload(rd) != status)
+ if (get_rd_overloaded(rd) != status)
WRITE_ONCE(rd->overloaded, status);
}
@@ -2541,7 +2541,7 @@ static inline void add_nr_running(struct rq *rq, unsigned count)
#ifdef CONFIG_SMP
if (prev_nr < 2 && rq->nr_running >= 2) {
- set_rd_overload(rq->rd, SG_OVERLOAD);
+ set_rd_overloaded(rq->rd, SG_OVERLOAD);
}
#endif
|