diff mbox series

[bpf-next,v4,03/12] bpf: selftests: Fix fentry test kfunc prototypes

Message ID 1f493cb7a7e5349f99e2badf0880b75dd6681898.1717881178.git.dxu@dxuuu.xyz (mailing list archive)
State Superseded
Delegated to: BPF
Headers show
Series bpf: Support dumping kfunc prototypes from BTF | expand

Checks

Context Check Description
bpf/vmtest-bpf-next-PR success PR summary
bpf/vmtest-bpf-next-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-next-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-next-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-next-VM_Test-3 success Logs for Validate matrix.py
bpf/vmtest-bpf-next-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-10 success Logs for aarch64-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-4 success Logs for aarch64-gcc / build / build for aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-12 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-11 success Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-17 success Logs for s390x-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-18 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-19 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-20 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-28 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-29 success Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17-O2
bpf/vmtest-bpf-next-VM_Test-34 success Logs for x86_64-llvm-17 / veristat
bpf/vmtest-bpf-next-VM_Test-35 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-36 success Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18-O2
bpf/vmtest-bpf-next-VM_Test-42 success Logs for x86_64-llvm-18 / veristat
bpf/vmtest-bpf-next-VM_Test-6 success Logs for aarch64-gcc / test (test_maps, false, 360) / test_maps on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-9 success Logs for aarch64-gcc / test (test_verifier, false, 360) / test_verifier on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-13 success Logs for s390x-gcc / test (test_maps, false, 360) / test_maps on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-16 success Logs for s390x-gcc / test (test_verifier, false, 360) / test_verifier on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-8 success Logs for aarch64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-14 success Logs for s390x-gcc / test (test_progs, false, 360) / test_progs on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-15 success Logs for s390x-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-7 success Logs for aarch64-gcc / test (test_progs, false, 360) / test_progs on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-21 success Logs for x86_64-gcc / test (test_maps, false, 360) / test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-22 success Logs for x86_64-gcc / test (test_progs, false, 360) / test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-23 success Logs for x86_64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-24 success Logs for x86_64-gcc / test (test_progs_no_alu32_parallel, true, 30) / test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-25 success Logs for x86_64-gcc / test (test_progs_parallel, true, 30) / test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-26 success Logs for x86_64-gcc / test (test_verifier, false, 360) / test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-27 success Logs for x86_64-gcc / veristat / veristat on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-30 success Logs for x86_64-llvm-17 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-31 success Logs for x86_64-llvm-17 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-32 success Logs for x86_64-llvm-17 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-33 success Logs for x86_64-llvm-17 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-37 success Logs for x86_64-llvm-18 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-41 success Logs for x86_64-llvm-18 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-38 success Logs for x86_64-llvm-18 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-39 success Logs for x86_64-llvm-18 / test (test_progs_cpuv4, false, 360) / test_progs_cpuv4 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-40 success Logs for x86_64-llvm-18 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-18
netdev/tree_selection success Clearly marked for bpf-next, async
netdev/apply fail Patch does not apply to bpf-next-0

Commit Message

Daniel Xu June 8, 2024, 9:15 p.m. UTC 
The prototypes in progs/get_func_ip_test.c were not in line with how the
actual kfuncs are defined in net/bpf/test_run.c. This causes compilation
errors when kfunc prototypes are generated from BTF.

Fix by aligning with actual kfunc definitions.

Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
---
 .../testing/selftests/bpf/progs/get_func_ip_test.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Jiri Olsa June 10, 2024, 1:28 p.m. UTC | #1 
On Sat, Jun 08, 2024 at 03:15:59PM -0600, Daniel Xu wrote:
> The prototypes in progs/get_func_ip_test.c were not in line with how the
> actual kfuncs are defined in net/bpf/test_run.c. This causes compilation
> errors when kfunc prototypes are generated from BTF.
> 
> Fix by aligning with actual kfunc definitions.
> 
> Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
> ---
>  .../testing/selftests/bpf/progs/get_func_ip_test.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/tools/testing/selftests/bpf/progs/get_func_ip_test.c b/tools/testing/selftests/bpf/progs/get_func_ip_test.c
> index 8956eb78a226..a89596f7585d 100644
> --- a/tools/testing/selftests/bpf/progs/get_func_ip_test.c
> +++ b/tools/testing/selftests/bpf/progs/get_func_ip_test.c
> @@ -5,13 +5,13 @@
>  
>  char _license[] SEC("license") = "GPL";
>  
> -extern const void bpf_fentry_test1 __ksym;
> -extern const void bpf_fentry_test2 __ksym;
> -extern const void bpf_fentry_test3 __ksym;
> -extern const void bpf_fentry_test4 __ksym;
> -extern const void bpf_modify_return_test __ksym;
> -extern const void bpf_fentry_test6 __ksym;
> -extern const void bpf_fentry_test7 __ksym;
> +extern int bpf_fentry_test1(int a) __ksym;

