From 6534e043166a8ffbf85570ae94824b6863c785b6 Mon Sep 17 00:00:00 2001 From: Wang Hui Date: Wed, 21 Jul 2021 17:11:09 +0800 Subject: [PATCH] sched: remove redundant on_rq status change ANBZ: #19751 commit f912d051619d11411867f642d2004928eb0b41b1 upstream. activate_task/deactivate_task will change on_rq status, no need to do it again. Signed-off-by: Wang Hui Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20210721091109.1406043-1-john.wanghui@huawei.com [dtcccc: Also fix the same issue in __push_expellee().] Signed-off-by: Tianchen Ding --- kernel/sched/core.c | 2 -- kernel/sched/fair.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 235b6e30ec68..c68c81a5c89b 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5382,11 +5382,9 @@ static bool try_steal_cookie(int this, int that) if (sched_task_is_throttled(p, this)) goto next; - p->on_rq = TASK_ON_RQ_MIGRATING; deactivate_task(src, p, 0); set_task_cpu(p, this); activate_task(dst, p, 0); - p->on_rq = TASK_ON_RQ_QUEUED; resched_curr(dst); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index a75bd194d8fa..dd98d72dbe02 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6889,11 +6889,9 @@ static void __push_expellee(struct rq *rq) break; } migrate: - p->on_rq = TASK_ON_RQ_MIGRATING; deactivate_task(rq, p, 0); set_task_cpu(p, dst_cpu); activate_task(dst_rq, p, 0); - p->on_rq = TASK_ON_RQ_QUEUED; put_task_struct(p); resched_curr(dst_rq); -- Gitee