[PATCH] arm64: kasan: fix include error in MTE functions

[PATCH] arm64: kasan: fix include error in MTE functions

[Paul Semel]

Fix `error: expected string literal in 'asm'`.
This happens when compiling an ebpf object file that includes
`net/net_namespace.h` from linux kernel headers.

Include trace:
     include/net/net_namespace.h:10
     include/linux/workqueue.h:9
     include/linux/timer.h:8
     include/linux/debugobjects.h:6
     include/linux/spinlock.h:90
     include/linux/workqueue.h:9
     arch/arm64/include/asm/spinlock.h:9
     arch/arm64/include/generated/asm/qrwlock.h:1
     include/asm-generic/qrwlock.h:14
     arch/arm64/include/asm/processor.h:33
     arch/arm64/include/asm/kasan.h:9
     arch/arm64/include/asm/mte-kasan.h:45
     arch/arm64/include/asm/mte-def.h:14

Signed-off-by: Paul Semel <paul.semel@datadoghq.com>
---
  arch/arm64/include/asm/mte-kasan.h | 1 +
  1 file changed, 1 insertion(+)

diff --git a/arch/arm64/include/asm/mte-kasan.h 
b/arch/arm64/include/asm/mte-kasan.h
index e4704a403237..a857bcacf0fe 100644
--- a/arch/arm64/include/asm/mte-kasan.h
+++ b/arch/arm64/include/asm/mte-kasan.h
@@ -5,6 +5,7 @@
  #ifndef __ASM_MTE_KASAN_H
  #define __ASM_MTE_KASAN_H

+#include <asm/compiler.h>
  #include <asm/mte-def.h>

  #ifndef __ASSEMBLY__
-- 
2.35.1

Re: [PATCH] arm64: kasan: fix include error in MTE functions

[Will Deacon]

On Tue, Mar 08, 2022 at 10:30:58AM +0100, Paul Semel wrote:
> Fix `error: expected string literal in 'asm'`.
> This happens when compiling an ebpf object file that includes
> `net/net_namespace.h` from linux kernel headers.
> 
> Include trace:
>     include/net/net_namespace.h:10
>     include/linux/workqueue.h:9
>     include/linux/timer.h:8
>     include/linux/debugobjects.h:6
>     include/linux/spinlock.h:90
>     include/linux/workqueue.h:9
>     arch/arm64/include/asm/spinlock.h:9
>     arch/arm64/include/generated/asm/qrwlock.h:1
>     include/asm-generic/qrwlock.h:14
>     arch/arm64/include/asm/processor.h:33
>     arch/arm64/include/asm/kasan.h:9
>     arch/arm64/include/asm/mte-kasan.h:45
>     arch/arm64/include/asm/mte-def.h:14

Do you know where this issue was introduced? I can't tell whether this patch
is a fix for 5.17, or something needed only for 5.18 (and if so, which tree
introduced the problem).

Thanks,

Will

Re: [PATCH] arm64: kasan: fix include error in MTE functions

[Paul Semel]

On 3/9/22 12:39, Will Deacon wrote:> Do you know where this issue was 
introduced? I can't tell whether this patch
> is a fix for 5.17, or something needed only for 5.18 (and if so, which tree
> introduced the problem).

This seems to have been introduced by 
2cb34276427a093e2d7cc6ea63ac447bad1ff4c1 if I am not mistaking. In which 
case, I guess this is a fix for 5.17.

Thanks,

-- 
Paul Semel

Re: [PATCH] arm64: kasan: fix include error in MTE functions

[Catalin Marinas]

On Tue, 8 Mar 2022 10:30:58 +0100, Paul Semel wrote:
> Fix `error: expected string literal in 'asm'`.
> This happens when compiling an ebpf object file that includes
> `net/net_namespace.h` from linux kernel headers.
> 
> Include trace:
>      include/net/net_namespace.h:10
>      include/linux/workqueue.h:9
>      include/linux/timer.h:8
>      include/linux/debugobjects.h:6
>      include/linux/spinlock.h:90
>      include/linux/workqueue.h:9
>      arch/arm64/include/asm/spinlock.h:9
>      arch/arm64/include/generated/asm/qrwlock.h:1
>      include/asm-generic/qrwlock.h:14
>      arch/arm64/include/asm/processor.h:33
>      arch/arm64/include/asm/kasan.h:9
>      arch/arm64/include/asm/mte-kasan.h:45
>      arch/arm64/include/asm/mte-def.h:14
> 
> [...]

Applied to arm64 (for-next/fixes), thanks!

[1/1] arm64: kasan: fix include error in MTE functions
      https://git.kernel.org/arm64/c/b859ebedd1e7

-- 
Catalin