diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2023-06-13 12:28:21 +0200 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2023-06-16 11:04:29 +0200 |
| commit | d5bf485746991ce994994e5935b1cf223678f112 (patch) | |
| tree | bf70c9dd6a44e68c0a8c2b36fbcab2f0f3a7ea31 /mm | |
| parent | d0bf7d5759c1d89fb013aa41cca5832e00b9632a (diff) | |
| download | linux-stable-d5bf485746991ce994994e5935b1cf223678f112.tar.gz linux-stable-d5bf485746991ce994994e5935b1cf223678f112.tar.bz2 linux-stable-d5bf485746991ce994994e5935b1cf223678f112.zip | |
mm/slab_common: use SLAB_NO_MERGE instead of negative refcount
When CONFIG_MEMCG_KMEM is enabled, we disable cache merging for
KMALLOC_NORMAL caches so they don't end up merged with a cache that uses
ad-hoc __GFP_ACCOUNT when allocating. This was implemented by setting
the refcount to -1, but now we have a proper SLAB_NO_MERGE flag, so use
that instead.
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: David Rientjes <rientjes@google.com>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slab_common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mm/slab_common.c b/mm/slab_common.c index 0e0a617eae7d..67caf0bc3194 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -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); } /* |