diff options
| author | Tejun Heo <tj@kernel.org> | 2024-09-03 21:54:29 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2024-09-03 21:54:29 -1000 |
| commit | f422316d7466da7724f0662b7e282afbbca78e95 (patch) | |
| tree | 8691b89e127c1e705d7093b741bbe8bae9b19f3a /kernel/sched | |
| parent | 65aaf90569ffa283170243576c3982521d6cb193 (diff) | |
sched_ext: Remove switch_class_scx()
Now that put_prev_task_scx() is called with @next on task switches, there's
no reason to use sched_class.switch_class(). Rename switch_class_scx() to
switch_class() and call it from put_prev_task_scx().
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/sched')
| -rw-r--r-- | kernel/sched/ext.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c index 24bafa649fdb..f0c9823915c6 100644 --- a/kernel/sched/ext.c +++ b/kernel/sched/ext.c @@ -2723,12 +2723,10 @@ preempt_reason_from_class(const struct sched_class *class) return SCX_CPU_PREEMPT_UNKNOWN; } -static void switch_class_scx(struct rq *rq, struct task_struct *next) +static void switch_class(struct rq *rq, struct task_struct *next) { const struct sched_class *next_class = next->sched_class; - if (!scx_enabled()) - return; #ifdef CONFIG_SMP /* * Pairs with the smp_load_acquire() issued by a CPU in @@ -2808,6 +2806,9 @@ static void put_prev_task_scx(struct rq *rq, struct task_struct *p, do_enqueue_task(rq, p, 0, -1); } } + + if (next && next->sched_class != &ext_sched_class) + switch_class(rq, next); } static struct task_struct *first_local_task(struct rq *rq) @@ -3591,8 +3592,6 @@ DEFINE_SCHED_CLASS(ext) = { .put_prev_task = put_prev_task_scx, .set_next_task = set_next_task_scx, - .switch_class = switch_class_scx, - #ifdef CONFIG_SMP .select_task_rq = select_task_rq_scx, .task_woken = task_woken_scx, |