summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCon Kolivas <kernel@kolivas.org>2016-09-13 02:27:05 -0400
committerIngo Molnar <mingo@kernel.org>2016-09-22 06:28:00 -0400
commit4fa5cd5245b627db88c9ca08ae442373b02596b4 (patch)
treeaecd2b67c67aa25caf9b3691e50cd7bac91900dc
parentd59dc7bcfa649ef2128a76b6487b16f4b3f14d23 (diff)
sched/core: Do not use smp_processor_id() with preempt enabled in smpboot_thread_fn()
We should not be using smp_processor_id() with preempt enabled. Bug identified and fix provided by Alfred Chen. Reported-by: Alfred Chen <cchalpha@gmail.com> Signed-off-by: Con Kolivas <kernel@kolivas.org> Cc: Alfred Chen <cchalpha@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/2042051.3vvUWIM0vs@hex Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--kernel/smpboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/smpboot.c b/kernel/smpboot.c
index 13bc43d1fb22..fc0d8270f69e 100644
--- a/kernel/smpboot.c
+++ b/kernel/smpboot.c
@@ -122,12 +122,12 @@ static int smpboot_thread_fn(void *data)
122 122
123 if (kthread_should_park()) { 123 if (kthread_should_park()) {
124 __set_current_state(TASK_RUNNING); 124 __set_current_state(TASK_RUNNING);
125 preempt_enable();
126 if (ht->park && td->status == HP_THREAD_ACTIVE) { 125 if (ht->park && td->status == HP_THREAD_ACTIVE) {
127 BUG_ON(td->cpu != smp_processor_id()); 126 BUG_ON(td->cpu != smp_processor_id());
128 ht->park(td->cpu); 127 ht->park(td->cpu);
129 td->status = HP_THREAD_PARKED; 128 td->status = HP_THREAD_PARKED;
130 } 129 }
130 preempt_enable();
131 kthread_parkme(); 131 kthread_parkme();
132 /* We might have been woken for stop */ 132 /* We might have been woken for stop */
133 continue; 133 continue;