kernel/cpu: fix cpu down problem if kthread's cpu is going down

If kthread is pinned to CPUx and CPUx is going down then we get into
trouble:
- first the unplug thread is created
- it will set itself to hp->unplug. As a result, every task that is
  going to take a lock, has to leave the CPU.
- the CPU_DOWN_PREPARE notifier are started. The worker thread will
  start a new process for the "high priority worker".
  Now kthread would like to take a lock but since it can't leave the CPU
  it will never complete its task.

We could fire the unplug thread after the notifier but then the cpu is
no longer marked "online" and the unplug thread will run on CPU0 which
was fixed before :)

So instead the unplug thread is started and kept waiting until the
notfier complete their work.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 47bc04dfe61ed7483eebf1f7d05e5e877253a948..c50fa47ba8fa2ba80494d463eca0ef16be76fc52 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -107,6 +107,7 @@ struct hotplug_pcp {
        int refcount;
        int grab_lock;
        struct completion synced;
+       struct completion unplug_wait;
 #ifdef CONFIG_PREEMPT_RT_FULL
        /*
         * Note, on PREEMPT_RT, the hotplug lock must save the state of
@@ -210,6 +211,7 @@ static int sync_unplug_thread(void *data)
 {
        struct hotplug_pcp *hp = data;
 
+       wait_for_completion(&hp->unplug_wait);
        preempt_disable();
        hp->unplug = current;
        wait_for_pinned_cpus(hp);
@@ -275,6 +277,14 @@ static void __cpu_unplug_sync(struct hotplug_pcp *hp)
        wait_for_completion(&hp->synced);
 }
 
+static void __cpu_unplug_wait(unsigned int cpu)
+{
+       struct hotplug_pcp *hp = &per_cpu(hotplug_pcp, cpu);
+
+       complete(&hp->unplug_wait);
+       wait_for_completion(&hp->synced);
+}
+
 /*
  * Start the sync_unplug_thread on the target cpu and wait for it to
  * complete.
@@ -298,6 +308,7 @@ static int cpu_unplug_begin(unsigned int cpu)
        tell_sched_cpu_down_begin(cpu);
 
        init_completion(&hp->synced);
+       init_completion(&hp->unplug_wait);
 
        hp->sync_tsk = kthread_create(sync_unplug_thread, hp, "sync_unplug/%d", cpu);
        if (IS_ERR(hp->sync_tsk)) {
@@ -313,8 +324,7 @@ static int cpu_unplug_begin(unsigned int cpu)
         * wait for tasks that are going to enter these sections and
         * we must not have them block.
         */
-       __cpu_unplug_sync(hp);
-
+       wake_up_process(hp->sync_tsk);
        return 0;
 }
 
@@ -679,6 +689,7 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
 #endif
        synchronize_rcu();
 
+       __cpu_unplug_wait(cpu);
        smpboot_park_threads(cpu);
 
        /* Notifiers are done. Don't let any more tasks pin this CPU. */