diff options
| author |  Peter Zijlstra <peterz@infradead.org>
| 2023-08-01 22:41:24 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org>
| 2023-08-14 17:01:25 +0200 |
| commit | 5bb76f1ddf2a7dd98f5a89d7755600ed1b4a7fcd (patch) | |
| tree | fd5928170b17a19c9e9c2dfef480f9c8c08e5259 /kernel/sched/core.c | |
| parent | sched: Simplify sysctl_sched_uclamp_handler() (diff) | |
| download | linux-5bb76f1ddf2a7dd98f5a89d7755600ed1b4a7fcd.tar.gz linux-5bb76f1ddf2a7dd98f5a89d7755600ed1b4a7fcd.tar.bz2 linux-5bb76f1ddf2a7dd98f5a89d7755600ed1b4a7fcd.zip | |
sched: Simplify: migrate_swap_stop()
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/20230801211811.964370836@infradead.org
Diffstat (limited to 'kernel/sched/core.c')
| -rw-r--r-- | kernel/sched/core.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 6e8a8e9d2cad..66478a62f217 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3433,7 +3433,6 @@ static int migrate_swap_stop(void *data) { struct migration_swap_arg *arg = data; struct rq *src_rq, *dst_rq; - int ret = -EAGAIN; if (!cpu_active(arg->src_cpu) || !cpu_active(arg->dst_cpu)) return -EAGAIN; @@ -3441,33 +3440,25 @@ static int migrate_swap_stop(void *data) src_rq = cpu_rq(arg->src_cpu); dst_rq = cpu_rq(arg->dst_cpu); - double_raw_lock(&arg->src_task->pi_lock, - &arg->dst_task->pi_lock); - double_rq_lock(src_rq, dst_rq); + guard(double_raw_spinlock)(&arg->src_task->pi_lock, &arg->dst_task->pi_lock); + guard(double_rq_lock)(src_rq, dst_rq); if (task_cpu(arg->dst_task) != arg->dst_cpu) - goto unlock; + return -EAGAIN; if (task_cpu(arg->src_task) != arg->src_cpu) - goto unlock; + return -EAGAIN; if (!cpumask_test_cpu(arg->dst_cpu, arg->src_task->cpus_ptr)) - goto unlock; + return -EAGAIN; if (!cpumask_test_cpu(arg->src_cpu, arg->dst_task->cpus_ptr)) - goto unlock; + return -EAGAIN; __migrate_swap_task(arg->src_task, arg->dst_cpu); __migrate_swap_task(arg->dst_task, arg->src_cpu); - ret = 0; - -unlock: - double_rq_unlock(src_rq, dst_rq); - raw_spin_unlock(&arg->dst_task->pi_lock); - raw_spin_unlock(&arg->src_task->pi_lock); - - return ret; + return 0; } /* |