[bpf,v2] riscv, bpf: fix patch_text implicit declaration

Commit Message

Randy Dunlap Feb. 27, 2023, 7:20 a.m. UTC

bpf_jit_comp64.c uses patch_text(), so add <asm/patch.h> to it
to prevent the build error:

../arch/riscv/net/bpf_jit_comp64.c: In function 'bpf_arch_text_poke':
../arch/riscv/net/bpf_jit_comp64.c:691:23: error: implicit declaration of function 'patch_text'; did you mean 'path_get'? [-Werror=implicit-function-declaration]
  691 |                 ret = patch_text(ip, new_insns, ninsns);
      |                       ^~~~~~~~~~

Fixes: 596f2e6f9cf4 ("riscv, bpf: Add bpf_arch_text_poke support for RV64")
Signed-off-by: Randy Dunlap <[e-mail]>
Reported-by: kernel test robot <[e-mail]>
Link: https://lore.kernel.org/r/[e-mail]
Cc: Pu Lehui <[e-mail]>
Cc: Luke Nelson <[e-mail]>
Cc: Xi Wang <[e-mail]>
Cc: [e-mail]
Cc: Alexei Starovoitov <[e-mail]>
Cc: Daniel Borkmann <[e-mail]>
Cc: John Fastabend <[e-mail]>
Cc: Andrii Nakryiko <[e-mail]>
Cc: Paul Walmsley <[e-mail]>
Cc: Palmer Dabbelt <[e-mail]>
Cc: Albert Ou <[e-mail]>
Cc: "Björn Töpel" <[e-mail]>
Cc: [e-mail]
---
v2: add header file directly to bpf_jit_comp64.c (Pu Lehui)
    change patch target to bpf (for fixes)

 arch/riscv/net/bpf_jit_comp64.c |    1 +
 1 file changed, 1 insertion(+)

Comments

Pu Lehui Feb. 27, 2023, 7:30 a.m. UTC | #1

On 2023/2/27 15:20, Randy Dunlap wrote:
> bpf_jit_comp64.c uses patch_text(), so add <asm/patch.h> to it
> to prevent the build error:
> 
> ../arch/riscv/net/bpf_jit_comp64.c: In function 'bpf_arch_text_poke':
> ../arch/riscv/net/bpf_jit_comp64.c:691:23: error: implicit declaration of function 'patch_text'; did you mean 'path_get'? [-Werror=implicit-function-declaration]
>    691 |                 ret = patch_text(ip, new_insns, ninsns);
>        |                       ^~~~~~~~~~
> 
> Fixes: 596f2e6f9cf4 ("riscv, bpf: Add bpf_arch_text_poke support for RV64")
> Signed-off-by: Randy Dunlap <[e-mail]>
> Reported-by: kernel test robot <[e-mail]>
> Link: https://lore.kernel.org/r/[e-mail]
> Cc: Pu Lehui <[e-mail]>
> Cc: Luke Nelson <[e-mail]>
> Cc: Xi Wang <[e-mail]>
> Cc: [e-mail]
> Cc: Alexei Starovoitov <[e-mail]>
> Cc: Daniel Borkmann <[e-mail]>
> Cc: John Fastabend <[e-mail]>
> Cc: Andrii Nakryiko <[e-mail]>
> Cc: Paul Walmsley <[e-mail]>
> Cc: Palmer Dabbelt <[e-mail]>
> Cc: Albert Ou <[e-mail]>
> Cc: "Björn Töpel" <[e-mail]>
> Cc: [e-mail]
> ---
> v2: add header file directly to bpf_jit_comp64.c (Pu Lehui)
>      change patch target to bpf (for fixes)
> 
>   arch/riscv/net/bpf_jit_comp64.c |    1 +
>   1 file changed, 1 insertion(+)
> 
> diff -- a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
> --- a/arch/riscv/net/bpf_jit_comp64.c
> +++ b/arch/riscv/net/bpf_jit_comp64.c
> @@ -10,6 +10,7 @@
>   #include <linux/filter.h>
>   #include <linux/memory.h>
>   #include <linux/stop_machine.h>
> +#include <asm/patch.h>
>   #include "bpf_jit.h"
>   
>   #define RV_REG_TCC RV_REG_A6

Acked-by: Pu Lehui <[e-mail]>

Björn Töpel Feb. 27, 2023, 7:31 a.m. UTC | #2

Randy Dunlap <[e-mail]> writes:

> bpf_jit_comp64.c uses patch_text(), so add <asm/patch.h> to it
> to prevent the build error:
>
> ../arch/riscv/net/bpf_jit_comp64.c: In function 'bpf_arch_text_poke':
> ../arch/riscv/net/bpf_jit_comp64.c:691:23: error: implicit declaration of function 'patch_text'; did you mean 'path_get'? [-Werror=implicit-function-declaration]
>   691 |                 ret = patch_text(ip, new_insns, ninsns);
>       |                       ^~~~~~~~~~
>
> Fixes: 596f2e6f9cf4 ("riscv, bpf: Add bpf_arch_text_poke support for RV64")
> Signed-off-by: Randy Dunlap <[e-mail]>
> Reported-by: kernel test robot <[e-mail]>
> Link: https://lore.kernel.org/r/[e-mail]
> Cc: Pu Lehui <[e-mail]>
> Cc: Luke Nelson <[e-mail]>
> Cc: Xi Wang <[e-mail]>
> Cc: [e-mail]
> Cc: Alexei Starovoitov <[e-mail]>
> Cc: Daniel Borkmann <[e-mail]>
> Cc: John Fastabend <[e-mail]>
> Cc: Andrii Nakryiko <[e-mail]>
> Cc: Paul Walmsley <[e-mail]>
> Cc: Palmer Dabbelt <[e-mail]>
> Cc: Albert Ou <[e-mail]>
> Cc: "Björn Töpel" <[e-mail]>
> Cc: [e-mail]
> ---
> v2: add header file directly to bpf_jit_comp64.c (Pu Lehui)
>     change patch target to bpf (for fixes)

Thanks, Randy!

For the curious; The asm/patch.h file was picked via UPROBES (via
PERF_EVENTS=y). For PERF_EVENTS=n, you get the build error.


Acked-by: Björn Töpel <[e-mail]>

Patch

diff -- a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
--- a/arch/riscv/net/bpf_jit_comp64.c
+++ b/arch/riscv/net/bpf_jit_comp64.c
@@ -10,6 +10,7 @@ 
 #include <linux/filter.h>
 #include <linux/memory.h>
 #include <linux/stop_machine.h>
+#include <asm/patch.h>
 #include "bpf_jit.h"
 
 #define RV_REG_TCC RV_REG_A6