From: zanussi@kernel.org
To: LKML <linux-kernel@vger.kernel.org>,
linux-rt-users <linux-rt-users@vger.kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Thomas Gleixner <tglx@linutronix.de>,
Carsten Emde <C.Emde@osadl.org>, John Kacur <jkacur@redhat.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Daniel Wagner <wagi@monom.org>, Tom Zanussi <zanussi@kernel.org>
Subject: [PATCH RT 06/25] sched: migrate_dis/enable: Use sleeping_lock…() to annotate sleeping points
Date: Fri, 21 Feb 2020 15:24:34 -0600 [thread overview]
Message-ID: <882928ccb55265cc9fd76858057faac2c132b280.1582320278.git.zanussi@kernel.org> (raw)
In-Reply-To: <cover.1582320278.git.zanussi@kernel.org>
In-Reply-To: <cover.1582320278.git.zanussi@kernel.org>
From: Scott Wood <swood@redhat.com>
v4.14.170-rt75-rc1 stable review patch.
If anyone has any objections, please let me know.
-----------
[ Upstream commit 4230dd3824c3e1785504e6f757ce79a4b55651fa ]
Without this, rcu_note_context_switch() will complain if an RCU read lock
is held when migrate_enable() calls stop_one_cpu(). Likewise when
migrate_disable() calls pin_current_cpu() which calls __read_rt_lock() --
which bypasses the part of the mutex code that calls sleeping_lock_inc().
Signed-off-by: Scott Wood <swood@redhat.com>
[bigeasy: use sleeping_lock_…() ]
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Tom Zanussi <zanussi@kernel.org>
Conflicts:
kernel/sched/core.c
---
kernel/cpu.c | 2 ++
kernel/sched/core.c | 3 +++
2 files changed, 5 insertions(+)
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 05b93cfa6fd9..9be794896d87 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -314,7 +314,9 @@ void pin_current_cpu(void)
preempt_lazy_enable();
preempt_enable();
+ sleeping_lock_inc();
__read_rt_lock(cpuhp_pin);
+ sleeping_lock_dec();
preempt_disable();
preempt_lazy_disable();
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index fde47216af94..fcff75934bdc 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7045,7 +7045,10 @@ void migrate_enable(void)
unpin_current_cpu();
preempt_lazy_enable();
preempt_enable();
+
+ sleeping_lock_inc();
stop_one_cpu(task_cpu(p), migration_cpu_stop, &arg);
+ sleeping_lock_dec();
tlb_migrate_finish(p->mm);
return;
--
2.14.1
next prev parent reply other threads:[~2020-02-21 21:26 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-21 21:24 [PATCH RT 00/25] Linux v4.14.170-rt75-rc1 zanussi
2020-02-21 21:24 ` [PATCH RT 01/25] Fix wrong-variable use in irq_set_affinity_notifier zanussi
2020-02-21 21:24 ` [PATCH RT 02/25] x86: preempt: Check preemption level before looking at lazy-preempt zanussi
2020-02-21 21:24 ` [PATCH RT 03/25] sched/deadline: Ensure inactive_timer runs in hardirq context zanussi
2020-02-24 8:33 ` Sebastian Andrzej Siewior
2020-02-25 14:50 ` Juri Lelli
2020-02-21 21:24 ` [PATCH RT 04/25] i2c: hix5hd2: Remove IRQF_ONESHOT zanussi
2020-02-21 21:24 ` [PATCH RT 05/25] i2c: exynos5: " zanussi
2020-02-21 21:24 ` zanussi [this message]
2020-02-21 21:24 ` [PATCH RT 07/25] sched: __set_cpus_allowed_ptr: Check cpus_mask, not cpus_ptr zanussi
2020-02-21 21:24 ` [PATCH RT 08/25] sched: Remove dead __migrate_disabled() check zanussi
2020-02-21 21:24 ` [PATCH RT 09/25] sched: migrate disable: Protect cpus_ptr with lock zanussi
2020-02-21 21:24 ` [PATCH RT 10/25] lib/smp_processor_id: Don't use cpumask_equal() zanussi
2020-02-21 21:24 ` [PATCH RT 11/25] futex: Make the futex_hash_bucket spinlock_t again and bring back its old state zanussi
2020-02-21 21:24 ` [PATCH RT 12/25] locking/rtmutex: Clean ->pi_blocked_on in the error case zanussi
2020-02-21 21:24 ` [PATCH RT 13/25] lib/ubsan: Don't seralize UBSAN report zanussi
2020-02-21 21:24 ` [PATCH RT 14/25] kmemleak: Change the lock of kmemleak_object to raw_spinlock_t zanussi
2020-02-21 21:24 ` [PATCH RT 15/25] sched: migrate_enable: Use select_fallback_rq() zanussi
2020-02-24 9:43 ` Sebastian Andrzej Siewior
2020-02-24 15:31 ` Tom Zanussi
2020-02-24 16:05 ` Sebastian Andrzej Siewior
2020-02-24 22:15 ` Scott Wood
2020-02-21 21:24 ` [PATCH RT 16/25] Revert "ARM: Initialize split page table locks for vector page" zanussi
2020-02-21 21:24 ` [PATCH RT 17/25] x86/fpu: Don't cache access to fpu_fpregs_owner_ctx zanussi
2020-02-24 8:55 ` Sebastian Andrzej Siewior
2020-02-24 15:12 ` Tom Zanussi
2020-02-21 21:24 ` [PATCH RT 18/25] locking: Make spinlock_t and rwlock_t a RCU section on RT zanussi
2020-02-21 21:24 ` [PATCH RT 19/25] userfaultfd: Use a seqlock instead of seqcount zanussi
2020-02-24 9:03 ` Sebastian Andrzej Siewior
2020-02-24 15:14 ` Tom Zanussi
2020-02-24 16:17 ` Steven Rostedt
2020-02-21 21:24 ` [PATCH RT 20/25] kmemleak: Cosmetic changes zanussi
2020-02-24 9:12 ` Sebastian Andrzej Siewior
2020-02-24 15:18 ` Tom Zanussi
2020-02-24 15:52 ` Sebastian Andrzej Siewior
2020-02-21 21:24 ` [PATCH RT 21/25] smp: Use smp_cond_func_t as type for the conditional function zanussi
2020-02-24 9:52 ` Sebastian Andrzej Siewior
2020-02-24 15:34 ` Tom Zanussi
2020-02-21 21:24 ` [PATCH RT 22/25] mm/memcontrol: Move misplaced local_unlock_irqrestore() zanussi
2020-02-24 9:55 ` Sebastian Andrzej Siewior
2020-02-21 21:24 ` [PATCH RT 23/25] locallock: Include header for the `current' macro zanussi
2020-02-21 21:24 ` [PATCH RT 24/25] sched: Provide migrate_disable/enable() inlines zanussi
2020-02-21 21:24 ` [PATCH RT 25/25] Linux 4.14.170-rt75-rc1 zanussi
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=882928ccb55265cc9fd76858057faac2c132b280.1582320278.git.zanussi@kernel.org \
--to=zanussi@kernel.org \
--cc=C.Emde@osadl.org \
--cc=bigeasy@linutronix.de \
--cc=jkacur@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=wagi@monom.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).