diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2023-06-09 16:59:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-09-13 15:01:33 +0200 |
| commit | af7c5763f5e8bc1b3f827354a283ccaf6a8c8098 (patch) | |
| tree | 37daf229c61659b8bc95509edc2dbb30e8e93fef /kernel/sched | |
| parent | 7a50f76674f8b6f4f30a1cec954179f10e20110c (diff) | |
| download | linux-af7c5763f5e8bc1b3f827354a283ccaf6a8c8098.tar.gz | |
sched: Simplify sched_rr_get_interval()
Use guards to reduce gotos and simplify control flow.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched')
| -rw-r--r-- | kernel/sched/core.c | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 6c8c40a545608..d298176367f77 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -9030,38 +9030,30 @@ SYSCALL_DEFINE1(sched_get_priority_min, int, policy) static int sched_rr_get_interval(pid_t pid, struct timespec64 *t) { - struct task_struct *p; - unsigned int time_slice; - struct rq_flags rf; - struct rq *rq; + unsigned int time_slice = 0; int retval; if (pid < 0) return -EINVAL; - retval = -ESRCH; - rcu_read_lock(); - p = find_process_by_pid(pid); - if (!p) - goto out_unlock; + scoped_guard (rcu) { + struct task_struct *p = find_process_by_pid(pid); + if (!p) + return -ESRCH; - retval = security_task_getscheduler(p); - if (retval) - goto out_unlock; + retval = security_task_getscheduler(p); + if (retval) + return retval; - rq = task_rq_lock(p, &rf); - time_slice = 0; - if (p->sched_class->get_rr_interval) - time_slice = p->sched_class->get_rr_interval(rq, p); - task_rq_unlock(rq, p, &rf); + scoped_guard (task_rq_lock, p) { + struct rq *rq = scope.rq; + if (p->sched_class->get_rr_interval) + time_slice = p->sched_class->get_rr_interval(rq, p); + } + } - rcu_read_unlock(); jiffies_to_timespec64(time_slice, t); return 0; - -out_unlock: - rcu_read_unlock(); - return retval; } /** |