lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

slab, lockdep: Fix silly bug

Browse Source 
Commit 30765b92 ("slab, lockdep: Annotate the locks before using
them") moves the init_lock_keys() call from after g_cpucache_up =
FULL, to before it. And overlooks the fact that init_node_lock_keys()
tests for it and ignores everything !FULL.

Introduce a LATE stage and change the lockdep test to be <LATE.

Acked-by: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: stable@kernel.org
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra
2011-11-28 21:12:40 +01:00
committed by Ingo Molnar
parent 8e8da023f5
commit 52cef18916
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mm/slab.c
View File

@@ -595,6 +595,7 @@ static enum {
PARTIAL_AC, PARTIAL_AC,
PARTIAL_L3, PARTIAL_L3,
EARLY, EARLY,
LATE,
FULL FULL
} g_cpucache_up; } g_cpucache_up;
@@ -671,7 +672,7 @@ static void init_node_lock_keys(int q)
{ {
struct cache_sizes *s = malloc_sizes; struct cache_sizes *s = malloc_sizes;
if (g_cpucache_up != FULL) if (g_cpucache_up < LATE)
return; return;
for (s = malloc_sizes; s->cs_size != ULONG_MAX; s++) { for (s = malloc_sizes; s->cs_size != ULONG_MAX; s++) {
@@ -1666,6 +1667,8 @@ void __init kmem_cache_init_late(void)
{ {
struct kmem_cache *cachep; struct kmem_cache *cachep;
g_cpucache_up = LATE;
/* Annotate slab for lockdep -- annotate the malloc caches */ /* Annotate slab for lockdep -- annotate the malloc caches */
init_lock_keys(); init_lock_keys();