selftests/bpf: Add missing prototypes for several test kfuncs
Subsystems (4)
Jiri Olsa
reviewerPATCH 1/1 selftests/bpf: Add missing prototypes for several test kfuncs
Adding missing prototypes for several kfuncs that are used by test_verifier tests. We don't really need kfunc prototypes for these tests, but adding them to silence 'make W=1' build and to have all test kfuncs declarations in bpf_testmod_kfunc.h.
Also moving __diag_pop for -Wmissing-prototypes to cover also bpf_testmod_test_write and bpf_testmod_test_read and adding bpf_fentry_shadow_test in there as well. All of them need to be exported, but there's no need for declarations.
--- .../selftests/bpf/bpf_testmod/bpf_testmod.c | 16 ++++++++-------- .../bpf/bpf_testmod/bpf_testmod_kfunc.h | 7 +++++++ 2 files changed, 15 insertions(+), 8 deletions(-)
tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c +8 -8
@@ -191,8 +191,6 @@ noinline int bpf_testmod_fentry_test3(char a, int b, u64 c)return a + b + c; } -__diag_pop (); -int bpf_testmod_fentry_ok;noinline ssize_t
@@ -273,6 +271,14 @@ bpf_testmod_test_write(struct file *file, struct kobject *kobj,EXPORT_SYMBOL (bpf_testmod_test_write);ALLOW_ERROR_INJECTION (bpf_testmod_test_write,ERRNO ); +noinline int bpf_fentry_shadow_test(int a) +{ +return a +2 ; +} +EXPORT_SYMBOL_GPL (bpf_fentry_shadow_test); + +__diag_pop (); +static struct bin_attribute bin_attr_bpf_testmod_file__ro_after_init = { .attr = { .name ="bpf_testmod" , .mode =0666 , }, .read = bpf_testmod_test_read,
@@ -462,12 +468,6 @@ static const struct btf_kfunc_id_set bpf_testmod_kfunc_set = { .set = &bpf_testmod_check_kfunc_ids, }; -noinline int bpf_fentry_shadow_test(int a) -{ -return a +2 ; -} -EXPORT_SYMBOL_GPL (bpf_fentry_shadow_test); -extern int bpf_fentry_test1 (int a);static int bpf_testmod_init (void )
tools/testing/selftests/bpf/bpf_testmod/bpf_testmod_kfunc.h +7 -0
@@ -97,4 +97,11 @@ void bpf_kfunc_call_test_mem_len_fail2(__u64 *mem, int len) __ksym; void bpf_kfunc_call_test_destructive(void) __ksym; +void bpf_kfunc_call_test_offset (struct prog_test_ref_kfunc *p); +struct prog_test_member *bpf_kfunc_call_memb_acquire (void ); +void bpf_kfunc_call_memb1_release (struct prog_test_member1 *p); +void bpf_kfunc_call_test_fail1 (struct prog_test_fail1 *p); +void bpf_kfunc_call_test_fail2 (struct prog_test_fail2 *p); +void bpf_kfunc_call_test_fail3 (struct prog_test_fail3 *p); +void bpf_kfunc_call_test_mem_len_fail1 (void *mem,int len);#endif /* _BPF_TESTMOD_KFUNC_H */
Signature · 1 line
2.40.1
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 11 lines · On Wed, 7 Jun 2023 15:40:46 -0700 you wrote:
Adding missing prototypes for several kfuncs that are used by
test_verifiertests. We don't really need kfunc prototypes for these tests, but adding them to silence 'make W=1' build and to have all test kfuncs declarations inbpf_testmod_kfunc.h.Also moving
__diag_popfor -Wmissing-prototypes to cover alsobpf_testmod_test_writeandbpf_testmod_test_readand addingbpf_fentry_shadow_testin there as well. All of them need to be exported, but there's no need for declarations.[...]
Here is the summary with links:
- [bpf-next] selftests/bpf: Add missing prototypes for several test kfuncs
https://git.kernel.org/bpf/bpf-next/c/67faabbde36b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html