aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Zijlstra <[email protected]>2023-08-01 22:41:22 +0200
committerPeter Zijlstra <[email protected]>2023-08-14 17:01:24 +0200
commit7537b90c0036759e0b1b43dfbc6224dc5e900b13 (patch)
tree2f9a22965c3c92413b17ee0040de768d07d57a3e
parentc1fc6484e1fb7cc2481d169bfef129a1b0676abe (diff)
sched: Simplify get_nohz_timer_target()
Use guards to reduce gotos and simplify control flow. Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Joel Fernandes (Google) <[email protected]> Reviewed-by: Valentin Schneider <[email protected]> Link: https://lore.kernel.org/r/[email protected]
-rw-r--r--kernel/sched/core.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index a97eab3e775a..6cda29655cb0 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1097,25 +1097,22 @@ int get_nohz_timer_target(void)
hk_mask = housekeeping_cpumask(HK_TYPE_TIMER);
- rcu_read_lock();
+ guard(rcu)();
+
for_each_domain(cpu, sd) {
for_each_cpu_and(i, sched_domain_span(sd), hk_mask) {
if (cpu == i)
continue;
- if (!idle_cpu(i)) {
- cpu = i;
- goto unlock;
- }
+ if (!idle_cpu(i))
+ return i;
}
}
if (default_cpu == -1)
default_cpu = housekeeping_any_cpu(HK_TYPE_TIMER);
- cpu = default_cpu;
-unlock:
- rcu_read_unlock();
- return cpu;
+
+ return default_cpu;
}
/*