summaryrefslogtreecommitdiff
path: root/mm/slub.c
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2007-06-01 00:47:09 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-01 08:18:30 -0700
commit27390bc335ff86d92c3819cc28035fde23d1a9c2 (patch)
tree2812436fe897a1211c244f85db2a4d79fff673ff /mm/slub.c
parentac140a8f8396504b33ddafb7309feca77bff8497 (diff)
downloadlinux-3.10-27390bc335ff86d92c3819cc28035fde23d1a9c2.tar.gz
linux-3.10-27390bc335ff86d92c3819cc28035fde23d1a9c2.tar.bz2
linux-3.10-27390bc335ff86d92c3819cc28035fde23d1a9c2.zip
SLUB: fix locking for hotplug callbacks
Hotplug callbacks are performed with interrupts enabled. Slub requires interrupts to be disabled for flushing caches. Signed-off-by: Christoph Lameter <clameter@sgi.com> Cc: Michal Piotrowski <michal.k.k.piotrowski@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/slub.c')
-rw-r--r--mm/slub.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 238c5a6ee89..51663a3c3c2 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2608,6 +2608,19 @@ static void for_all_slabs(void (*func)(struct kmem_cache *, int), int cpu)
}
/*
+ * Version of __flush_cpu_slab for the case that interrupts
+ * are enabled.
+ */
+static void cpu_slab_flush(struct kmem_cache *s, int cpu)
+{
+ unsigned long flags;
+
+ local_irq_save(flags);
+ __flush_cpu_slab(s, cpu);
+ local_irq_restore(flags);
+}
+
+/*
* Use the cpu notifier to insure that the cpu slabs are flushed when
* necessary.
*/
@@ -2621,7 +2634,7 @@ static int __cpuinit slab_cpuup_callback(struct notifier_block *nfb,
case CPU_UP_CANCELED_FROZEN:
case CPU_DEAD:
case CPU_DEAD_FROZEN:
- for_all_slabs(__flush_cpu_slab, cpu);
+ for_all_slabs(cpu_slab_flush, cpu);
break;
default:
break;