hum, the only registered one as kfunc is bpf_fentry_test1, to allow fmodret
also there's bpf_fentry_test9 as kfunc, which AFAICS is not really needed

jirka

[1] 5b481acab4ce bpf: do not rely on ALLOW_ERROR_INJECTION for fmod_ret

> +extern int bpf_fentry_test2(int a, __u64 b) __ksym;
> +extern int bpf_fentry_test3(char a, int b, __u64 c) __ksym;
> +extern int bpf_fentry_test4(void *a, char b, int c, __u64 d) __ksym;
> +extern int bpf_modify_return_test(int a, int *b) __ksym;
> +extern int bpf_fentry_test6(__u64 a, void *b, short c, int d, void *e, __u64 f) __ksym;
> +extern int bpf_fentry_test7(struct bpf_fentry_test_t *arg) __ksym;
>  
>  extern bool CONFIG_X86_KERNEL_IBT __kconfig __weak;
>  
> -- 
> 2.44.0
>
Daniel Xu June 11, 2024, 4:58 p.m. UTC | #2 
On Mon, Jun 10, 2024 at 03:28:36PM GMT, Jiri Olsa wrote:
> On Sat, Jun 08, 2024 at 03:15:59PM -0600, Daniel Xu wrote:
> > The prototypes in progs/get_func_ip_test.c were not in line with how the
> > actual kfuncs are defined in net/bpf/test_run.c. This causes compilation
> > errors when kfunc prototypes are generated from BTF.
> > 
> > Fix by aligning with actual kfunc definitions.
> > 
> > Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
> > ---
> >  .../testing/selftests/bpf/progs/get_func_ip_test.c | 14 +++++++-------
> >  1 file changed, 7 insertions(+), 7 deletions(-)
> > 
> > diff --git a/tools/testing/selftests/bpf/progs/get_func_ip_test.c b/tools/testing/selftests/bpf/progs/get_func_ip_test.c
> > index 8956eb78a226..a89596f7585d 100644
> > --- a/tools/testing/selftests/bpf/progs/get_func_ip_test.c
> > +++ b/tools/testing/selftests/bpf/progs/get_func_ip_test.c
> > @@ -5,13 +5,13 @@
> >  
> >  char _license[] SEC("license") = "GPL";
> >  
> > -extern const void bpf_fentry_test1 __ksym;
> > -extern const void bpf_fentry_test2 __ksym;
> > -extern const void bpf_fentry_test3 __ksym;
> > -extern const void bpf_fentry_test4 __ksym;
> > -extern const void bpf_modify_return_test __ksym;
> > -extern const void bpf_fentry_test6 __ksym;
> > -extern const void bpf_fentry_test7 __ksym;
> > +extern int bpf_fentry_test1(int a) __ksym;
> 
> hum, the only registered one as kfunc is bpf_fentry_test1, to allow fmodret
> also there's bpf_fentry_test9 as kfunc, which AFAICS is not really needed

I think bpf_modify_return_test() is also registered. But otherwise yeah,
I think I was overaggressive here. Are you thinking something like this?


diff --git a/tools/testing/selftests/bpf/progs/get_func_ip_test.c b/tools/testing/selftests/bpf/progs/get_func_ip_test.c
index a89596f7585d..2011cacdeb18 100644
--- a/tools/testing/selftests/bpf/progs/get_func_ip_test.c
+++ b/tools/testing/selftests/bpf/progs/get_func_ip_test.c
@@ -6,12 +6,11 @@
 char _license[] SEC("license") = "GPL";

 extern int bpf_fentry_test1(int a) __ksym;
-extern int bpf_fentry_test2(int a, __u64 b) __ksym;
-extern int bpf_fentry_test3(char a, int b, __u64 c) __ksym;
-extern int bpf_fentry_test4(void *a, char b, int c, __u64 d) __ksym;
 extern int bpf_modify_return_test(int a, int *b) __ksym;
-extern int bpf_fentry_test6(__u64 a, void *b, short c, int d, void *e, __u64 f) __ksym;
-extern int bpf_fentry_test7(struct bpf_fentry_test_t *arg) __ksym;
+
+extern const void bpf_fentry_test2 __ksym;
+extern const void bpf_fentry_test3 __ksym;
+extern const void bpf_fentry_test4 __ksym;

 extern bool CONFIG_X86_KERNEL_IBT __kconfig __weak;
