leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 4fa5cd5245.

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:

                                ht->park(td->cpu);

   ... 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 <xiaolong.ye@intel.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Con Kolivas <kernel@kolivas.org>
Cc: Alfred Chen <cchalpha@gmail.com>
Link: http://lkml.kernel.org/r/20160930015102.GB20189@yexl-desktop
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2016-10-04 09:55:57 +02:00
parent 597f03f9d1
commit be6a2e4c46
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/smpboot.c
View File

@ -122,12 +122,12 @@ static int smpboot_thread_fn(void *data)
if (kthread_should_park()) { if (kthread_should_park()) {
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
preempt_enable();
if (ht->park && td->status == HP_THREAD_ACTIVE) { if (ht->park && td->status == HP_THREAD_ACTIVE) {
BUG_ON(td->cpu != smp_processor_id()); BUG_ON(td->cpu != smp_processor_id());
ht->park(td->cpu); ht->park(td->cpu);
td->status = HP_THREAD_PARKED; td->status = HP_THREAD_PARKED;
} }
preempt_enable();
kthread_parkme(); kthread_parkme();
/* We might have been woken for stop */ /* We might have been woken for stop */
continue; continue;