mm/slub: record final state of slub action in deactivate_slab()

Commit Message

Wei Yang Nov. 7, 2018, 1:31 a.m. UTC

In case __cmpxchg_double_slab() fails and (l != m), current code records
transition states of slub action.

This patch update slub action after __cmpxchg_double_slab() succeed to
record the final state.

Signed-off-by: Wei Yang <[e-mail]>
---
 mm/slub.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

Patch

diff --git a/mm/slub.c b/mm/slub.c
index 44dd1d6cfbc3..cbb1aade7858 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2136,24 +2136,14 @@  static void deactivate_slab(struct kmem_cache *s, struct page *page,
 	if (l != m) {
 
 		if (l == M_PARTIAL)
-
 			remove_partial(n, page);
-
 		else if (l == M_FULL)
-
 			remove_full(s, n, page);
 
-		if (m == M_PARTIAL) {
-
+		if (m == M_PARTIAL)
 			add_partial(n, page, tail);
-			stat(s, tail);
-
-		} else if (m == M_FULL) {
-
-			stat(s, DEACTIVATE_FULL);
+		else if (m == M_FULL)
 			add_full(s, n, page);
-
-		}
 	}
 
 	l = m;
@@ -2166,7 +2156,11 @@  static void deactivate_slab(struct kmem_cache *s, struct page *page,
 	if (lock)
 		spin_unlock(&n->list_lock);
 
-	if (m == M_FREE) {
+	if (m == M_PARTIAL)
+		stat(s, tail);
+	else if (m == M_FULL)
+		stat(s, DEACTIVATE_FULL);
+	else if (m == M_FREE) {
 		stat(s, DEACTIVATE_EMPTY);
 		discard_slab(s, page);
 		stat(s, FREE_SLAB);