[PATCH] cpu_up: hold zonelists_mutex when build_all_zonelists
in [Kernel]
|
Prev: [PATCH -mm 5/6] parisc: set ARCH_KMALLOC_MINALIGN
Next: x86, mem-hotplug: update all PGDs for direct mapping and vmemmap mapping changes on 64bit.
From: Haicheng Li on 19 May 2010 23:30 akpm(a)linux-foundation.org wrote: > The patch titled > mem-hotplug-avoid-multiple-zones-sharing-same-boot-strapping-boot_pageset-fix > has been added to the -mm tree. Its filename is > mem-hotplug-avoid-multiple-zones-sharing-same-boot-strapping-boot_pageset-fix.patch > ------------------------------------------------------ > Subject: mem-hotplug-avoid-multiple-zones-sharing-same-boot-strapping-boot_pageset-fix > From: Andrew Morton <akpm(a)linux-foundation.org> > > Cc: Andi Kleen <andi.kleen(a)intel.com> > Cc: Christoph Lameter <cl(a)linux-foundation.org> > Cc: Haicheng Li <haicheng.li(a)linux.intel.com> > Cc: Mel Gorman <mel(a)csn.ul.ie> > Cc: Tejun Heo <tj(a)kernel.org> > Cc: Wu Fengguang <fengguang.wu(a)intel.com> > Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> > --- > > kernel/cpu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff -puN kernel/cpu.c~mem-hotplug-avoid-multiple-zones-sharing-same-boot-strapping-boot_pageset-fix kernel/cpu.c > --- a/kernel/cpu.c~mem-hotplug-avoid-multiple-zones-sharing-same-boot-strapping-boot_pageset-fix > +++ a/kernel/cpu.c > @@ -358,7 +358,7 @@ int __cpuinit cpu_up(unsigned int cpu) > } > > if (pgdat->node_zonelists->_zonerefs->zone == NULL) > - build_all_zonelists(); > + build_all_zonelists(NULL); > #endif > > cpu_maps_update_begin(); Andrew, Here is another issue, we should always hold zonelists_mutex when calling build_all_zonelists unless system_state == SYSTEM_BOOTING. We need another patch to fix it, which should be applied after mem-hotplug-fix-potential-race-while-building-zonelist-for-new-populated-zone.patch --- From 5f547a85e3b331f7ef2c004c93b674f9698c5531 Mon Sep 17 00:00:00 2001 From: Haicheng Li <haicheng.li(a)linux.intel.com> Date: Thu, 20 May 2010 11:17:01 +0800 Subject: [PATCH] cpu_up: hold zonelists_mutex when build_all_zonelists Signed-off-by: Haicheng Li <haicheng.li(a)linux.intel.com> --- kernel/cpu.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/kernel/cpu.c b/kernel/cpu.c index 3e8b3ba..124ad9d 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -357,8 +357,11 @@ int __cpuinit cpu_up(unsigned int cpu) return -ENOMEM; } - if (pgdat->node_zonelists->_zonerefs->zone == NULL) + if (pgdat->node_zonelists->_zonerefs->zone == NULL) { + mutex_lock(&zonelists_mutex); build_all_zonelists(NULL); + mutex_unlock(&zonelists_mutex); + } #endif cpu_maps_update_begin(); -- 1.5.6.1 -haicheng -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |