[kernel] r19168 - in dists/sid/linux/debian/patches: . features/all/cpu-devices
Ben Hutchings
benh at alioth.debian.org
Tue Jun 19 03:24:16 UTC 2012
Author: benh
Date: Tue Jun 19 03:24:14 2012
New Revision: 19168
Log:
[x86] mce fixes for hotplug/suspend/resume after conversion to normal devices
Added:
dists/sid/linux/debian/patches/features/all/cpu-devices/mce-fix-warning-messages-about-static-struct-mce_dev.patch
dists/sid/linux/debian/patches/features/all/cpu-devices/x86-mce-Convert-static-array-of-pointers-to-per-cpu-.patch
dists/sid/linux/debian/patches/features/all/cpu-devices/x86-mce-Fix-CPU-hotplug-and-suspend-regression-relat.patch
Modified:
dists/sid/linux/debian/patches/series
Added: dists/sid/linux/debian/patches/features/all/cpu-devices/mce-fix-warning-messages-about-static-struct-mce_dev.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux/debian/patches/features/all/cpu-devices/mce-fix-warning-messages-about-static-struct-mce_dev.patch Tue Jun 19 03:24:14 2012 (r19168)
@@ -0,0 +1,180 @@
+From: Greg Kroah-Hartman <gregkh at suse.de>
+Date: Mon, 16 Jan 2012 14:40:28 -0800
+Subject: mce: fix warning messages about static struct mce_device
+
+commit e032d80774315869aa2285b217fdbbfed86c0b49 upstream.
+
+When suspending, there was a large list of warnings going something like:
+
+ Device 'machinecheck1' does not have a release() function, it is broken and must be fixed
+
+This patch turns the static mce_devices into dynamically allocated, and
+properly frees them when they are removed from the system. It solves
+the warning messages on my laptop here.
+
+Reported-by: "Srivatsa S. Bhat" <srivatsa.bhat at linux.vnet.ibm.com>
+Reported-by: Linus Torvalds <torvalds at linux-foundation.org>
+Tested-by: Djalal Harouni <tixxdz at opendz.org>
+Cc: Kay Sievers <kay.sievers at vrfy.org>
+Cc: Tony Luck <tony.luck at intel.com>
+Cc: Borislav Petkov <bp at amd64.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ arch/x86/include/asm/mce.h | 2 +-
+ arch/x86/kernel/cpu/mcheck/mce.c | 18 ++++++++++++++----
+ arch/x86/kernel/cpu/mcheck/mce_amd.c | 18 +++++++++++-------
+ 3 files changed, 26 insertions(+), 12 deletions(-)
+
+diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
+index f35ce43..6aefb14 100644
+--- a/arch/x86/include/asm/mce.h
++++ b/arch/x86/include/asm/mce.h
+@@ -151,7 +151,7 @@ static inline void enable_p5_mce(void) {}
+
+ void mce_setup(struct mce *m);
+ void mce_log(struct mce *m);
+-DECLARE_PER_CPU(struct device, mce_device);
++extern struct device *mce_device[CONFIG_NR_CPUS];
+
+ /*
+ * Maximum banks number.
+diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
+index 29ba329..5a11ae2 100644
+--- a/arch/x86/kernel/cpu/mcheck/mce.c
++++ b/arch/x86/kernel/cpu/mcheck/mce.c
+@@ -1859,7 +1859,7 @@ static struct bus_type mce_subsys = {
+ .dev_name = "machinecheck",
+ };
+
+-DEFINE_PER_CPU(struct device, mce_device);
++struct device *mce_device[CONFIG_NR_CPUS];
+
+ __cpuinitdata
+ void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu);
+@@ -2001,19 +2001,27 @@ static struct device_attribute *mce_device_attrs[] = {
+
+ static cpumask_var_t mce_device_initialized;
+
++static void mce_device_release(struct device *dev)
++{
++ kfree(dev);
++}
++
+ /* Per cpu device init. All of the cpus still share the same ctrl bank: */
+ static __cpuinit int mce_device_create(unsigned int cpu)
+ {
+- struct device *dev = &per_cpu(mce_device, cpu);
++ struct device *dev;
+ int err;
+ int i, j;
+
+ if (!mce_available(&boot_cpu_data))
+ return -EIO;
+
+- memset(dev, 0, sizeof(struct device));
++ dev = kzalloc(sizeof *dev, GFP_KERNEL);
++ if (!dev)
++ return -ENOMEM;
+ dev->id = cpu;
+ dev->bus = &mce_subsys;
++ dev->release = &mce_device_release;
+
+ err = device_register(dev);
+ if (err)
+@@ -2030,6 +2038,7 @@ static __cpuinit int mce_device_create(unsigned int cpu)
+ goto error2;
+ }
+ cpumask_set_cpu(cpu, mce_device_initialized);
++ mce_device[cpu] = dev;
+
+ return 0;
+ error2:
+@@ -2046,7 +2055,7 @@ error:
+
+ static __cpuinit void mce_device_remove(unsigned int cpu)
+ {
+- struct device *dev = &per_cpu(mce_device, cpu);
++ struct device *dev = mce_device[cpu];
+ int i;
+
+ if (!cpumask_test_cpu(cpu, mce_device_initialized))
+@@ -2060,6 +2069,7 @@ static __cpuinit void mce_device_remove(unsigned int cpu)
+
+ device_unregister(dev);
+ cpumask_clear_cpu(cpu, mce_device_initialized);
++ mce_device[cpu] = NULL;
+ }
+
+ /* Make sure there are no machine checks on offlined CPUs. */
+diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
+index ba0b94a..786e76a 100644
+--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
++++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
+@@ -523,6 +523,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
+ {
+ int i, err = 0;
+ struct threshold_bank *b = NULL;
++ struct device *dev = mce_device[cpu];
+ char name[32];
+
+ sprintf(name, "threshold_bank%i", bank);
+@@ -543,8 +544,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
+ if (!b)
+ goto out;
+
+- err = sysfs_create_link(&per_cpu(mce_device, cpu).kobj,
+- b->kobj, name);
++ err = sysfs_create_link(&dev->kobj, b->kobj, name);
+ if (err)
+ goto out;
+
+@@ -565,7 +565,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
+ goto out;
+ }
+
+- b->kobj = kobject_create_and_add(name, &per_cpu(mce_device, cpu).kobj);
++ b->kobj = kobject_create_and_add(name, &dev->kobj);
+ if (!b->kobj)
+ goto out_free;
+
+@@ -585,8 +585,9 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
+ if (i == cpu)
+ continue;
+
+- err = sysfs_create_link(&per_cpu(mce_device, i).kobj,
+- b->kobj, name);
++ dev = mce_device[i];
++ if (dev)
++ err = sysfs_create_link(&dev->kobj,b->kobj, name);
+ if (err)
+ goto out;
+
+@@ -649,6 +650,7 @@ static void deallocate_threshold_block(unsigned int cpu,
+ static void threshold_remove_bank(unsigned int cpu, int bank)
+ {
+ struct threshold_bank *b;
++ struct device *dev;
+ char name[32];
+ int i = 0;
+
+@@ -663,7 +665,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank)
+ #ifdef CONFIG_SMP
+ /* sibling symlink */
+ if (shared_bank[bank] && b->blocks->cpu != cpu) {
+- sysfs_remove_link(&per_cpu(mce_device, cpu).kobj, name);
++ sysfs_remove_link(&mce_device[cpu]->kobj, name);
+ per_cpu(threshold_banks, cpu)[bank] = NULL;
+
+ return;
+@@ -675,7 +677,9 @@ static void threshold_remove_bank(unsigned int cpu, int bank)
+ if (i == cpu)
+ continue;
+
+- sysfs_remove_link(&per_cpu(mce_device, i).kobj, name);
++ dev = mce_device[i];
++ if (dev)
++ sysfs_remove_link(&dev->kobj, name);
+ per_cpu(threshold_banks, i)[bank] = NULL;
+ }
+
Added: dists/sid/linux/debian/patches/features/all/cpu-devices/x86-mce-Convert-static-array-of-pointers-to-per-cpu-.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux/debian/patches/features/all/cpu-devices/x86-mce-Convert-static-array-of-pointers-to-per-cpu-.patch Tue Jun 19 03:24:14 2012 (r19168)
@@ -0,0 +1,117 @@
+From: Greg Kroah-Hartman <gregkh at suse.de>
+Date: Thu, 26 Jan 2012 15:49:14 -0800
+Subject: x86/mce: Convert static array of pointers to per-cpu variables
+
+commit d6126ef5f31ca54980cb067af659a360dfcca037 upstream.
+
+When I previously fixed up the mce_device code, I used a static array of
+the pointers. It was (rightfully) pointed out to me that I should be
+using the per_cpu code instead.
+
+This patch converts the code over to that structure, moving the variable
+back into the per_cpu area, like it used to be for 3.2 and earlier.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat at linux.vnet.ibm.com>
+Link: https://lkml.org/lkml/2012/1/27/165
+Signed-off-by: Tony Luck <tony.luck at intel.com>
+---
+ arch/x86/include/asm/mce.h | 2 +-
+ arch/x86/kernel/cpu/mcheck/mce.c | 8 ++++----
+ arch/x86/kernel/cpu/mcheck/mce_amd.c | 9 +++++----
+ 3 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
+index 6aefb14..441520e 100644
+--- a/arch/x86/include/asm/mce.h
++++ b/arch/x86/include/asm/mce.h
+@@ -151,7 +151,7 @@ static inline void enable_p5_mce(void) {}
+
+ void mce_setup(struct mce *m);
+ void mce_log(struct mce *m);
+-extern struct device *mce_device[CONFIG_NR_CPUS];
++DECLARE_PER_CPU(struct device *, mce_device);
+
+ /*
+ * Maximum banks number.
+diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
+index 5a11ae2..4979a5d 100644
+--- a/arch/x86/kernel/cpu/mcheck/mce.c
++++ b/arch/x86/kernel/cpu/mcheck/mce.c
+@@ -1859,7 +1859,7 @@ static struct bus_type mce_subsys = {
+ .dev_name = "machinecheck",
+ };
+
+-struct device *mce_device[CONFIG_NR_CPUS];
++DEFINE_PER_CPU(struct device *, mce_device);
+
+ __cpuinitdata
+ void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu);
+@@ -2038,7 +2038,7 @@ static __cpuinit int mce_device_create(unsigned int cpu)
+ goto error2;
+ }
+ cpumask_set_cpu(cpu, mce_device_initialized);
+- mce_device[cpu] = dev;
++ per_cpu(mce_device, cpu) = dev;
+
+ return 0;
+ error2:
+@@ -2055,7 +2055,7 @@ error:
+
+ static __cpuinit void mce_device_remove(unsigned int cpu)
+ {
+- struct device *dev = mce_device[cpu];
++ struct device *dev = per_cpu(mce_device, cpu);
+ int i;
+
+ if (!cpumask_test_cpu(cpu, mce_device_initialized))
+@@ -2069,7 +2069,7 @@ static __cpuinit void mce_device_remove(unsigned int cpu)
+
+ device_unregister(dev);
+ cpumask_clear_cpu(cpu, mce_device_initialized);
+- mce_device[cpu] = NULL;
++ per_cpu(mce_device, cpu) = NULL;
+ }
+
+ /* Make sure there are no machine checks on offlined CPUs. */
+diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
+index 786e76a..a4bf9d2 100644
+--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
++++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
+@@ -523,7 +523,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
+ {
+ int i, err = 0;
+ struct threshold_bank *b = NULL;
+- struct device *dev = mce_device[cpu];
++ struct device *dev = per_cpu(mce_device, cpu);
+ char name[32];
+
+ sprintf(name, "threshold_bank%i", bank);
+@@ -585,7 +585,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
+ if (i == cpu)
+ continue;
+
+- dev = mce_device[i];
++ dev = per_cpu(mce_device, i);
+ if (dev)
+ err = sysfs_create_link(&dev->kobj,b->kobj, name);
+ if (err)
+@@ -665,7 +665,8 @@ static void threshold_remove_bank(unsigned int cpu, int bank)
+ #ifdef CONFIG_SMP
+ /* sibling symlink */
+ if (shared_bank[bank] && b->blocks->cpu != cpu) {
+- sysfs_remove_link(&mce_device[cpu]->kobj, name);
++ dev = per_cpu(mce_device, cpu);
++ sysfs_remove_link(&dev->kobj, name);
+ per_cpu(threshold_banks, cpu)[bank] = NULL;
+
+ return;
+@@ -677,7 +678,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank)
+ if (i == cpu)
+ continue;
+
+- dev = mce_device[i];
++ dev = per_cpu(mce_device, i);
+ if (dev)
+ sysfs_remove_link(&dev->kobj, name);
+ per_cpu(threshold_banks, i)[bank] = NULL;
Added: dists/sid/linux/debian/patches/features/all/cpu-devices/x86-mce-Fix-CPU-hotplug-and-suspend-regression-relat.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux/debian/patches/features/all/cpu-devices/x86-mce-Fix-CPU-hotplug-and-suspend-regression-relat.patch Tue Jun 19 03:24:14 2012 (r19168)
@@ -0,0 +1,35 @@
+From: "Srivatsa S. Bhat" <srivatsa.bhat at linux.vnet.ibm.com>
+Date: Sat, 14 Jan 2012 08:11:31 +0530
+Subject: x86/mce: Fix CPU hotplug and suspend regression related to MCE
+
+commit a3301b751b19f0efbafddc4034f8e7ce6bf3007b upstream.
+
+Commit 8a25a2fd126c ("cpu: convert 'cpu' and 'machinecheck' sysdev_class
+to a regular subsystem") changed how things are dealt with in the MCE
+subsystem. Some of the things that got broken due to this are CPU
+hotplug and suspend/hibernate.
+
+MCE uses per_cpu allocations of struct device. So, when a CPU goes
+offline and comes back online, in order to ensure that we start from a
+clean slate with respect to the MCE subsystem, zero out the entire
+per_cpu device structure to 0 before using it.
+
+Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat at linux.vnet.ibm.com>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ arch/x86/kernel/cpu/mcheck/mce.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
+index f22a9f7..29ba329 100644
+--- a/arch/x86/kernel/cpu/mcheck/mce.c
++++ b/arch/x86/kernel/cpu/mcheck/mce.c
+@@ -2011,7 +2011,7 @@ static __cpuinit int mce_device_create(unsigned int cpu)
+ if (!mce_available(&boot_cpu_data))
+ return -EIO;
+
+- memset(&dev->kobj, 0, sizeof(struct kobject));
++ memset(dev, 0, sizeof(struct device));
+ dev->id = cpu;
+ dev->bus = &mce_subsys;
+
Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series Mon Jun 18 22:31:05 2012 (r19167)
+++ dists/sid/linux/debian/patches/series Tue Jun 19 03:24:14 2012 (r19168)
@@ -319,6 +319,9 @@
features/all/cpu-devices/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch
features/all/cpu-devices/cpu-Do-not-return-errors-from-cpu_dev_init-which-wil.patch
features/all/cpu-devices/cpu-Register-a-generic-CPU-device-on-architectures-t.patch
+features/all/cpu-devices/x86-mce-Fix-CPU-hotplug-and-suspend-regression-relat.patch
+features/all/cpu-devices/mce-fix-warning-messages-about-static-struct-mce_dev.patch
+features/all/cpu-devices/x86-mce-Convert-static-array-of-pointers-to-per-cpu-.patch
features/all/cpu-devices/Add-driver-auto-probing-for-x86-features-v4.patch
features/all/cpu-devices/CPU-Introduce-ARCH_HAS_CPU_AUTOPROBE-and-X86-parts.patch
features/all/cpu-devices/driver-core-cpu-remove-kernel-warning-when-removing-.patch
More information about the Kernel-svn-changes
mailing list