From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>,
Valentin Schneider <valentin.schneider@arm.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: sched/urgent] sched: Prepare to use balance_push in ttwu()
Date: Fri, 22 Jan 2021 17:41:34 -0000 [thread overview]
Message-ID: <161133729464.414.3770602797973233529.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210121103506.966069627@infradead.org>
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 975707f227b07a8212060f94447171d15d7a681b
Gitweb: https://git.kernel.org/tip/975707f227b07a8212060f94447171d15d7a681b
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Wed, 20 Jan 2021 15:05:41 +01:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Fri, 22 Jan 2021 15:09:43 +01:00
sched: Prepare to use balance_push in ttwu()
In preparation of using the balance_push state in ttwu() we need it to
provide a reliable and consistent state.
The immediate problem is that rq->balance_callback gets cleared every
schedule() and then re-set in the balance_push_callback() itself. This
is not a reliable signal, so add a variable that stays set during the
entire time.
Also move setting it before the synchronize_rcu() in
sched_cpu_deactivate(), such that we get guaranteed visibility to
ttwu(), which is a preempt-disable region.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Valentin Schneider <valentin.schneider@arm.com>
Tested-by: Valentin Schneider <valentin.schneider@arm.com>
Link: https://lkml.kernel.org/r/20210121103506.966069627@infradead.org
---
kernel/sched/core.c | 11 ++++++-----
kernel/sched/sched.h | 1 +
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 8da0fd7..16946b5 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7320,6 +7320,7 @@ static void balance_push_set(int cpu, bool on)
struct rq_flags rf;
rq_lock_irqsave(rq, &rf);
+ rq->balance_push = on;
if (on) {
WARN_ON_ONCE(rq->balance_callback);
rq->balance_callback = &balance_push_callback;
@@ -7489,17 +7490,17 @@ int sched_cpu_deactivate(unsigned int cpu)
int ret;
set_cpu_active(cpu, false);
+ balance_push_set(cpu, true);
+
/*
- * We've cleared cpu_active_mask, wait for all preempt-disabled and RCU
- * users of this state to go away such that all new such users will
- * observe it.
+ * We've cleared cpu_active_mask / set balance_push, wait for all
+ * preempt-disabled and RCU users of this state to go away such that
+ * all new such users will observe it.
*
* Do sync before park smpboot threads to take care the rcu boost case.
*/
synchronize_rcu();
- balance_push_set(cpu, true);
-
rq_lock_irqsave(rq, &rf);
if (rq->rd) {
update_rq_clock(rq);
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 12ada79..bb09988 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -975,6 +975,7 @@ struct rq {
unsigned long cpu_capacity_orig;
struct callback_head *balance_callback;
+ unsigned char balance_push;
unsigned char nohz_idle_balance;
unsigned char idle_balance;
next prev parent reply other threads:[~2021-01-22 17:56 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 10:17 [PATCH -v3 0/9] sched: Fix hot-unplug regression Peter Zijlstra
2021-01-21 10:17 ` [PATCH -v3 1/9] sched/core: Print out straggler tasks in sched_cpu_dying() Peter Zijlstra
2021-01-21 10:17 ` [PATCH -v3 2/9] workqueue: Use cpu_possible_mask instead of cpu_active_mask to break affinity Peter Zijlstra
2021-01-21 10:17 ` [PATCH -v3 3/9] sched: Dont run cpu-online with balance_push() enabled Peter Zijlstra
2021-01-21 14:00 ` Valentin Schneider
2021-01-21 14:14 ` Peter Zijlstra
2021-01-22 17:41 ` [tip: sched/urgent] sched: Don't " tip-bot2 for Peter Zijlstra
2021-01-21 10:17 ` [PATCH -v3 4/9] kthread: Extract KTHREAD_IS_PER_CPU Peter Zijlstra
2021-01-22 17:41 ` [tip: sched/urgent] " tip-bot2 for Peter Zijlstra
2021-01-21 10:17 ` [PATCH -v3 5/9] workqueue: Tag bound workers with KTHREAD_IS_PER_CPU Peter Zijlstra
2021-01-21 14:31 ` Valentin Schneider
2021-01-22 17:41 ` [tip: sched/urgent] " tip-bot2 for Peter Zijlstra
2021-01-21 10:17 ` [PATCH -v3 6/9] workqueue: Restrict affinity change to rescuer Peter Zijlstra
2021-01-22 17:41 ` [tip: sched/urgent] " tip-bot2 for Peter Zijlstra
2021-01-21 10:17 ` [PATCH -v3 7/9] sched: Prepare to use balance_push in ttwu() Peter Zijlstra
2021-01-22 17:41 ` tip-bot2 for Peter Zijlstra [this message]
2021-01-21 10:17 ` [PATCH -v3 8/9] sched: Fix CPU hotplug / tighten is_per_cpu_kthread() Peter Zijlstra
2021-01-21 14:01 ` Valentin Schneider
2021-01-21 14:18 ` Peter Zijlstra
2021-01-21 14:36 ` Valentin Schneider
2021-01-22 17:41 ` [tip: sched/urgent] " tip-bot2 for Peter Zijlstra
2021-01-21 10:17 ` [PATCH -v3 9/9] sched: Relax the set_cpus_allowed_ptr() semantics Peter Zijlstra
2021-01-22 17:41 ` [tip: sched/urgent] " tip-bot2 for Peter Zijlstra
2021-01-21 14:36 ` [PATCH -v3 0/9] sched: Fix hot-unplug regression Valentin Schneider
2021-01-21 19:56 ` Paul E. McKenney
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=161133729464.414.3770602797973233529.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=valentin.schneider@arm.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).