Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1374192

[PATCH v2] cpu/hotplug: fix rollback during error-out in __cpu_disable()

Show all headers | View raw

If we error out in __cpu_disable() (via takedown_cpu() which is
currently the last one that can fail) we don't rollback entirely to
CPUHP_ONLINE (where we started) but to CPUHP_AP_ONLINE_IDLE. This
happens because the former states were on the target CPU (the AP states)
and during the rollback we go back until the first BP state we started.
The next cpu_down attempt (on the same failed CPU) will take forever
because the cpuhp thread is still down (same goes for smpboot threads).

The fix this I rollback to where we started in _cpu_down(). For this I
add a ->rollback flag so we can invoke the states on the target CPU via
undo_cpu_down() (otherwise cpuhp_ap_online() rollback to
CPUHP_AP_ONLINE_IDLE in case of an error).

notify_online() has been marked as ->skip_onerr because otherwise we
will see the CPU_ONLINE notifier in addition to the CPU_DOWN_FAILED.
However with ->skip_onerr we neither see CPU_ONLINE nor CPU_DOWN_FAILED
if something in between (CPU_DOWN_FAILED … CPUHP_TEARDOWN_CPU).
Currently there is nothing.

This regression got probably introduce in the rework while we introduced
the hotplug thread to offload the work to the target CPU.

Fixes: 4cb28ced23c4 ("cpu/hotplug: Create hotplug threads")
Reported-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
v1…v2: replace the workqueue with cpuhp thread

CPU_DOWN_FAILED is still invoked on the "wrong" CPU, this is still just
about fixing the regression.

 kernel/cpu.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 6ea42e8da861..6433b9639946 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -36,6 +36,7 @@
  * @target:	The target state
  * @thread:	Pointer to the hotplug thread
  * @should_run:	Thread should execute
+ * @rollback:	Perform a rollback
  * @cb_stat:	The state for a single callback (install/uninstall)
  * @cb:		Single callback function (install/uninstall)
  * @result:	Result of the operation
@@ -47,6 +48,7 @@ struct cpuhp_cpu_state {
 #ifdef CONFIG_SMP
 	struct task_struct	*thread;
 	bool			should_run;
+	bool			rollback;
 	enum cpuhp_state	cb_state;
 	int			(*cb)(unsigned int cpu);
 	int			result;
@@ -477,6 +479,11 @@ static void cpuhp_thread_fun(unsigned int cpu)
 		} else {
 			ret = cpuhp_invoke_callback(cpu, st->cb_state, st->cb);
 		}
+	} else if (st->rollback) {
+		BUG_ON(st->state < CPUHP_AP_ONLINE_IDLE);
+
+		undo_cpu_down(cpu, st, cpuhp_ap_states);
+		st->rollback = false;
 	} else {
 		/* Cannot happen .... */
 		BUG_ON(st->state < CPUHP_AP_ONLINE_IDLE);
@@ -724,6 +731,8 @@ static int takedown_cpu(unsigned int cpu)
 		/* CPU didn't die: tell everyone.  Can't complain. */
 		cpu_notify_nofail(CPU_DOWN_FAILED, cpu);
 		irq_unlock_sparse();
+		kthread_unpark(per_cpu_ptr(&cpuhp_state, cpu)->thread);
+		/* smpboot threads are up via CPUHP_AP_SMPBOOT_THREADS */
 		return err;
 	}
 	BUG_ON(cpu_online(cpu));
@@ -832,6 +841,12 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
 	 * to do the further cleanups.
 	 */
 	ret = cpuhp_down_callbacks(cpu, st, cpuhp_bp_states, target);
+	if (ret && st->state > CPUHP_TEARDOWN_CPU && st->state < prev_state) {
+
+		st->target = prev_state;
+		st->rollback = true;
+		cpuhp_kick_ap_work(cpu);
+	}
 
 	hasdied = prev_state != st->state && st->state == CPUHP_OFFLINE;
 out:
@@ -1249,6 +1264,7 @@ static struct cpuhp_step cpuhp_ap_states[] = {
 		.name			= "notify:online",
 		.startup		= notify_online,
 		.teardown		= notify_down_prepare,
+		.skip_onerr		= true,
 	},
 #endif
 	/*
-- 
2.8.0.rc3

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] s390/cpum_sf: Remove superfluous SMP function call Anna-Maria Gleixner <anna-maria@linutronix.de> - 2016-04-04 12:30 +0200
  Re: [PATCH] s390/cpum_sf: Remove superfluous SMP function call Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-04-05 12:50 +0200
    Re: [PREEMPT-RT] [PATCH] s390/cpum_sf: Remove superfluous SMP  function call Sebastian Andrzej Siewior <sebastian.siewior@linutronix.de> - 2016-04-05 13:20 +0200
      Re: [PREEMPT-RT] [PATCH] s390/cpum_sf: Remove superfluous SMP  function call Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-04-05 13:30 +0200
        Re: [PREEMPT-RT] [PATCH] s390/cpum_sf: Remove superfluous SMP  function call Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-04-05 13:40 +0200
          Re: [PREEMPT-RT] [PATCH] s390/cpum_sf: Remove superfluous SMP  function call Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-04-05 14:00 +0200
          Re: [PREEMPT-RT] [PATCH] s390/cpum_sf: Remove superfluous SMP  function call rcochran@linutronix.de - 2016-04-05 14:00 +0200
            Re: [PREEMPT-RT] [PATCH] s390/cpum_sf: Remove superfluous SMP  function call Sebastian Andrzej Siewior <sebastian.siewior@linutronix.de> - 2016-04-05 14:00 +0200
              Re: [PREEMPT-RT] [PATCH] s390/cpum_sf: Remove superfluous SMP  function call Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-04-05 14:20 +0200
                Re: [PATCH] s390/cpum_sf: Remove superfluous SMP function call Sebastian Andrzej Siewior <bigeasy@linutronix.de> - 2016-04-05 14:20 +0200
                [PATCH] cpu/hotplug: fix rollback during error-out in __cpu_disable() Sebastian Andrzej Siewior <bigeasy@linutronix.de> - 2016-04-05 18:00 +0200
                Re: [PATCH] cpu/hotplug: fix rollback during error-out in  __cpu_disable() Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-04-06 22:00 +0200
                Re: [PATCH] cpu/hotplug: fix rollback during error-out in  __cpu_disable() Sebastian Andrzej Siewior <bigeasy@linutronix.de> - 2016-04-07 17:20 +0200
                Re: [PATCH] cpu/hotplug: fix rollback during error-out in  __cpu_disable() Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-04-08 08:30 +0200
                [PATCH v2] cpu/hotplug: fix rollback during error-out in  __cpu_disable() Sebastian Andrzej Siewior <bigeasy@linutronix.de> - 2016-04-08 14:50 +0200

csiph-web