| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20240604131204.n4njtgo4tpo352ht@airbuntu>
Date: Tue, 4 Jun 2024 14:12:04 +0100
From: Qais Yousef <qyousef@...alina.io>
To: John Stultz <jstultz@...gle.com>
Cc: LKML <linux-kernel@...r.kernel.org>,
Connor O'Brien <connoro@...gle.com>,
Joel Fernandes <joelaf@...gle.com>, Ingo Molnar <mingo@...hat.com>,
Peter Zijlstra <peterz@...radead.org>,
Juri Lelli <juri.lelli@...hat.com>,
Vincent Guittot <vincent.guittot@...aro.org>,
Dietmar Eggemann <dietmar.eggemann@....com>,
Valentin Schneider <vschneid@...hat.com>,
Steven Rostedt <rostedt@...dmis.org>,
Ben Segall <bsegall@...gle.com>,
Zimuzo Ezeozue <zezeozue@...gle.com>,
Youssef Esmat <youssefesmat@...gle.com>,
Mel Gorman <mgorman@...e.de>,
Daniel Bristot de Oliveira <bristot@...hat.com>,
Will Deacon <will@...nel.org>, Waiman Long <longman@...hat.com>,
Boqun Feng <boqun.feng@...il.com>,
"Paul E. McKenney" <paulmck@...nel.org>,
Metin Kaya <Metin.Kaya@....com>,
Xuewen Yan <xuewen.yan94@...il.com>,
K Prateek Nayak <kprateek.nayak@....com>,
Thomas Gleixner <tglx@...utronix.de>, kernel-team@...roid.com
Subject: Re: [PATCH v10 4/7] sched: Add move_queued_task_locked helper
On 05/06/24 21:54, John Stultz wrote:
> From: Connor O'Brien <connoro@...gle.com>
>
> Switch logic that deactivates, sets the task cpu,
> and reactivates a task on a different rq to use a
> helper that will be later extended to push entire
> blocked task chains.
>
> This patch was broken out from a larger chain migration
> patch originally by Connor O'Brien.
>
> Cc: Joel Fernandes <joelaf@...gle.com>
> Cc: Qais Yousef <qyousef@...alina.io>
> Cc: Ingo Molnar <mingo@...hat.com>
> Cc: Peter Zijlstra <peterz@...radead.org>
> Cc: Juri Lelli <juri.lelli@...hat.com>
> Cc: Vincent Guittot <vincent.guittot@...aro.org>
> Cc: Dietmar Eggemann <dietmar.eggemann@....com>
> Cc: Valentin Schneider <vschneid@...hat.com>
> Cc: Steven Rostedt <rostedt@...dmis.org>
> Cc: Ben Segall <bsegall@...gle.com>
> Cc: Zimuzo Ezeozue <zezeozue@...gle.com>
> Cc: Youssef Esmat <youssefesmat@...gle.com>
> Cc: Mel Gorman <mgorman@...e.de>
> Cc: Daniel Bristot de Oliveira <bristot@...hat.com>
> Cc: Will Deacon <will@...nel.org>
> Cc: Waiman Long <longman@...hat.com>
> Cc: Boqun Feng <boqun.feng@...il.com>
> Cc: "Paul E. McKenney" <paulmck@...nel.org>
> Cc: Metin Kaya <Metin.Kaya@....com>
> Cc: Xuewen Yan <xuewen.yan94@...il.com>
> Cc: K Prateek Nayak <kprateek.nayak@....com>
> Cc: Thomas Gleixner <tglx@...utronix.de>
> Cc: kernel-team@...roid.com
> Tested-by: K Prateek Nayak <kprateek.nayak@....com>
> Tested-by: Metin Kaya <metin.kaya@....com>
> Reviewed-by: Metin Kaya <metin.kaya@....com>
> Reviewed-by: Valentin Schneider <vschneid@...hat.com>
> Signed-off-by: Connor O'Brien <connoro@...gle.com>
> [jstultz: split out from larger chain migration patch]
> Signed-off-by: John Stultz <jstultz@...gle.com>
> ---
> v8:
> * Renamed from push_task_chain to do_push_task so it makes
> more sense without proxy-execution
> v10:
> * Changed name to move_queued_task_locked as suggested by Valentin
> ---
> kernel/sched/core.c | 4 +---
> kernel/sched/deadline.c | 8 ++------
> kernel/sched/rt.c | 8 ++------
> kernel/sched/sched.h | 11 +++++++++++
> 4 files changed, 16 insertions(+), 15 deletions(-)
>
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index 7019a40457a6..48f0d4b381d5 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -2712,9 +2712,7 @@ int push_cpu_stop(void *arg)
>
> // XXX validate p is still the highest prio task
> if (task_rq(p) == rq) {
> - deactivate_task(rq, p, 0);
> - set_task_cpu(p, lowest_rq->cpu);
> - activate_task(lowest_rq, p, 0);
> + move_queued_task_locked(rq, lowest_rq, p);
> resched_curr(lowest_rq);
> }
>
> diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
> index a04a436af8cc..eaedc69c5e30 100644
> --- a/kernel/sched/deadline.c
> +++ b/kernel/sched/deadline.c
> @@ -2443,9 +2443,7 @@ static int push_dl_task(struct rq *rq)
> goto retry;
> }
>
> - deactivate_task(rq, next_task, 0);
> - set_task_cpu(next_task, later_rq->cpu);
> - activate_task(later_rq, next_task, 0);
> + move_queued_task_locked(rq, later_rq, next_task);
> ret = 1;
>
> resched_curr(later_rq);
> @@ -2531,9 +2529,7 @@ static void pull_dl_task(struct rq *this_rq)
> if (is_migration_disabled(p)) {
> push_task = get_push_task(src_rq);
> } else {
> - deactivate_task(src_rq, p, 0);
> - set_task_cpu(p, this_cpu);
> - activate_task(this_rq, p, 0);
> + move_queued_task_locked(src_rq, this_rq, p);
> dmin = p->dl.deadline;
> resched = true;
> }
> diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
> index 3261b067b67e..975cb49a64dc 100644
> --- a/kernel/sched/rt.c
> +++ b/kernel/sched/rt.c
> @@ -2106,9 +2106,7 @@ static int push_rt_task(struct rq *rq, bool pull)
> goto retry;
> }
>
> - deactivate_task(rq, next_task, 0);
> - set_task_cpu(next_task, lowest_rq->cpu);
> - activate_task(lowest_rq, next_task, 0);
> + move_queued_task_locked(rq, lowest_rq, next_task);
> resched_curr(lowest_rq);
> ret = 1;
>
> @@ -2379,9 +2377,7 @@ static void pull_rt_task(struct rq *this_rq)
> if (is_migration_disabled(p)) {
> push_task = get_push_task(src_rq);
> } else {
> - deactivate_task(src_rq, p, 0);
> - set_task_cpu(p, this_cpu);
> - activate_task(this_rq, p, 0);
> + move_queued_task_locked(src_rq, this_rq, p);
> resched = true;
> }
> /*
> diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
> index ae50f212775e..2d41ebe200c7 100644
> --- a/kernel/sched/sched.h
> +++ b/kernel/sched/sched.h
> @@ -3480,5 +3480,16 @@ static inline void init_sched_mm_cid(struct task_struct *t) { }
>
> extern u64 avg_vruntime(struct cfs_rq *cfs_rq);
> extern int entity_eligible(struct cfs_rq *cfs_rq, struct sched_entity *se);
> +#ifdef CONFIG_SMP
> +static inline
> +void move_queued_task_locked(struct rq *rq, struct rq *dst_rq, struct task_struct *task)
> +{
> + lockdep_assert_rq_held(rq);
> + lockdep_assert_rq_held(dst_rq);
> + deactivate_task(rq, task, 0);
> + set_task_cpu(task, dst_rq->cpu);
> + activate_task(dst_rq, task, 0);
> +}
> +#endif
I see this pattern in __migrate_swap_task() and try_steal_cookie(), should they
be converted to?
Beside this
Reviewed-by: Qais Yousef <qyousef@...alina.io>
>
> #endif /* _KERNEL_SCHED_SCHED_H */
> --
> 2.45.0.rc1.225.g2a3ae87e7f-goog
>
Powered by blists - more mailing lists