kasan: Cleanup the __HAVE_ARCH_SHADOW_MAP usage

chenhuacai · chenhuacai · commit 2a86f1b56a30 · 2023-09-20T14:26:29.000+08:00
As Linus suggested, __HAVE_ARCH_XYZ is "stupid" and "having historical
uses of it doesn't make it good". So migrate __HAVE_ARCH_SHADOW_MAP to
separate macros named after the respective functions.

Suggested-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
Reviewed-by: WANG Xuerui &lt;git@xen0n.name&gt;
Reviewed-by: Andrey Konovalov &lt;andreyknvl@gmail.com&gt;
Signed-off-by: Huacai Chen &lt;chenhuacai@loongson.cn&gt;
diff --git a/arch/loongarch/include/asm/kasan.h b/arch/loongarch/include/asm/kasan.h
@@ -10,8 +10,6 @@
 #include <asm/io.h>
 #include <asm/pgtable.h>
 
-#define __HAVE_ARCH_SHADOW_MAP
-
 #define KASAN_SHADOW_SCALE_SHIFT 3
 #define KASAN_SHADOW_OFFSET	_AC(CONFIG_KASAN_SHADOW_OFFSET, UL)
 
@@ -68,6 +66,7 @@ static __always_inline bool kasan_arch_is_ready(void)
 	return !kasan_early_stage;
 }
 
+#define kasan_mem_to_shadow kasan_mem_to_shadow
 static inline void *kasan_mem_to_shadow(const void *addr)
 {
 	if (!kasan_arch_is_ready()) {
@@ -97,6 +96,7 @@ static inline void *kasan_mem_to_shadow(const void *addr)
 	}
 }
 
+#define kasan_shadow_to_mem kasan_shadow_to_mem
 static inline const void *kasan_shadow_to_mem(const void *shadow_addr)
 {
 	unsigned long addr = (unsigned long)shadow_addr;
@@ -119,6 +119,12 @@ static inline const void *kasan_shadow_to_mem(const void *shadow_addr)
 	}
 }
 
+#define addr_has_metadata addr_has_metadata
+static __always_inline bool addr_has_metadata(const void *addr)
+{
+	return (kasan_mem_to_shadow((void *)addr) != NULL);
+}
+
 void kasan_init(void);
 asmlinkage void kasan_early_init(void);
 
diff --git a/include/linux/kasan.h b/include/linux/kasan.h
@@ -54,7 +54,7 @@ extern p4d_t kasan_early_shadow_p4d[MAX_PTRS_PER_P4D];
 int kasan_populate_early_shadow(const void *shadow_start,
 				const void *shadow_end);
 
