Skip to contentSkip to conversation

microcode: do not WARN_ON(cpu != 0) during resume

PATCH In review Ian Campbell 3 participants 5 messages Dec 17, 2009 – Feb 4, 2011 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 microcode: do not WARN_ON(cpu != 0) during resume

871b72dd "x86: microcode: use smp_call_function_single instead of set_cpus_allowed, cleanup of synchronization logic" included:

static int mc_sysdev_resume(struct sys_device *dev) {
[...]
+ /*

+        * All non-bootup cpus are still disabled,
+        * so only CPU 0 will apply ucode here.
+        *
+        * Moreover, there can be no concurrent
+        * updates from any other places at this point.
+        */

+ WARN_ON(cpu != 0);

However suspend/resume under Xen doesn't need to hot unplug all the CPUs, so we don't; the hypervisor can manage the context save/restore for all CPUs.

It would be unnecessary to load microcode.ko in a Xen domU but if it does occur (e.g. because a distro installs the tools by default) we would like to avoid the warning on resume.

Since the real constraint here is that we are running on the CPU for which we would like to load microcode (which in all practical circumstances is CPU0) just check for that and return if we are resuming a different CPU.

There is no danger of concurrent updates, even if we ignore the fact that all but one CPUs are unplugged on native, because sysdev_resume() is single threaded.

Cc Jeremy Fitzhardinge <[email protected]>
Cc Dmitry Adamushko <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Ingo Molnar <[email protected]>
---
 arch/x86/kernel/microcode_core.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)
arch/x86/kernel/microcode_core.c +1 -10
index 378e9a8..1153062 100644
@@ -438,18 +438,9 @@ static int mc_sysdev_resume(struct sys_device *dev)
 	int cpu = dev->id;
 	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
 
-	if (!cpu_online(cpu))
+	if (cpu != smp_processor_id())
 		return 0;
 
-	/*
-	 * All non-bootup cpus are still disabled,
-	 * so only CPU 0 will apply ucode here.
-	 *
-	 * Moreover, there can be no concurrent
-	 * updates from any other places at this point.
-	 */
-	WARN_ON(cpu != 0);
-
 	if (uci->valid && uci->mc)
 		microcode_ops->apply_microcode(cpu);
 
Signature · 1 line
1.5.6.5
#1 lore raw
Quoted 15 lines · Ian Campbell

871b72dd "x86: microcode: use smp_call_function_single instead of set_cpus_allowed, cleanup of synchronization logic" included:

