diff options
| author |  Peter Zijlstra <peterz@infradead.org>
| 2023-06-09 20:52:55 +0200 |
|---|---|---|
| committer |  Ingo Molnar <mingo@kernel.org>
| 2023-09-13 15:01:14 +0200 |
| commit | 94b548a15e8ec47dfbf6925bdfb64bb5657dce0c (patch) | |
| tree | 1f257fabbfb7225235baf8d4779674566edc8242 /kernel/sched/core.c | |
| parent | Linux 6.6-rc1 (diff) | |
| download | linux-94b548a15e8ec47dfbf6925bdfb64bb5657dce0c.tar.gz linux-94b548a15e8ec47dfbf6925bdfb64bb5657dce0c.tar.bz2 linux-94b548a15e8ec47dfbf6925bdfb64bb5657dce0c.zip | |
sched: Simplify set_user_nice()
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/core.c')
| -rw-r--r-- | kernel/sched/core.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 2299a5cfbfb9..fa57a560c52a 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -7187,9 +7187,8 @@ static inline int rt_effective_prio(struct task_struct *p, int prio) void set_user_nice(struct task_struct *p, long nice) { bool queued, running; - int old_prio; - struct rq_flags rf; struct rq *rq; + int old_prio; if (task_nice(p) == nice || nice < MIN_NICE || nice > MAX_NICE) return; @@ -7197,7 +7196,9 @@ void set_user_nice(struct task_struct *p, long nice) * We have to be careful, if called from sys_setpriority(), * the task might be in the middle of scheduling on another CPU. */ - rq = task_rq_lock(p, &rf); + CLASS(task_rq_lock, rq_guard)(p); + rq = rq_guard.rq; + update_rq_clock(rq); /* @@ -7208,8 +7209,9 @@ void set_user_nice(struct task_struct *p, long nice) */ if (task_has_dl_policy(p) || task_has_rt_policy(p)) { p->static_prio = NICE_TO_PRIO(nice); - goto out_unlock; + return; } + queued = task_on_rq_queued(p); running = task_current(rq, p); if (queued) @@ -7232,9 +7234,6 @@ void set_user_nice(struct task_struct *p, long nice) * lowered its priority, then reschedule its CPU: */ p->sched_class->prio_changed(rq, p, old_prio); - -out_unlock: - task_rq_unlock(rq, p, &rf); } EXPORT_SYMBOL(set_user_nice); |