diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2024-02-23 19:27:19 +0100 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2024-02-26 10:10:07 +0100 |
| commit | 96d8dbb6f65041b670a79e8ae76f67cc11dee203 (patch) | |
| tree | 26b453545a10a6c8a9058c0a3ac19b05a46552aa /mm/slab_common.c | |
| parent | cc61eb851c9ae38546d7df6076fd883d3dbc322d (diff) | |
| download | linux-96d8dbb6f65041b670a79e8ae76f67cc11dee203.tar.gz linux-96d8dbb6f65041b670a79e8ae76f67cc11dee203.tar.bz2 linux-96d8dbb6f65041b670a79e8ae76f67cc11dee203.zip | |
mm, slab, kasan: replace kasan_never_merge() with SLAB_NO_MERGE
The SLAB_KASAN flag prevents merging of caches in some configurations,
which is handled in a rather complicated way via kasan_never_merge().
Since we now have a generic SLAB_NO_MERGE flag, we can instead use it
for KASAN caches in addition to SLAB_KASAN in those configurations,
and simplify the SLAB_NEVER_MERGE handling.
Tested-by: Xiongwei Song <xiongwei.song@windriver.com>
Reviewed-by: Chengming Zhou <chengming.zhou@linux.dev>
Reviewed-by: Andrey Konovalov <andreyknvl@gmail.com>
Tested-by: David Rientjes <rientjes@google.com>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Diffstat (limited to 'mm/slab_common.c')
| -rw-r--r-- | mm/slab_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slab_common.c b/mm/slab_common.c index 238293b1dbe1..7cfa2f1ce655 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -50,7 +50,7 @@ static DECLARE_WORK(slab_caches_to_rcu_destroy_work, */ #define SLAB_NEVER_MERGE (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER | \ SLAB_TRACE | SLAB_TYPESAFE_BY_RCU | SLAB_NOLEAKTRACE | \ - SLAB_FAILSLAB | SLAB_NO_MERGE | kasan_never_merge()) + SLAB_FAILSLAB | SLAB_NO_MERGE) #define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT | SLAB_CACHE_DMA | \ SLAB_CACHE_DMA32 | SLAB_ACCOUNT) |