diff options
| author |  Peter Zijlstra <peterz@infradead.org>
| 2023-08-01 22:41:29 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org>
| 2023-08-14 17:01:27 +0200 |
| commit | b4e1fa1e14286f7a825b10d8ebb2e9c0f77c241b (patch) | |
| tree | a0b941a456dddff66f813874f5472d9bf6a9be81 /kernel/sched/core.c | |
| parent | sched: Simplify sched_tick_remote() (diff) | |
| download | linux-b4e1fa1e14286f7a825b10d8ebb2e9c0f77c241b.tar.gz linux-b4e1fa1e14286f7a825b10d8ebb2e9c0f77c241b.tar.bz2 linux-b4e1fa1e14286f7a825b10d8ebb2e9c0f77c241b.zip | |
sched: Simplify try_steal_cookie()
Use guards to reduce gotos and simplify control flow.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Valentin Schneider <vschneid@redhat.com>
Link: https://lore.kernel.org/r/20230801211812.304154828@infradead.org
Diffstat (limited to 'kernel/sched/core.c')
| -rw-r--r-- | kernel/sched/core.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 1b2fa91a1ef5..f113a4449fde 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6298,19 +6298,19 @@ static bool try_steal_cookie(int this, int that) unsigned long cookie; bool success = false; - local_irq_disable(); - double_rq_lock(dst, src); + guard(irq)(); + guard(double_rq_lock)(dst, src); cookie = dst->core->core_cookie; if (!cookie) - goto unlock; + return false; if (dst->curr != dst->idle) - goto unlock; + return false; p = sched_core_find(src, cookie); if (!p) - goto unlock; + return false; do { if (p == src->core_pick || p == src->curr) @@ -6322,9 +6322,10 @@ static bool try_steal_cookie(int this, int that) if (p->core_occupation > dst->idle->core_occupation) goto next; /* - * sched_core_find() and sched_core_next() will ensure that task @p - * is not throttled now, we also need to check whether the runqueue - * of the destination CPU is being throttled. + * sched_core_find() and sched_core_next() will ensure + * that task @p is not throttled now, we also need to + * check whether the runqueue of the destination CPU is + * being throttled. */ if (sched_task_is_throttled(p, this)) goto next; @@ -6342,10 +6343,6 @@ next: p = sched_core_next(p, cookie); } while (p); -unlock: - double_rq_unlock(dst, src); - local_irq_enable(); - return success; } |