2018-02-11 09:17:31

by Max Filippov

Subject: [PATCH] xtensa: fix build with KASAN

The commit 917538e212a2 ("kasan: clean up KASAN_SHADOW_SCALE_SHIFT
usage") removed KASAN_SHADOW_SCALE_SHIFT definition from
include/linux/kasan.h and added it to architecture-specific headers,
except for xtensa. This broke the xtensa build with KASAN enabled.
Define KASAN_SHADOW_SCALE_SHIFT in arch/xtensa/include/asm/kasan.h

Reported by: kbuild test robot <[email protected]>
Fixes: 917538e212a2 ("kasan: clean up KASAN_SHADOW_SCALE_SHIFT usage")
Signed-off-by: Max Filippov <[email protected]>
---
arch/xtensa/include/asm/kasan.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/xtensa/include/asm/kasan.h b/arch/xtensa/include/asm/kasan.h
index 54be80876e57..216b6f32c375 100644
--- a/arch/xtensa/include/asm/kasan.h
+++ b/arch/xtensa/include/asm/kasan.h
@@ -10,6 +10,8 @@
#include <linux/sizes.h>
#include <asm/kmem_layout.h>

+#define KASAN_SHADOW_SCALE_SHIFT 3
+
/* Start of area covered by KASAN */
#define KASAN_START_VADDR __XTENSA_UL_CONST(0x90000000)
/* Start of the shadow map */
--
2.1.4

2018-02-11 10:24:32

by Andrey Konovalov

Subject: Re: [PATCH] xtensa: fix build with KASAN

On Sun, Feb 11, 2018 at 10:15 AM, Max Filippov <[email protected]> wrote:
> The commit 917538e212a2 ("kasan: clean up KASAN_SHADOW_SCALE_SHIFT
> usage") removed KASAN_SHADOW_SCALE_SHIFT definition from
> include/linux/kasan.h and added it to architecture-specific headers,
> except for xtensa. This broke the xtensa build with KASAN enabled.
> Define KASAN_SHADOW_SCALE_SHIFT in arch/xtensa/include/asm/kasan.h
>
> Reported by: kbuild test robot <[email protected]>
> Fixes: 917538e212a2 ("kasan: clean up KASAN_SHADOW_SCALE_SHIFT usage")
> Signed-off-by: Max Filippov <[email protected]>
> ---
> arch/xtensa/include/asm/kasan.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/xtensa/include/asm/kasan.h b/arch/xtensa/include/asm/kasan.h
> index 54be80876e57..216b6f32c375 100644
> --- a/arch/xtensa/include/asm/kasan.h
> +++ b/arch/xtensa/include/asm/kasan.h
> @@ -10,6 +10,8 @@
> #include <linux/sizes.h>
> #include <asm/kmem_layout.h>
>
> +#define KASAN_SHADOW_SCALE_SHIFT 3
> +
> /* Start of area covered by KASAN */
> #define KASAN_START_VADDR __XTENSA_UL_CONST(0x90000000)
> /* Start of the shadow map */
> --
> 2.1.4
>

Thanks!

Acked-by: Andrey Konovalov <[email protected]>