-#ifndef __HAVE_ARCH_SHADOW_MAP
+#ifndef kasan_mem_to_shadow
 static inline void *kasan_mem_to_shadow(const void *addr)
 {
 	return (void *)((unsigned long)addr >> KASAN_SHADOW_SCALE_SHIFT)
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
@@ -291,23 +291,21 @@ struct kasan_stack_ring {
 
 #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)
 
-#ifndef __HAVE_ARCH_SHADOW_MAP
+#ifndef kasan_shadow_to_mem
 static inline const void *kasan_shadow_to_mem(const void *shadow_addr)
 {
 	return (void *)(((unsigned long)shadow_addr - KASAN_SHADOW_OFFSET)
 		<< KASAN_SHADOW_SCALE_SHIFT);
 }
 #endif
 
+#ifndef addr_has_metadata
 static __always_inline bool addr_has_metadata(const void *addr)
 {
-#ifdef __HAVE_ARCH_SHADOW_MAP
-	return (kasan_mem_to_shadow((void *)addr) != NULL);
-#else
 	return (kasan_reset_tag(addr) >=
 		kasan_shadow_to_mem((void *)KASAN_SHADOW_START));
-#endif
 }
+#endif
 
 /**
  * kasan_check_range - Check memory region, and report if invalid access.

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@`
`10`	`10`	`#include <asm/io.h>`
`11`	`11`	`#include <asm/pgtable.h>`
`12`	`12`
`13`		`-#define __HAVE_ARCH_SHADOW_MAP`
`14`		`-`
`15`	`13`	`#define KASAN_SHADOW_SCALE_SHIFT 3`
`16`	`14`	`#define KASAN_SHADOW_OFFSET _AC(CONFIG_KASAN_SHADOW_OFFSET, UL)`
`17`	`15`
`@@ -68,6 +66,7 @@ static __always_inline bool kasan_arch_is_ready(void)`
`68`	`66`	`return !kasan_early_stage;`
`69`	`67`	`}`
`70`	`68`
	`69`	`+#define kasan_mem_to_shadow kasan_mem_to_shadow`
`71`	`70`	`static inline void kasan_mem_to_shadow(const void addr)`
`72`	`71`	`{`
`73`	`72`	`if (!kasan_arch_is_ready()) {`
`@@ -97,6 +96,7 @@ static inline void kasan_mem_to_shadow(const void addr)`
`97`	`96`	`}`
`98`	`97`	`}`
`99`	`98`
	`99`	`+#define kasan_shadow_to_mem kasan_shadow_to_mem`
`100`	`100`	`static inline const void kasan_shadow_to_mem(const void shadow_addr)`
`101`	`101`	`{`
`102`	`102`	`unsigned long addr = (unsigned long)shadow_addr;`
`@@ -119,6 +119,12 @@ static inline const void kasan_shadow_to_mem(const void shadow_addr)`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
	`122`	`+#define addr_has_metadata addr_has_metadata`
	`123`	`+static __always_inline bool addr_has_metadata(const void *addr)`
	`124`	`+{`
	`125`	`+ return (kasan_mem_to_shadow((void *)addr) != NULL);`
	`126`	`+}`
	`127`	`+`
`122`	`128`	`void kasan_init(void);`
`123`	`129`	`asmlinkage void kasan_early_init(void);`
`124`	`130`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ extern p4d_t kasan_early_shadow_p4d[MAX_PTRS_PER_P4D];`
`54`	`54`	`int kasan_populate_early_shadow(const void *shadow_start,`
`55`	`55`	`const void *shadow_end);`
`56`	`56`
`57`		`-#ifndef __HAVE_ARCH_SHADOW_MAP`
	`57`	`+#ifndef kasan_mem_to_shadow`
`58`	`58`	`static inline void kasan_mem_to_shadow(const void addr)`
`59`	`59`	`{`
`60`	`60`	`return (void *)((unsigned long)addr >> KASAN_SHADOW_SCALE_SHIFT)`
Original file line number	Diff line number	Diff line change
`@@ -291,23 +291,21 @@ struct kasan_stack_ring {`
`291`	`291`
`292`	`292`	`#if defined(CONFIG_KASAN_GENERIC) \|\| defined(CONFIG_KASAN_SW_TAGS)`
`293`	`293`
`294`		`-#ifndef __HAVE_ARCH_SHADOW_MAP`
	`294`	`+#ifndef kasan_shadow_to_mem`
`295`	`295`	`static inline const void kasan_shadow_to_mem(const void shadow_addr)`
`296`	`296`	`{`
`297`	`297`	`return (void *)(((unsigned long)shadow_addr - KASAN_SHADOW_OFFSET)`
`298`	`298`	`<< KASAN_SHADOW_SCALE_SHIFT);`
`299`	`299`	`}`
`300`	`300`	`#endif`
`301`	`301`
	`302`	`+#ifndef addr_has_metadata`
`302`	`303`	`static __always_inline bool addr_has_metadata(const void *addr)`
`303`	`304`	`{`
`304`		`-#ifdef __HAVE_ARCH_SHADOW_MAP`
`305`		`- return (kasan_mem_to_shadow((void *)addr) != NULL);`
`306`		`-#else`
`307`	`305`	`return (kasan_reset_tag(addr) >=`
`308`	`306`	`kasan_shadow_to_mem((void *)KASAN_SHADOW_START));`
`309`		`-#endif`
`310`	`307`	`}`
	`308`	`+#endif`
`311`	`309`
`312`	`310`	`/**`
`313`	`311`	`* kasan_check_range - Check memory region, and report if invalid access.`