Skip to contentSkip to conversation

mm/slab_common: use SLAB_NO_MERGE instead of negative refcount

PATCH In review Vlastimil Babka 2 participants 2 messages Jun 13, 2023

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

PATCH 1/1 mm/slab_common: use SLAB_NO_MERGE instead of negative refcount

When CONFIG_MEMCG_KMEM is enabled, we disable cache merging for KMALLOC_NORMAL so they don't end up merged with a cache that uses ad-hoc __GFP_ACCOUNT. This was implemented by setting refcount to -1, but now we have a proper SLAB_NO_MERGE flag, so use that instead.

---
 mm/slab_common.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
mm/slab_common.c +6 -6
index 0e0a617eae7d..67caf0bc3194 100644
@@ -878,17 +878,17 @@ new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags)
 		flags |= SLAB_CACHE_DMA;
 	}
 
-	kmalloc_caches[type][idx] = create_kmalloc_cache(
-					kmalloc_info[idx].name[type],
-					kmalloc_info[idx].size, flags, 0,
-					kmalloc_info[idx].size);
-
 	/*
 	 * If CONFIG_MEMCG_KMEM is enabled, disable cache merging for
 	 * KMALLOC_NORMAL caches.
 	 */
 	if (IS_ENABLED(CONFIG_MEMCG_KMEM) && (type == KMALLOC_NORMAL))
-		kmalloc_caches[type][idx]->refcount = -1;
+		flags |= SLAB_NO_MERGE;
+
+	kmalloc_caches[type][idx] = create_kmalloc_cache(
+					kmalloc_info[idx].name[type],
+					kmalloc_info[idx].size, flags, 0,
+					kmalloc_info[idx].size);
 }
 
 /*
Signature · 1 line
2.41.0
reviewer Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Vlastimil Babka

When CONFIG_MEMCG_KMEM is enabled, we disable cache merging for KMALLOC_NORMAL so they don't end up merged with a cache that uses ad-hoc __GFP_ACCOUNT. This was implemented by setting refcount to -1, but now we have a proper SLAB_NO_MERGE flag, so use that instead.