Commit e86f8b09 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Linus Torvalds
Browse files

kasan, mm: allow cache merging with no metadata 

The reason cache merging is disabled with KASAN is because KASAN puts its
metadata right after the allocated object. When the merged caches have
slightly different sizes, the metadata ends up in different places, which
KASAN doesn't support.

It might be possible to adjust the metadata allocation algorithm and make
it friendly to the cache merging code. Instead this change takes a simpler
approach and allows merging caches when no metadata is present. Which is
the case for hardware tag-based KASAN with kasan.mode=prod.

Link: https://lkml.kernel.org/r/37497e940bfd4b32c0a93a702a9ae4cf061d5392.1606162397.git.andreyknvl@google.com
Link: https://linux-review.googlesource.com/id/Ia114847dfb2244f297d2cb82d592bf6a07455dba


Co-developed-by: default avatarVincenzo Frascino <Vincenzo.Frascino@arm.com>
Signed-off-by: default avatarVincenzo Frascino <Vincenzo.Frascino@arm.com>
Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Reviewed-by: default avatarDmitry Vyukov <dvyukov@google.com>
Reviewed-by: default avatarMarco Elver <elver@google.com>
Tested-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Branislav Rankov <Branislav.Rankov@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Evgenii Stepanov <eugenis@google.com>
Cc: Kevin Brodsky <kevin.brodsky@arm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 97593cad

include/linux/kasan.h

+19 −2
Original line number Diff line number Diff line
@@ -82,17 +82,30 @@ struct kasan_cache { 
};



#ifdef CONFIG_KASAN_HW_TAGS



DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled);



static __always_inline bool kasan_enabled(void)

{

	return static_branch_likely(&kasan_flag_enabled);

}

#else



#else /* CONFIG_KASAN_HW_TAGS */



static inline bool kasan_enabled(void)

{

	return true;

}

#endif



#endif /* CONFIG_KASAN_HW_TAGS */



slab_flags_t __kasan_never_merge(void);

static __always_inline slab_flags_t kasan_never_merge(void)

{

	if (kasan_enabled())

		return __kasan_never_merge();

	return 0;

}



void __kasan_unpoison_range(const void *addr, size_t size);

static __always_inline void kasan_unpoison_range(const void *addr, size_t size)
@@ -239,6 +252,10 @@ static inline bool kasan_enabled(void) 
{

	return false;

}

static inline slab_flags_t kasan_never_merge(void)

{

	return 0;

}

static inline void kasan_unpoison_range(const void *address, size_t size) {}

static inline void kasan_alloc_pages(struct page *page, unsigned int order) {}

static inline void kasan_free_pages(struct page *page, unsigned int order) {}

mm/kasan/common.c

+11 −0
Original line number Diff line number Diff line
@@ -86,6 +86,17 @@ asmlinkage void kasan_unpoison_task_stack_below(const void *watermark) 
}

#endif /* CONFIG_KASAN_STACK */



/*

 * Only allow cache merging when stack collection is disabled and no metadata

 * is present.

 */

slab_flags_t __kasan_never_merge(void)

{

	if (kasan_stack_collection_enabled())

		return SLAB_KASAN;

	return 0;

}



void __kasan_alloc_pages(struct page *page, unsigned int order)

{

	u8 tag;

mm/slab_common.c

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/seq_file.h>

#include <linux/proc_fs.h>

#include <linux/debugfs.h>

#include <linux/kasan.h>

#include <asm/cacheflush.h>

#include <asm/tlbflush.h>

#include <asm/page.h>
@@ -53,7 +54,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_KASAN)

		SLAB_FAILSLAB | kasan_never_merge())



#define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT | SLAB_CACHE_DMA | \

			 SLAB_CACHE_DMA32 | SLAB_ACCOUNT)

CRA Git | Maintained and supported by SUSTech CRA and CCSE