Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40323278 authored by Joonsoo Kim's avatar Joonsoo Kim Committed by Linus Torvalds
Browse files

mm/slab: use more appropriate condition check for debug_pagealloc 



debug_pagealloc debugging is related to SLAB_POISON flag rather than
FORCED_DEBUG option, although FORCED_DEBUG option will enable
SLAB_POISON.  Fix it.

Signed-off-by: default avatarJoonsoo Kim <iamjoonsoo.kim@lge.com>
Acked-by: default avatarChristoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a307ebd4

mm/slab.c

+1 −3
Original line number Diff line number Diff line
@@ -2169,7 +2169,6 @@ __kmem_cache_create (struct kmem_cache *cachep, unsigned long flags) 
		else

			size += BYTES_PER_WORD;

	}

#if FORCED_DEBUG && defined(CONFIG_DEBUG_PAGEALLOC)

	/*

	 * To activate debug pagealloc, off-slab management is necessary

	 * requirement. In early phase of initialization, small sized slab
@@ -2177,14 +2176,13 @@ __kmem_cache_create (struct kmem_cache *cachep, unsigned long flags) 
	 * to check size >= 256. It guarantees that all necessary small

	 * sized slab is initialized in current slab initialization sequence.

	 */

	if (debug_pagealloc_enabled() &&

	if (debug_pagealloc_enabled() && (flags & SLAB_POISON) &&

		!slab_early_init && size >= kmalloc_size(INDEX_NODE) &&

		size >= 256 && cachep->object_size > cache_line_size() &&

		ALIGN(size, cachep->align) < PAGE_SIZE) {

		cachep->obj_offset += PAGE_SIZE - ALIGN(size, cachep->align);

		size = PAGE_SIZE;

	}

#endif

#endif



	/*