x86, topology: Debug CPU0 hotplug

CONFIG_DEBUG_HOTPLUG_CPU0 is for debugging the CPU0 hotplug feature. The switch
offlines CPU0 as soon as possible and boots userspace up with CPU0 offlined.
User can online CPU0 back after boot time. The default value of the switch is
off.

To debug CPU0 hotplug, you need to enable CPU0 offline/online feature by either
turning on CONFIG_BOOTPARAM_HOTPLUG_CPU0 during compilation or giving
cpu0_hotplug kernel parameter at boot.

It's safe and early place to take down CPU0 after all hotplug notifiers
are installed and SMP is booted.

Please note that some applications or drivers, e.g. some versions of udevd,
during boot time may put CPU0 online again in this CPU0 hotplug debug mode.

In this debug mode, setup_local_APIC() may report a warning on max_loops<=0
when CPU0 is onlined back after boot time. This is because pending interrupt in
IRR can not move to ISR. The warning is not CPU0 specfic and it can happen on
other CPUs as well. It is harmless except the first CPU0 online takes a bit
longer time. And so this debug mode is useful to expose this issue. I'll send
a seperate patch to fix this generic warning issue.

Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
Link: http://lkml.kernel.org/r/1352835171-3958-15-git-send-email-fenghua.yu@intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 036e89ab470c465f180aefc8f3cf104b0cf2a43f..b6cfa5f62529a63ed8703c3698af983140fc5df5 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1727,6 +1727,21 @@ config BOOTPARAM_HOTPLUG_CPU0
          You still can enable the CPU0 hotplug feature at boot by kernel
          parameter cpu0_hotplug.
 
+config DEBUG_HOTPLUG_CPU0
+       def_bool n
+       prompt "Debug CPU0 hotplug"
+       depends on HOTPLUG_CPU && EXPERIMENTAL
+       ---help---
+         Enabling this option offlines CPU0 (if CPU0 can be offlined) as
+         soon as possible and boots up userspace with CPU0 offlined. User
+         can online CPU0 back after boot time.
+
+         To debug CPU0 hotplug, you need to enable CPU0 offline/online
+         feature by either turning on CONFIG_BOOTPARAM_HOTPLUG_CPU0 during
+         compilation or giving cpu0_hotplug kernel parameter at boot.
+
+         If unsure, say N.
+
 config COMPAT_VDSO
        def_bool y
        prompt "Compat VDSO support"

diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h
index a1195726e8c2fca466ee05716aaf6ba583d18976..5f9a1243190e8456aaa48f7b77cfa776e08ea7b8 100644 (file)
--- a/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
@@ -29,6 +29,9 @@ struct x86_cpu {
 extern int arch_register_cpu(int num);
 extern void arch_unregister_cpu(int);
 extern void __cpuinit start_cpu0(void);
+#ifdef CONFIG_DEBUG_HOTPLUG_CPU0
+extern int _debug_hotplug_cpu(int cpu, int action);
+#endif
 #endif
 
 DECLARE_PER_CPU(int, cpu_state);

diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c
index 0e7b4a7a7fb8b2f2766d1e050d718bb5da1ea195..6e60b5fe224481d01ca8662c6edd01432da08518 100644 (file)
--- a/arch/x86/kernel/topology.c
+++ b/arch/x86/kernel/topology.c
@@ -50,6 +50,57 @@ static int __init enable_cpu0_hotplug(char *str)
 __setup("cpu0_hotplug", enable_cpu0_hotplug);
 #endif
 
+#ifdef CONFIG_DEBUG_HOTPLUG_CPU0
+/*
+ * This function offlines a CPU as early as possible and allows userspace to
+ * boot up without the CPU. The CPU can be onlined back by user after boot.
+ *
+ * This is only called for debugging CPU offline/online feature.
+ */
+int __ref _debug_hotplug_cpu(int cpu, int action)
+{
+       struct device *dev = get_cpu_device(cpu);
+       int ret;
+
+       if (!cpu_is_hotpluggable(cpu))
+               return -EINVAL;
+
+       cpu_hotplug_driver_lock();
+
+       switch (action) {
+       case 0:
+               ret = cpu_down(cpu);
+               if (!ret) {
+                       pr_info("CPU %u is now offline\n", cpu);
+                       kobject_uevent(&dev->kobj, KOBJ_OFFLINE);
+               } else
+                       pr_debug("Can't offline CPU%d.\n", cpu);
+               break;
+       case 1:
+               ret = cpu_up(cpu);
+               if (!ret)
+                       kobject_uevent(&dev->kobj, KOBJ_ONLINE);
+               else
+                       pr_debug("Can't online CPU%d.\n", cpu);
+               break;
+       default:
+               ret = -EINVAL;
+       }
+
+       cpu_hotplug_driver_unlock();
+
+       return ret;
+}
+
+static int __init debug_hotplug_cpu(void)
+{
+       _debug_hotplug_cpu(0, 0);
+       return 0;
+}
+
+late_initcall_sync(debug_hotplug_cpu);
+#endif /* CONFIG_DEBUG_HOTPLUG_CPU0 */
+
 int __ref arch_register_cpu(int num)
 {
        struct cpuinfo_x86 *c = &cpu_data(num);

diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
index adde77588e25aa4ff6c1cd4ba9762db41130d238..120cee1c3f8d6ab8d3873c537d063e3d45553778 100644 (file)
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -21,6 +21,7 @@
 #include <asm/suspend.h>
 #include <asm/debugreg.h>
 #include <asm/fpu-internal.h> /* pcntxt_mask */
+#include <asm/cpu.h>
 
 #ifdef CONFIG_X86_32
 static struct saved_context saved_context;
@@ -263,6 +264,43 @@ static int bsp_pm_callback(struct notifier_block *nb, unsigned long action,
        case PM_HIBERNATION_PREPARE:
                ret = bsp_check();
                break;
+#ifdef CONFIG_DEBUG_HOTPLUG_CPU0
+       case PM_RESTORE_PREPARE:
+               /*
+                * When system resumes from hibernation, online CPU0 because
+                * 1. it's required for resume and
+                * 2. the CPU was online before hibernation
+                */
+               if (!cpu_online(0))
+                       _debug_hotplug_cpu(0, 1);
+               break;
+       case PM_POST_RESTORE:
+               /*
+                * When a resume really happens, this code won't be called.
+                *
+                * This code is called only when user space hibernation software
+                * prepares for snapshot device during boot time. So we just
+                * call _debug_hotplug_cpu() to restore to CPU0's state prior to
+                * preparing the snapshot device.
+                *
+                * This works for normal boot case in our CPU0 hotplug debug
+                * mode, i.e. CPU0 is offline and user mode hibernation
+                * software initializes during boot time.
+                *
+                * If CPU0 is online and user application accesses snapshot
+                * device after boot time, this will offline CPU0 and user may
+                * see different CPU0 state before and after accessing
+                * the snapshot device. But hopefully this is not a case when
+                * user debugging CPU0 hotplug. Even if users hit this case,
+                * they can easily online CPU0 back.
+                *
+                * To simplify this debug code, we only consider normal boot
+                * case. Otherwise we need to remember CPU0's state and restore
+                * to that state and resolve racy conditions etc.
+                */
+               _debug_hotplug_cpu(0, 0);
+               break;
+#endif
        default:
                break;
        }