Jiri Olsa June 12, 2024, 12:41 p.m. UTC | #3 
On Tue, Jun 11, 2024 at 10:58:26AM -0600, Daniel Xu wrote:
> On Mon, Jun 10, 2024 at 03:28:36PM GMT, Jiri Olsa wrote:
> > On Sat, Jun 08, 2024 at 03:15:59PM -0600, Daniel Xu wrote:
> > > The prototypes in progs/get_func_ip_test.c were not in line with how the
> > > actual kfuncs are defined in net/bpf/test_run.c. This causes compilation
> > > errors when kfunc prototypes are generated from BTF.
> > > 
> > > Fix by aligning with actual kfunc definitions.
> > > 
> > > Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
> > > ---
> > >  .../testing/selftests/bpf/progs/get_func_ip_test.c | 14 +++++++-------
> > >  1 file changed, 7 insertions(+), 7 deletions(-)
> > > 
> > > diff --git a/tools/testing/selftests/bpf/progs/get_func_ip_test.c b/tools/testing/selftests/bpf/progs/get_func_ip_test.c
> > > index 8956eb78a226..a89596f7585d 100644
> > > --- a/tools/testing/selftests/bpf/progs/get_func_ip_test.c
> > > +++ b/tools/testing/selftests/bpf/progs/get_func_ip_test.c
> > > @@ -5,13 +5,13 @@
> > >  
> > >  char _license[] SEC("license") = "GPL";
> > >  
> > > -extern const void bpf_fentry_test1 __ksym;
> > > -extern const void bpf_fentry_test2 __ksym;
> > > -extern const void bpf_fentry_test3 __ksym;
> > > -extern const void bpf_fentry_test4 __ksym;
> > > -extern const void bpf_modify_return_test __ksym;
> > > -extern const void bpf_fentry_test6 __ksym;
> > > -extern const void bpf_fentry_test7 __ksym;
> > > +extern int bpf_fentry_test1(int a) __ksym;
> > 
> > hum, the only registered one as kfunc is bpf_fentry_test1, to allow fmodret
> > also there's bpf_fentry_test9 as kfunc, which AFAICS is not really needed
> 
> I think bpf_modify_return_test() is also registered. But otherwise yeah,
> I think I was overaggressive here. Are you thinking something like this?

yes, looks good

> 
> 
> diff --git a/tools/testing/selftests/bpf/progs/get_func_ip_test.c b/tools/testing/selftests/bpf/progs/get_func_ip_test.c
> index a89596f7585d..2011cacdeb18 100644
> --- a/tools/testing/selftests/bpf/progs/get_func_ip_test.c
> +++ b/tools/testing/selftests/bpf/progs/get_func_ip_test.c
> @@ -6,12 +6,11 @@
>  char _license[] SEC("license") = "GPL";
> 
>  extern int bpf_fentry_test1(int a) __ksym;
> -extern int bpf_fentry_test2(int a, __u64 b) __ksym;
> -extern int bpf_fentry_test3(char a, int b, __u64 c) __ksym;
> -extern int bpf_fentry_test4(void *a, char b, int c, __u64 d) __ksym;
>  extern int bpf_modify_return_test(int a, int *b) __ksym;
> -extern int bpf_fentry_test6(__u64 a, void *b, short c, int d, void *e, __u64 f) __ksym;
> -extern int bpf_fentry_test7(struct bpf_fentry_test_t *arg) __ksym;

I did not realize bpf_fentry_test6/7 are not used.. ok

thanks,
jirka

> +
> +extern const void bpf_fentry_test2 __ksym;
> +extern const void bpf_fentry_test3 __ksym;
> +extern const void bpf_fentry_test4 __ksym;
> 
>  extern bool CONFIG_X86_KERNEL_IBT __kconfig __weak;
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/progs/get_func_ip_test.c b/tools/testing/selftests/bpf/progs/get_func_ip_test.c
index 8956eb78a226..a89596f7585d 100644
--- a/tools/testing/selftests/bpf/progs/get_func_ip_test.c
+++ b/tools/testing/selftests/bpf/progs/get_func_ip_test.c
@@ -5,13 +5,13 @@ 
 
 char _license[] SEC("license") = "GPL";
 
-extern const void bpf_fentry_test1 __ksym;
-extern const void bpf_fentry_test2 __ksym;
-extern const void bpf_fentry_test3 __ksym;
-extern const void bpf_fentry_test4 __ksym;
-extern const void bpf_modify_return_test __ksym;
-extern const void bpf_fentry_test6 __ksym;
-extern const void bpf_fentry_test7 __ksym;
+extern int bpf_fentry_test1(int a) __ksym;
+extern int bpf_fentry_test2(int a, __u64 b) __ksym;
+extern int bpf_fentry_test3(char a, int b, __u64 c) __ksym;
+extern int bpf_fentry_test4(void *a, char b, int c, __u64 d) __ksym;
+extern int bpf_modify_return_test(int a, int *b) __ksym;
+extern int bpf_fentry_test6(__u64 a, void *b, short c, int d, void *e, __u64 f) __ksym;
+extern int bpf_fentry_test7(struct bpf_fentry_test_t *arg) __ksym;
 
 extern bool CONFIG_X86_KERNEL_IBT __kconfig __weak;