The following commit has been merged into the sched/core branch of tip: Commit-ID: 3840155df4460200584624c7ce71be8e9c9d4f6a Gitweb: https://git.kernel.org/tip/3840155df4460200584624c7ce71be8e9c9d4f6a Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> AuthorDate: Fri, 09 Jun 2023 20:41:09 +02:00 Committer: root <root@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> CommitterDate: Sat, 09 Sep 2023 15:10:17 +02:00 sched: Simplify sched_move_task() Use guards to reduce gotos and simplify control flow. Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> --- kernel/sched/core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index acaab2d..bcae6e3 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -10438,17 +10438,18 @@ void sched_move_task(struct task_struct *tsk) int queued, running, queue_flags = DEQUEUE_SAVE | DEQUEUE_MOVE | DEQUEUE_NOCLOCK; struct task_group *group; - struct rq_flags rf; struct rq *rq; - rq = task_rq_lock(tsk, &rf); + CLASS(task_rq_lock, rq_guard)(tsk); + rq = rq_guard.rq; + /* * Esp. with SCHED_AUTOGROUP enabled it is possible to get superfluous * group changes. */ group = sched_get_task_group(tsk); if (group == tsk->sched_task_group) - goto unlock; + return; update_rq_clock(rq); @@ -10473,9 +10474,6 @@ void sched_move_task(struct task_struct *tsk) */ resched_curr(rq); } - -unlock: - task_rq_unlock(rq, tsk, &rf); } static inline struct task_group *css_tg(struct cgroup_subsys_state *css)
|