bpf, arm64: Fix compile error in dummy_tramp()
authorXu Kuohai <xukuohai@huawei.com>
Thu, 21 Jul 2022 12:13:19 +0000 (08:13 -0400)
committerDaniel Borkmann <daniel@iogearbox.net>
Thu, 21 Jul 2022 22:21:16 +0000 (00:21 +0200)
dummy_tramp() uses "lr" to refer to the x30 register, but some assembler
does not recognize "lr" and reports a build failure:

/tmp/cc52xO0c.s: Assembler messages:
/tmp/cc52xO0c.s:8: Error: operand 1 should be an integer register -- `mov lr,x9'
/tmp/cc52xO0c.s:7: Error: undefined symbol lr used as an immediate value
make[2]: *** [scripts/Makefile.build:250: arch/arm64/net/bpf_jit_comp.o] Error 1
make[1]: *** [scripts/Makefile.build:525: arch/arm64/net] Error 2

So replace "lr" with "x30" to fix it.

Fixes: b2ad54e1533e ("bpf, arm64: Implement bpf_arch_text_poke() for arm64")
Reported-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Xu Kuohai <xukuohai@huawei.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Link: https://lore.kernel.org/bpf/20220721121319.2999259-1-xukuohai@huaweicloud.com
arch/arm64/net/bpf_jit_comp.c

index dcc572b..7ca8779 100644 (file)
@@ -610,8 +610,8 @@ asm (
 #if IS_ENABLED(CONFIG_ARM64_BTI_KERNEL)
 "      bti j\n" /* dummy_tramp is called via "br x10" */
 #endif
-"      mov x10, lr\n"
-"      mov lr, x9\n"
+"      mov x10, x30\n"
+"      mov x30, x9\n"
 "      ret x10\n"
 "      .size dummy_tramp, .-dummy_tramp\n"
 "      .popsection\n"