diff options
| author | Hao Jia <jiahao.os@bytedance.com> | 2023-06-13 16:20:09 +0800 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2023-06-16 22:08:12 +0200 |
| commit | cab3ecaed5cdcc9c36a96874b4c45056a46ece45 (patch) | |
| tree | 3035cb97a2293a9453f4c528551e3205a940c9e0 /kernel/sched/topology.c | |
| parent | e20f204c88d595c04fc9197794bb68c0fbabd902 (diff) | |
| download | linux-stable-cab3ecaed5cdcc9c36a96874b4c45056a46ece45.tar.gz linux-stable-cab3ecaed5cdcc9c36a96874b4c45056a46ece45.tar.bz2 linux-stable-cab3ecaed5cdcc9c36a96874b4c45056a46ece45.zip | |
sched/core: Fixed missing rq clock update before calling set_rq_offline()
When using a cpufreq governor that uses
cpufreq_add_update_util_hook(), it is possible to trigger a missing
update_rq_clock() warning for the CPU hotplug path:
rq_attach_root()
set_rq_offline()
rq_offline_rt()
__disable_runtime()
sched_rt_rq_enqueue()
enqueue_top_rt_rq()
cpufreq_update_util()
data->func(data, rq_clock(rq), flags)
Move update_rq_clock() from sched_cpu_deactivate() (one of it's
callers) into set_rq_offline() such that it covers all
set_rq_offline() usage.
Additionally change rq_attach_root() to use rq_lock_irqsave() so that
it will properly manage the runqueue clock flags.
Suggested-by: Ben Segall <bsegall@google.com>
Signed-off-by: Hao Jia <jiahao.os@bytedance.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org>
Link: https://lkml.kernel.org/r/20230613082012.49615-2-jiahao.os@bytedance.com
Diffstat (limited to 'kernel/sched/topology.c')
| -rw-r--r-- | kernel/sched/topology.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index cb92dc5f5646..d3a3b2646ec4 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -487,9 +487,9 @@ static void free_rootdomain(struct rcu_head *rcu) void rq_attach_root(struct rq *rq, struct root_domain *rd) { struct root_domain *old_rd = NULL; - unsigned long flags; + struct rq_flags rf; - raw_spin_rq_lock_irqsave(rq, flags); + rq_lock_irqsave(rq, &rf); if (rq->rd) { old_rd = rq->rd; @@ -515,7 +515,7 @@ void rq_attach_root(struct rq *rq, struct root_domain *rd) if (cpumask_test_cpu(rq->cpu, cpu_active_mask)) set_rq_online(rq); - raw_spin_rq_unlock_irqrestore(rq, flags); + rq_unlock_irqrestore(rq, &rf); if (old_rd) call_rcu(&old_rd->rcu, free_rootdomain); |