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
This commit is contained in:
@ -6298,19 +6298,19 @@ static bool try_steal_cookie(int this, int that)
|
|||||||
unsigned long cookie;
|
unsigned long cookie;
|
||||||
bool success = false;
|
bool success = false;
|
||||||
|
|
||||||
local_irq_disable();
|
guard(irq)();
|
||||||
double_rq_lock(dst, src);
|
guard(double_rq_lock)(dst, src);
|
||||||
|
|
||||||
cookie = dst->core->core_cookie;
|
cookie = dst->core->core_cookie;
|
||||||
if (!cookie)
|
if (!cookie)
|
||||||
goto unlock;
|
return false;
|
||||||
|
|
||||||
if (dst->curr != dst->idle)
|
if (dst->curr != dst->idle)
|
||||||
goto unlock;
|
return false;
|
||||||
|
|
||||||
p = sched_core_find(src, cookie);
|
p = sched_core_find(src, cookie);
|
||||||
if (!p)
|
if (!p)
|
||||||
goto unlock;
|
return false;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
if (p == src->core_pick || p == src->curr)
|
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)
|
if (p->core_occupation > dst->idle->core_occupation)
|
||||||
goto next;
|
goto next;
|
||||||
/*
|
/*
|
||||||
* sched_core_find() and sched_core_next() will ensure that task @p
|
* sched_core_find() and sched_core_next() will ensure
|
||||||
* is not throttled now, we also need to check whether the runqueue
|
* that task @p is not throttled now, we also need to
|
||||||
* of the destination CPU is being throttled.
|
* check whether the runqueue of the destination CPU is
|
||||||
|
* being throttled.
|
||||||
*/
|
*/
|
||||||
if (sched_task_is_throttled(p, this))
|
if (sched_task_is_throttled(p, this))
|
||||||
goto next;
|
goto next;
|
||||||
@ -6342,10 +6343,6 @@ next:
|
|||||||
p = sched_core_next(p, cookie);
|
p = sched_core_next(p, cookie);
|
||||||
} while (p);
|
} while (p);
|
||||||
|
|
||||||
unlock:
|
|
||||||
double_rq_unlock(dst, src);
|
|
||||||
local_irq_enable();
|
|
||||||
|
|
||||||
return success;
|
return success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user