Commit 88349a28 authored by Wei Yang's avatar Wei Yang Committed by Linus Torvalds
Browse files

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

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

Update the action after __cmpxchg_double_slab() success to record the
final state.

[akpm@linux-foundation.org: more whitespace cleanup]
Link: http://lkml.kernel.org/r/20181107013119.3816-1-richard.weiyang@gmail.com


Signed-off-by: default avatarWei Yang <richard.weiyang@gmail.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6159d0f5
Loading
Loading
Loading
Loading
+7 −14
Original line number Original line Diff line number Diff line
@@ -2131,26 +2131,15 @@ redo:
	}
	}


	if (l != m) {
	if (l != m) {

		if (l == M_PARTIAL)
		if (l == M_PARTIAL)

			remove_partial(n, page);
			remove_partial(n, page);

		else if (l == M_FULL)
		else if (l == M_FULL)

			remove_full(s, n, page);
			remove_full(s, n, page);


		if (m == M_PARTIAL) {
		if (m == M_PARTIAL)

			add_partial(n, page, tail);
			add_partial(n, page, tail);
			stat(s, tail);
		else if (m == M_FULL)

		} else if (m == M_FULL) {

			stat(s, DEACTIVATE_FULL);
			add_full(s, n, page);
			add_full(s, n, page);

		}
	}
	}


	l = m;
	l = m;
@@ -2163,7 +2152,11 @@ redo:
	if (lock)
	if (lock)
		spin_unlock(&n->list_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);
		stat(s, DEACTIVATE_EMPTY);
		discard_slab(s, page);
		discard_slab(s, page);
		stat(s, FREE_SLAB);
		stat(s, FREE_SLAB);