Commit 3e810ae2 authored Aug 06, 2015 by Konstantin Khlebnikov Committed by Linus Torvalds Aug 07, 2015

mm/slub: allow merging when SLAB_DEBUG_FREE is set



This patch fixes creation of new kmem-caches after enabling
sanity_checks for existing mergeable kmem-caches in runtime: before that
patch creation fails because unique name in sysfs already taken by
existing kmem-cache.

Unlike other debug options this doesn't change object layout and could
be enabled and disabled at any time.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 3ead7c52

mm/slab_common.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -37,8 +37,7 @@ struct kmem_cache *kmem_cache;
		SLAB_TRACE \| SLAB_DESTROY_BY_RCU \| SLAB_NOLEAKTRACE \| \
		SLAB_FAILSLAB)

		#define SLAB_MERGE_SAME (SLAB_DEBUG_FREE \| SLAB_RECLAIM_ACCOUNT \| \
		SLAB_CACHE_DMA \| SLAB_NOTRACK)
		#define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT \| SLAB_CACHE_DMA \| SLAB_NOTRACK)

		/*
		* Merge control. If this is set then no merging of slab caches will occur.