Skip to contentSkip to conversation

slub: Hold list_lock unconditionally before the call to add_full.

PATCH In review Gautham R Shenoy 2 participants 3 messages Feb 7, 2014 – Feb 8, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 slub: Hold list_lock unconditionally before the call to add_full.

Hi,

Quoted 1 line

From the lockdep annotation and the comment that existed before the

lockdep annotations were introduced,
mm/slub.c:add_full(s, n, page) expects to be called with n->list_lock held.

However, there's a call path in deactivate_slab() when

	 (new.inuse || n->nr_partial <= s->min_partial) &&
	 !(new.freelist) &&
         !(kmem_cache_debug(s))

which ends up calling add_full() without holding
n->list_lock.

This was discovered while onlining/offlining cpus in 3.14-rc1 due to the lockdep annotations added by commit c65c1877bd6826ce0d9713d76e30a7bed8e49f38.

Fix this by unconditionally taking the lock
irrespective of the state of kmem_cache_debug(s).

Cc Peter Zijlstra <[email protected]>
Cc Pekka Enberg <[email protected]>
---
 mm/slub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/slub.c +1 -1
index 7e3e045..1f723f7 100644
@@ -1882,7 +1882,7 @@ redo:
 		}
 	} else {
 		m = M_FULL;
-		if (kmem_cache_debug(s) && !lock) {
+		if (!lock) {
 			lock = 1;
 			/*
 			 * This also ensures that the scanning of full
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 20 lines · Gautham R Shenoy

Hi,

From the lockdep annotation and the comment that existed before the lockdep annotations were introduced,
mm/slub.c:add_full(s, n, page) expects to be called with n->list_lock held.

However, there's a call path in deactivate_slab() when

	 (new.inuse || n->nr_partial <= s->min_partial) &&
	 !(new.freelist) &&
         !(kmem_cache_debug(s))

which ends up calling add_full() without holding
n->list_lock.

This was discovered while onlining/offlining cpus in 3.14-rc1 due to the lockdep annotations added by commit c65c1877bd6826ce0d9713d76e30a7bed8e49f38.

Quoted 6 lines

Fix this by unconditionally taking the lock
irrespective of the state of kmem_cache_debug(s).

Cc Peter Zijlstra <[email protected]>
Cc Pekka Enberg <[email protected]>

No, it's not needed unless kmem_cache_debug(s) is actually set, specifically s->flags & SLAB_STORE_USER.

You want the patch at http://marc.info/?l=linux-kernel&m=139147105027693
instead which is already in -mm and linux-next.

#2 lore raw
Quoted 29 lines · David Rientjes
Quoted 20 lines · Gautham R Shenoy

Hi,

From the lockdep annotation and the comment that existed before the lockdep annotations were introduced,
mm/slub.c:add_full(s, n, page) expects to be called with n->list_lock held.

However, there's a call path in deactivate_slab() when

	 (new.inuse || n->nr_partial <= s->min_partial) &&
	 !(new.freelist) &&
         !(kmem_cache_debug(s))

which ends up calling add_full() without holding
n->list_lock.

This was discovered while onlining/offlining cpus in 3.14-rc1 due to the lockdep annotations added by commit c65c1877bd6826ce0d9713d76e30a7bed8e49f38.

Quoted 6 lines

Fix this by unconditionally taking the lock
irrespective of the state of kmem_cache_debug(s).

Cc Peter Zijlstra <[email protected]>
Cc Pekka Enberg <[email protected]>
Quoted 6 lines

No, it's not needed unless kmem_cache_debug(s) is actually set, specifically s->flags & SLAB_STORE_USER.

You want the patch at http://marc.info/?l=linux-kernel&m=139147105027693
instead which is already in -mm and linux-next.

Ah, thanks! Wasn't aware of this fix. Shall apply this one.

--
Thanks and Regards
gautham.