static int mc_sysdev_resume(struct sys_device *dev) {
[...]

(quoted diff) +8 -0
+       /*
+        * All non-bootup cpus are still disabled,
+        * so only CPU 0 will apply ucode here.
+        *
+        * Moreover, there can be no concurrent
+        * updates from any other places at this point.
+        */
+       WARN_ON(cpu != 0);
Quoted 3 lines

However suspend/resume under Xen doesn't need to hot unplug all the CPUs, so we don't; the hypervisor can manage the context save/restore for all CPUs.

Did you see a problem with this in practice, or just by inspection?

The Xen microcode driver will only load in a privileged domain, so I don't think this path can ever be exercised.

Regardless, the Xen microcode driver changes aren't upstream yet, so there's no need to apply this there yet.

Thanks,
J

Quoted 46 lines

It would be unnecessary to load microcode.ko in a Xen domU but if it does occur (e.g. because a distro installs the tools by default) we would like to avoid the warning on resume.

Since the real constraint here is that we are running on the CPU for which we would like to load microcode (which in all practical circumstances is CPU0) just check for that and return if we are resuming a different CPU.

There is no danger of concurrent updates, even if we ignore the fact that all but one CPUs are unplugged on native, because sysdev_resume() is single threaded.

Cc Jeremy Fitzhardinge<[email protected]>
Cc Dmitry Adamushko<[email protected]>
Cc Hugh Dickins<[email protected]>
Cc Ingo Molnar<[email protected]>
---
  arch/x86/kernel/microcode_core.c |   11 +----------
  1 files changed, 1 insertions(+), 10 deletions(-)
arch/x86/kernel/microcode_core.c +1 -10
index 378e9a8..1153062 100644
@@ -438,18 +438,9 @@ static int mc_sysdev_resume(struct sys_device *dev)
  	int cpu = dev->id;
  	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
 
-	if (!cpu_online(cpu))
+	if (cpu != smp_processor_id())
  		return 0;
 
-	/*
-	 * All non-bootup cpus are still disabled,
-	 * so only CPU 0 will apply ucode here.
-	 *
-	 * Moreover, there can be no concurrent
-	 * updates from any other places at this point.
-	 */
-	WARN_ON(cpu != 0);
-
  	if (uci->valid&&  uci->mc)
  		microcode_ops->apply_microcode(cpu);
 
#2 lore raw
Quoted 16 lines · Jeremy Fitzhardinge
Quoted 15 lines · Ian Campbell

871b72dd "x86: microcode: use smp_call_function_single instead of set_cpus_allowed, cleanup of synchronization logic" included:

static int mc_sysdev_resume(struct sys_device *dev) {
[...]

(quoted diff) +8 -0
+       /*
+        * All non-bootup cpus are still disabled,
+        * so only CPU 0 will apply ucode here.
+        *
+        * Moreover, there can be no concurrent
+        * updates from any other places at this point.
+        */
+       WARN_ON(cpu != 0);
Quoted 5 lines
Quoted 3 lines

However suspend/resume under Xen doesn't need to hot unplug all the CPUs, so we don't; the hypervisor can manage the context save/restore for all CPUs.

Did you see a problem with this in practice, or just by inspection?

In practice.

Quoted 2 lines

The Xen microcode driver will only load in a privileged domain, so I don't think this path can ever be exercised.

This was on bare v2.6.32 + your bugfixes branch, there was no domain 0 support or Xen microcode driver.

The regular native microcode driver can load in a domU and generally silently does the right thing (i.e. nothing) apart from this issue. Distro initscripts will tend to try and load the native driver and they are very unlikely to special case Xen domU to avoid it.

Quoted 2 lines

Regardless, the Xen microcode driver changes aren't upstream yet, so there's no need to apply this there yet.

This issue is in the generic microcode code so it is also needed now. I guess once the Xen microcode driver is upstreamed it will fix domU by suppressing the driver from loading at all except in dom0.

Ian.

Quoted 51 lines

Thanks,
J

Quoted 46 lines

It would be unnecessary to load microcode.ko in a Xen domU but if it does occur (e.g. because a distro installs the tools by default) we would like to avoid the warning on resume.

Since the real constraint here is that we are running on the CPU for which we would like to load microcode (which in all practical circumstances is CPU0) just check for that and return if we are resuming a different CPU.

There is no danger of concurrent updates, even if we ignore the fact that all but one CPUs are unplugged on native, because sysdev_resume() is single threaded.

Cc Jeremy Fitzhardinge<[email protected]>
Cc Dmitry Adamushko<[email protected]>
Cc Hugh Dickins<[email protected]>
Cc Ingo Molnar<[email protected]>
---
  arch/x86/kernel/microcode_core.c |   11 +----------
  1 files changed, 1 insertions(+), 10 deletions(-)
arch/x86/kernel/microcode_core.c +1 -10
index 378e9a8..1153062 100644
@@ -438,18 +438,9 @@ static int mc_sysdev_resume(struct sys_device *dev)
  	int cpu = dev->id;
  	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
 
-	if (!cpu_online(cpu))
+	if (cpu != smp_processor_id())
  		return 0;
 
-	/*
-	 * All non-bootup cpus are still disabled,
-	 * so only CPU 0 will apply ucode here.
-	 *
-	 * Moreover, there can be no concurrent
-	 * updates from any other places at this point.
-	 */
-	WARN_ON(cpu != 0);
-
  	if (uci->valid&&  uci->mc)
  		microcode_ops->apply_microcode(cpu);
 
#3 lore raw
Quoted 31 lines · Ian Campbell
Quoted 17 lines · Jeremy Fitzhardinge
Quoted 15 lines · Ian Campbell

871b72dd "x86: microcode: use smp_call_function_single instead of set_cpus_allowed, cleanup of synchronization logic" included:

static int mc_sysdev_resume(struct sys_device *dev) {
[...]

(quoted diff) +8 -0
+       /*
+        * All non-bootup cpus are still disabled,
+        * so only CPU 0 will apply ucode here.
+        *
+        * Moreover, there can be no concurrent
+        * updates from any other places at this point.
+        */
+       WARN_ON(cpu != 0);
Quoted 6 lines
Quoted 4 lines

However suspend/resume under Xen doesn't need to hot unplug all the CPUs, so we don't; the hypervisor can manage the context save/restore for all CPUs.

Did you see a problem with this in practice, or just by inspection?

In practice.

Quoted 3 lines

The Xen microcode driver will only load in a privileged domain, so I don't think this path can ever be exercised.

Quoted 8 lines

This was on bare v2.6.32 + your bugfixes branch, there was no domain 0 support or Xen microcode driver.

The regular native microcode driver can load in a domU and generally silently does the right thing (i.e. nothing) apart from this issue. Distro initscripts will tend to try and load the native driver and they are very unlikely to special case Xen domU to avoid it.

OK, I see. The patch looks reasonable to me then.

Alternatively we could try to prevent the native microcode drivers from loading in the Xen case, but since the code just checks the CPU vendor it doesn't give us much to work with aside from adding an explicit Xen test. Making the resume code more robust seems like the better option.

J

Quoted 65 lines
Quoted 4 lines

Regardless, the Xen microcode driver changes aren't upstream yet, so there's no need to apply this there yet.

This issue is in the generic microcode code so it is also needed now. I guess once the Xen microcode driver is upstreamed it will fix domU by suppressing the driver from loading at all except in dom0.

Ian.

Quoted 52 lines

Thanks,
J

Quoted 47 lines

It would be unnecessary to load microcode.ko in a Xen domU but if it does occur (e.g. because a distro installs the tools by default) we would like to avoid the warning on resume.

Since the real constraint here is that we are running on the CPU for which we would like to load microcode (which in all practical circumstances is CPU0) just check for that and return if we are resuming a different CPU.

There is no danger of concurrent updates, even if we ignore the fact that all but one CPUs are unplugged on native, because sysdev_resume() is single threaded.

Cc Jeremy Fitzhardinge<[email protected]>
Cc Dmitry Adamushko<[email protected]>
Cc Hugh Dickins<[email protected]>
Cc Ingo Molnar<[email protected]>
---
   arch/x86/kernel/microcode_core.c |   11 +----------
   1 files changed, 1 insertions(+), 10 deletions(-)
arch/x86/kernel/microcode_core.c +1 -10
index 378e9a8..1153062 100644
@@ -438,18 +438,9 @@ static int mc_sysdev_resume(struct sys_device *dev)
   	int cpu = dev->id;
   	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
 
-	if (!cpu_online(cpu))
+	if (cpu != smp_processor_id())
   		return 0;
 
-	/*
-	 * All non-bootup cpus are still disabled,
-	 * so only CPU 0 will apply ucode here.
-	 *
-	 * Moreover, there can be no concurrent
-	 * updates from any other places at this point.
-	 */
-	WARN_ON(cpu != 0);
-
   	if (uci->valid&&   uci->mc)
   		microcode_ops->apply_microcode(cpu);
 
Acked-by on v1 1/1
#4 lore raw
In reply to Ian Campbell

Andrew,

may we have this patch in -mm? It has an ack from Jeremy as well.

thanks,
Anton.

Quoted 30 lines · Ian Campbell

871b72dd "x86: microcode: use smp_call_function_single instead of set_cpus_allowed, cleanup of synchronization logic" included:

static int mc_sysdev_resume(struct sys_device *dev) {
[...]

(quoted diff) +8 -0
+       /*
+        * All non-bootup cpus are still disabled,
+        * so only CPU 0 will apply ucode here.
+        *
+        * Moreover, there can be no concurrent
+        * updates from any other places at this point.
+        */
+       WARN_ON(cpu != 0);

However suspend/resume under Xen doesn't need to hot unplug all the CPUs, so we don't; the hypervisor can manage the context save/restore for all CPUs.

It would be unnecessary to load microcode.ko in a Xen domU but if it does occur (e.g. because a distro installs the tools by default) we would like to avoid the warning on resume.

Since the real constraint here is that we are running on the CPU for which we would like to load microcode (which in all practical circumstances is CPU0) just check for that and return if we are resuming a different CPU.

There is no danger of concurrent updates, even if we ignore the fact that all but one CPUs are unplugged on native, because sysdev_resume() is single threaded.

Quoted 5 lines
Cc Jeremy Fitzhardinge <[email protected]>
Cc Dmitry Adamushko <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Ingo Molnar <[email protected]>
Quoted 38 lines
---
 arch/x86/kernel/microcode_core.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)
arch/x86/kernel/microcode_core.c +1 -10
index 378e9a8..1153062 100644
@@ -438,18 +438,9 @@ static int mc_sysdev_resume(struct sys_device *dev)
 	int cpu = dev->id;
 	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
 
-	if (!cpu_online(cpu))
+	if (cpu != smp_processor_id())
 		return 0;
 
-	/*
-	 * All non-bootup cpus are still disabled,
-	 * so only CPU 0 will apply ucode here.
-	 *
-	 * Moreover, there can be no concurrent
-	 * updates from any other places at this point.
-	 */
-	WARN_ON(cpu != 0);
-
 	if (uci->valid && uci->mc)
 		microcode_ops->apply_microcode(cpu);
 
Signature · 7 lines
1.5.6.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Signature · 1 line
Anton