[lkml]   [2016]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[tip:sched/urgent] Revert "sched/core: Do not use smp_processor_id() with preempt enabled in smpboot_thread_fn()"
Commit-ID:  be6a2e4c46cc122ba9113ba569fbc50fad075fff
Author: Ingo Molnar <>
AuthorDate: Tue, 4 Oct 2016 09:55:57 +0200
Committer: Ingo Molnar <>
CommitDate: Tue, 4 Oct 2016 09:55:57 +0200

Revert "sched/core: Do not use smp_processor_id() with preempt enabled in smpboot_thread_fn()"

This reverts commit 4fa5cd5245b627db88c9ca08ae442373b02596b4.

The original change widens a preempt-off section, to avoid a seemingly unsafe
smp_processor_id() use.

During review I overlooked two facts:

- The code to calls a non-trivial function callback:


... which might (and does occasionally) sleep, triggering the warning.

- More importantly, as pointed out by Peter Zijlstra, using
smp_processor_id() in that context is safe, if it's done from
a kernel thread that is pinned to a single CPU - which is the
case here.

So revert to the original code that enables preemption sooner.

Reported-by: kernel test robot <>
Acked-by: Peter Zijlstra <>
Cc: Con Kolivas <>
Cc: Alfred Chen <>
Signed-off-by: Ingo Molnar <>
kernel/smpboot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/smpboot.c b/kernel/smpboot.c
index fc0d8270..13bc43d 100644
--- a/kernel/smpboot.c
+++ b/kernel/smpboot.c
@@ -122,12 +122,12 @@ static int smpboot_thread_fn(void *data)

if (kthread_should_park()) {
+ preempt_enable();
if (ht->park && td->status == HP_THREAD_ACTIVE) {
BUG_ON(td->cpu != smp_processor_id());
td->status = HP_THREAD_PARKED;
- preempt_enable();
/* We might have been woken for stop */
 \ /
  Last update: 2016-10-04 10:09    [W:2.708 / U:0.000 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site