From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>, Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: "Joel Fernandes (Google)" <joel@joelfernandes•org>,
Daniel Bristot de Oliveira <bristot@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Yang Yingliang <yangyingliang@huawei•com>
Subject: linux-next: manual merge of the sched-ext tree with the tip tree
Date: Thu, 1 Aug 2024 12:45:45 +1000 [thread overview]
Message-ID: <20240801124545.43e3a455@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2282 bytes --]
Hi all,
Today's linux-next merge of the sched-ext tree got a conflict in:
kernel/sched/core.c
between commits:
c245910049d0 ("sched/core: Add clearing of ->dl_server in put_prev_task_balance()")
31b164e2e4af ("sched/smt: Introduce sched_smt_present_inc/dec() helper")
from the tip tree and commits:
60c27fb59f6c ("sched_ext: Implement sched_ext_ops.cpu_online/offline()")
a7a9fc549293 ("sched_ext: Add boilerplate for extensible scheduler class")
from the sched-ext tree.
I fixed it up (I think, see below) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc kernel/sched/core.c
index 73fa0290fd8f,22f86d5e9231..000000000000
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -5878,10 -5901,23 +5947,15 @@@ __pick_next_task(struct rq *rq, struct
restart:
put_prev_task_balance(rq, prev, rf);
- for_each_class(class) {
- /*
- * We've updated @prev and no longer need the server link, clear it.
- * Must be done before ->pick_next_task() because that can (re)set
- * ->dl_server.
- */
- if (prev->dl_server)
- prev->dl_server = NULL;
-
+ for_each_active_class(class) {
p = class->pick_next_task(rq);
- if (p)
+ if (p) {
+ const struct sched_class *prev_class = prev->sched_class;
+
+ if (class != prev_class && prev_class->switch_class)
+ prev_class->switch_class(rq, p);
return p;
+ }
}
BUG(); /* The idle class should always have a runnable task. */
@@@ -8040,8 -8056,16 +8122,10 @@@ int sched_cpu_deactivate(unsigned int c
*/
synchronize_rcu();
- rq_lock_irqsave(rq, &rf);
- if (rq->rd) {
- BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
- set_rq_offline(rq);
- }
- rq_unlock_irqrestore(rq, &rf);
+ sched_set_rq_offline(rq, cpu);
+ scx_rq_deactivate(rq);
+
-#ifdef CONFIG_SCHED_SMT
/*
* When going down, decrement the number of cores with SMT present.
*/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-08-01 2:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-01 2:45 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-03-09 18:49 linux-next: manual merge of the sched-ext tree with the tip tree Mark Brown
2026-03-09 20:02 ` Tejun Heo
2026-03-03 13:28 Mark Brown
2024-10-15 2:49 Stephen Rothwell
2024-10-17 2:22 ` Stephen Rothwell
2024-09-11 6:40 Stephen Rothwell
2024-09-11 19:03 ` Tejun Heo
2024-08-22 3:43 Stephen Rothwell
2024-08-01 2:45 Stephen Rothwell
2024-08-04 17:42 ` Tejun Heo
2024-08-01 2:45 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240801124545.43e3a455@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bristot@kernel$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=joel@joelfernandes$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=tj@kernel$(echo .)org \
--cc=yangyingliang@huawei$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox