selftests/bpf: make BPF_CFLAGS stricter with -Wall
Subsystems (4)
Andrii Nakryiko
maintainercover selftests/bpf: make BPF_CFLAGS stricter with -Wall
Make BPF-side compiler flags stricter by adding -Wall. Fix tons of small issues pointed out by compiler immediately after that. That includes newly added bpf_for(), bpf_for_each(), and bpf_repeat() macros.
Andrii Nakryiko (4):
selftests/bpf: prevent unused variable warning in bpf_for() selftests/bpf: add __sink() macro to fake variable consumption selftests/bpf: fix lots of silly mistakes pointed out by compiler selftests/bpf: make BPF compiler flags stricter
tools/testing/selftests/bpf/Makefile | 4 +- .../selftests/bpf/progs/bpf_iter_ksym.c | 1 - .../selftests/bpf/progs/bpf_iter_setsockopt.c | 1 - tools/testing/selftests/bpf/progs/bpf_loop.c | 2 - tools/testing/selftests/bpf/progs/bpf_misc.h | 12 ++++-- tools/testing/selftests/bpf/progs/cb_refs.c | 1 - .../bpf/progs/cgroup_skb_sk_lookup_kern.c | 1 - .../selftests/bpf/progs/cgrp_kfunc_failure.c | 1 + .../bpf/progs/cgrp_ls_attach_cgroup.c | 1 - .../selftests/bpf/progs/cgrp_ls_sleepable.c | 1 - tools/testing/selftests/bpf/progs/core_kern.c | 2 +- .../selftests/bpf/progs/cpumask_failure.c | 3 ++ .../selftests/bpf/progs/cpumask_success.c | 1 - .../testing/selftests/bpf/progs/dynptr_fail.c | 5 ++- .../selftests/bpf/progs/dynptr_success.c | 5 +-- .../selftests/bpf/progs/fexit_bpf2bpf.c | 2 - .../bpf/progs/freplace_attach_probe.c | 2 +- tools/testing/selftests/bpf/progs/iters.c | 11 +++-- .../selftests/bpf/progs/linked_funcs1.c | 3 ++ .../selftests/bpf/progs/linked_funcs2.c | 3 ++ .../testing/selftests/bpf/progs/linked_list.c | 4 -- .../selftests/bpf/progs/linked_list_fail.c | 1 - .../selftests/bpf/progs/local_storage.c | 1 - tools/testing/selftests/bpf/progs/map_kptr.c | 3 -- .../testing/selftests/bpf/progs/netcnt_prog.c | 1 - .../selftests/bpf/progs/netif_receive_skb.c | 1 - .../selftests/bpf/progs/perfbuf_bench.c | 1 - tools/testing/selftests/bpf/progs/pyperf.h | 2 +- .../progs/rbtree_btf_fail__wrong_node_type.c | 11 ----- .../testing/selftests/bpf/progs/rbtree_fail.c | 3 +- .../selftests/bpf/progs/rcu_read_lock.c | 4 -- .../bpf/progs/read_bpf_task_storage_busy.c | 1 - .../selftests/bpf/progs/recvmsg4_prog.c | 2 - .../selftests/bpf/progs/recvmsg6_prog.c | 2 - .../selftests/bpf/progs/sendmsg4_prog.c | 2 - .../bpf/progs/sockmap_verdict_prog.c | 4 ++ .../testing/selftests/bpf/progs/strobemeta.h | 1 - .../selftests/bpf/progs/tailcall_bpf2bpf3.c | 11 +++++ .../selftests/bpf/progs/tailcall_bpf2bpf6.c | 3 ++ .../selftests/bpf/progs/task_kfunc_failure.c | 1 + .../selftests/bpf/progs/task_kfunc_success.c | 6 --- .../testing/selftests/bpf/progs/test_bpf_nf.c | 1 - .../bpf/progs/test_cls_redirect_dynptr.c | 1 - .../progs/test_core_reloc_bitfields_probed.c | 1 - .../selftests/bpf/progs/test_global_func1.c | 4 ++ .../selftests/bpf/progs/test_global_func2.c | 4 ++ .../selftests/bpf/progs/test_hash_large_key.c | 2 +- .../bpf/progs/test_ksyms_btf_write_check.c | 1 - .../selftests/bpf/progs/test_legacy_printk.c | 2 +- .../selftests/bpf/progs/test_map_lock.c | 2 +- .../testing/selftests/bpf/progs/test_obj_id.c | 2 + .../bpf/progs/test_parse_tcp_hdr_opt.c | 1 - .../bpf/progs/test_parse_tcp_hdr_opt_dynptr.c | 2 +- .../selftests/bpf/progs/test_pkt_access.c | 5 +++ .../selftests/bpf/progs/test_ringbuf.c | 1 - .../bpf/progs/test_ringbuf_map_key.c | 1 + .../selftests/bpf/progs/test_ringbuf_multi.c | 1 - .../bpf/progs/test_select_reuseport_kern.c | 2 +- .../selftests/bpf/progs/test_sk_assign.c | 4 +- .../selftests/bpf/progs/test_sk_lookup.c | 9 +--- .../selftests/bpf/progs/test_sk_lookup_kern.c | 2 - .../selftests/bpf/progs/test_sock_fields.c | 2 +- .../selftests/bpf/progs/test_sockmap_kern.h | 14 ++++-- .../selftests/bpf/progs/test_spin_lock.c | 3 ++ .../selftests/bpf/progs/test_tc_dtime.c | 4 +- .../selftests/bpf/progs/test_tc_neigh.c | 4 +- .../selftests/bpf/progs/test_tcpbpf_kern.c | 2 - .../selftests/bpf/progs/test_tunnel_kern.c | 6 --- .../selftests/bpf/progs/test_usdt_multispec.c | 2 - .../selftests/bpf/progs/test_verif_scale1.c | 2 +- .../selftests/bpf/progs/test_verif_scale2.c | 2 +- .../selftests/bpf/progs/test_verif_scale3.c | 2 +- .../bpf/progs/test_xdp_adjust_tail_grow.c | 2 - .../selftests/bpf/progs/test_xdp_bpf2bpf.c | 2 - .../selftests/bpf/progs/test_xdp_dynptr.c | 2 - .../selftests/bpf/progs/test_xdp_noinline.c | 43 ------------------- .../selftests/bpf/progs/test_xdp_vlan.c | 13 ------ tools/testing/selftests/bpf/progs/type_cast.c | 1 - tools/testing/selftests/bpf/progs/udp_limit.c | 2 - .../bpf/progs/user_ringbuf_success.c | 6 --- .../selftests/bpf/progs/xdp_features.c | 1 - .../testing/selftests/bpf/progs/xdping_kern.c | 2 - tools/testing/selftests/bpf/progs/xdpwall.c | 1 - 83 files changed, 101 insertions(+), 192 deletions(-)
Signature · 1 line
2.34.1
Andrii Nakryiko
maintainerPATCH 1/4 selftests/bpf: prevent unused variable warning in bpf_for()
Add __attribute__((unused)) to inner __p variable inside bpf_for(), bpf_for_each(), and bpf_repeat() macros to avoid compiler warnings about unused variable.
--- tools/testing/selftests/bpf/progs/bpf_misc.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/progs/bpf_misc.h +6 -3
@@ -115,7 +115,8 @@ extern void bpf_iter_num_destroy(struct bpf_iter_num *it) __ksym; struct bpf_iter_##type ___it __attribute__((aligned(8), /* enforce, just in case */, \ cleanup(bpf_iter_##type##_destroy))), \ /* ___p pointer is just to call bpf_iter_##type##_new() *once* to init ___it */ \ - *___p = (bpf_iter_##type##_new(&___it, ##args), \ + *___p __attribute__((unused)) = ( \ + bpf_iter_##type##_new(&___it, ##args), \ /* this is a workaround for Clang bug: it currently doesn't emit BTF */ \/* for bpf_iter_##type##_destroy() when used from cleanup() attribute */ \ (void)bpf_iter_##type##_destroy, (void *)0); \
@@ -143,7 +144,8 @@ extern void bpf_iter_num_destroy(struct bpf_iter_num *it) __ksym; struct bpf_iter_num ___it __attribute__((aligned(8), /* enforce, just in case */ \ cleanup(bpf_iter_num_destroy))), \/* ___p pointer is necessary to call bpf_iter_num_new() *once* to init ___it */ \ - *___p = (bpf_iter_num_new (&___it, (start), (end)), \ + *___p __attribute__((unused)) = ( \ +bpf_iter_num_new (&___it, (start), (end)), \/* this is a workaround for Clang bug: it currently doesn't emit BTF */ \/* for bpf_iter_num_destroy() when used from cleanup() attribute */ \ (void )bpf_iter_num_destroy, (void *)0 ); \
@@ -167,7 +169,8 @@ extern void bpf_iter_num_destroy(struct bpf_iter_num *it) __ksym; struct bpf_iter_num ___it __attribute__((aligned(8), /* enforce, just in case */ \ cleanup(bpf_iter_num_destroy))), \/* ___p pointer is necessary to call bpf_iter_num_new() *once* to init ___it */ \ - *___p = (bpf_iter_num_new (&___it,0 , (N )), \ + *___p __attribute__((unused)) = ( \ +bpf_iter_num_new (&___it,0 , (N )), \/* this is a workaround for Clang bug: it currently doesn't emit BTF */ \/* for bpf_iter_num_destroy() when used from cleanup() attribute */ \ (void )bpf_iter_num_destroy, (void *)0 ); \
Signature · 1 line
2.34.1
Andrii Nakryiko
maintainerPATCH 2/4 selftests/bpf: add __sink() macro to fake variable consumption
In reply to Andrii NakryikoAdd __sink(expr) macro that forces compiler to believe that passed in expression is both read and written. It used a simple embedded asm for this. This is useful in a lot of tests where we assign value to some variable to trigger some action, but later don't read variable, causing compiler to complain (if corresponding compiler warnings are turned on, which we'll do in the next patch).
--- tools/testing/selftests/bpf/progs/bpf_misc.h | 3 +++ 1 file changed, 3 insertions(+)
tools/testing/selftests/bpf/progs/bpf_misc.h +3 -0
@@ -76,6 +76,9 @@#define FUNC_REG_ARG_CNT 5#endif +/* make it look to compiler like value is read and written */ +#define __sink (expr) asm volatile("" : "+g"(expr)) +struct bpf_iter_num ; extern int bpf_iter_num_new(struct bpf_iter_num *it, int start, int end) __ksym;
Signature · 1 line
2.34.1
Andrii Nakryiko
maintainerPATCH 3/4 selftests/bpf: fix lots of silly mistakes pointed out by compiler
In reply to Andrii NakryikoOnce we enable -Wall for BPF sources, compiler will complain about lots of unused variables, variables that are set but never read, etc.
Fix all these issues first before enabling -Wall in Makefile.
--- .../selftests/bpf/progs/bpf_iter_ksym.c | 1 - .../selftests/bpf/progs/bpf_iter_setsockopt.c | 1 - tools/testing/selftests/bpf/progs/bpf_loop.c | 2 - tools/testing/selftests/bpf/progs/cb_refs.c | 1 - .../bpf/progs/cgroup_skb_sk_lookup_kern.c | 1 - .../selftests/bpf/progs/cgrp_kfunc_failure.c | 1 + .../bpf/progs/cgrp_ls_attach_cgroup.c | 1 - .../selftests/bpf/progs/cgrp_ls_sleepable.c | 1 - tools/testing/selftests/bpf/progs/core_kern.c | 2 +- .../selftests/bpf/progs/cpumask_failure.c | 3 ++ .../selftests/bpf/progs/cpumask_success.c | 1 - .../testing/selftests/bpf/progs/dynptr_fail.c | 5 ++- .../selftests/bpf/progs/dynptr_success.c | 5 +-- .../selftests/bpf/progs/fexit_bpf2bpf.c | 2 - .../bpf/progs/freplace_attach_probe.c | 2 +- tools/testing/selftests/bpf/progs/iters.c | 11 +++-- .../selftests/bpf/progs/linked_funcs1.c | 3 ++ .../selftests/bpf/progs/linked_funcs2.c | 3 ++ .../testing/selftests/bpf/progs/linked_list.c | 4 -- .../selftests/bpf/progs/linked_list_fail.c | 1 - .../selftests/bpf/progs/local_storage.c | 1 - tools/testing/selftests/bpf/progs/map_kptr.c | 3 -- .../testing/selftests/bpf/progs/netcnt_prog.c | 1 - .../selftests/bpf/progs/netif_receive_skb.c | 1 - .../selftests/bpf/progs/perfbuf_bench.c | 1 - tools/testing/selftests/bpf/progs/pyperf.h | 2 +- .../progs/rbtree_btf_fail__wrong_node_type.c | 11 ----- .../testing/selftests/bpf/progs/rbtree_fail.c | 3 +- .../selftests/bpf/progs/rcu_read_lock.c | 4 -- .../bpf/progs/read_bpf_task_storage_busy.c | 1 - .../selftests/bpf/progs/recvmsg4_prog.c | 2 - .../selftests/bpf/progs/recvmsg6_prog.c | 2 - .../selftests/bpf/progs/sendmsg4_prog.c | 2 - .../bpf/progs/sockmap_verdict_prog.c | 4 ++ .../testing/selftests/bpf/progs/strobemeta.h | 1 - .../selftests/bpf/progs/tailcall_bpf2bpf3.c | 11 +++++ .../selftests/bpf/progs/tailcall_bpf2bpf6.c | 3 ++ .../selftests/bpf/progs/task_kfunc_failure.c | 1 + .../selftests/bpf/progs/task_kfunc_success.c | 6 --- .../testing/selftests/bpf/progs/test_bpf_nf.c | 1 - .../bpf/progs/test_cls_redirect_dynptr.c | 1 - .../progs/test_core_reloc_bitfields_probed.c | 1 - .../selftests/bpf/progs/test_global_func1.c | 4 ++ .../selftests/bpf/progs/test_global_func2.c | 4 ++ .../selftests/bpf/progs/test_hash_large_key.c | 2 +- .../bpf/progs/test_ksyms_btf_write_check.c | 1 - .../selftests/bpf/progs/test_legacy_printk.c | 2 +- .../selftests/bpf/progs/test_map_lock.c | 2 +- .../testing/selftests/bpf/progs/test_obj_id.c | 2 + .../bpf/progs/test_parse_tcp_hdr_opt.c | 1 - .../bpf/progs/test_parse_tcp_hdr_opt_dynptr.c | 2 +- .../selftests/bpf/progs/test_pkt_access.c | 5 +++ .../selftests/bpf/progs/test_ringbuf.c | 1 - .../bpf/progs/test_ringbuf_map_key.c | 1 + .../selftests/bpf/progs/test_ringbuf_multi.c | 1 - .../bpf/progs/test_select_reuseport_kern.c | 2 +- .../selftests/bpf/progs/test_sk_assign.c | 4 +- .../selftests/bpf/progs/test_sk_lookup.c | 9 +--- .../selftests/bpf/progs/test_sk_lookup_kern.c | 2 - .../selftests/bpf/progs/test_sock_fields.c | 2 +- .../selftests/bpf/progs/test_sockmap_kern.h | 14 ++++-- .../selftests/bpf/progs/test_spin_lock.c | 3 ++ .../selftests/bpf/progs/test_tc_dtime.c | 4 +- .../selftests/bpf/progs/test_tc_neigh.c | 4 +- .../selftests/bpf/progs/test_tcpbpf_kern.c | 2 - .../selftests/bpf/progs/test_tunnel_kern.c | 6 --- .../selftests/bpf/progs/test_usdt_multispec.c | 2 - .../selftests/bpf/progs/test_verif_scale1.c | 2 +- .../selftests/bpf/progs/test_verif_scale2.c | 2 +- .../selftests/bpf/progs/test_verif_scale3.c | 2 +- .../bpf/progs/test_xdp_adjust_tail_grow.c | 2 - .../selftests/bpf/progs/test_xdp_bpf2bpf.c | 2 - .../selftests/bpf/progs/test_xdp_dynptr.c | 2 - .../selftests/bpf/progs/test_xdp_noinline.c | 43 ------------------- .../selftests/bpf/progs/test_xdp_vlan.c | 13 ------ tools/testing/selftests/bpf/progs/type_cast.c | 1 - tools/testing/selftests/bpf/progs/udp_limit.c | 2 - .../bpf/progs/user_ringbuf_success.c | 6 --- .../selftests/bpf/progs/xdp_features.c | 1 - .../testing/selftests/bpf/progs/xdping_kern.c | 2 - tools/testing/selftests/bpf/progs/xdpwall.c | 1 - 81 files changed, 90 insertions(+), 187 deletions(-)
tools/testing/selftests/bpf/progs/bpf_iter_ksym.c +0 -1
@@ -33,7 +33,6 @@ int dump_ksym(struct bpf_iter__ksym *ctx)__u32 seq_num = ctx->meta->seq_num;unsigned long value;char type; -int ret;if (!iter)return 0 ;
tools/testing/selftests/bpf/progs/bpf_iter_setsockopt.c +0 -1
@@ -42,7 +42,6 @@ int change_tcp_cc(struct bpf_iter__tcp *ctx)char cur_cc[TCP_CA_NAME_MAX ];struct tcp_sock *tp;struct sock *sk; -int ret;if (!bpf_tcp_sk (ctx->sk_common))return 0 ;
tools/testing/selftests/bpf/progs/bpf_loop.c +0 -2
@@ -138,8 +138,6 @@ static int callback_set_0f(int i, void *ctx) SEC("fentry/" SYS_PREFIX "sys_nanosleep")int prog_non_constant_callback (void *ctx) { -struct callback_ctx data = {}; -if (bpf_get_current_pid_tgid () >>32 != pid)return 0 ;
tools/testing/selftests/bpf/progs/cb_refs.c +0 -1
@@ -52,7 +52,6 @@ int leak_prog(void *ctx) {struct prog_test_ref_kfunc *p;struct map_value *v; -unsigned long sl; v =bpf_map_lookup_elem (&array_map, &(int ){0 });if (!v)
tools/testing/selftests/bpf/progs/cgroup_skb_sk_lookup_kern.c +0 -1
@@ -66,7 +66,6 @@ static inline int is_allowed_peer_cg(struct __sk_buff *skb, SEC("cgroup_skb/ingress")int ingress_lookup (struct __sk_buff *skb) { -__u32 serv_port_key =0 ;struct ipv6hdr ip6h;struct tcphdr tcph;
tools/testing/selftests/bpf/progs/cgrp_kfunc_failure.c +1 -0
@@ -109,6 +109,7 @@ int BPF_PROG(cgrp_kfunc_acquire_unreleased, struct cgroup *cgrp, const char *pat acquired =bpf_cgroup_acquire (cgrp);/* Acquired cgroup is never released. */ +__sink (acquired);return 0 ; }
tools/testing/selftests/bpf/progs/cgrp_ls_attach_cgroup.c +0 -1
@@ -84,7 +84,6 @@ int BPF_PROG(update_cookie_tracing, struct socket *sock, struct sockaddr *uaddr, int addr_len, int flags) { struct socket_cookie *p; -struct tcp_sock *tcp_sk;if (uaddr->sa_family !=AF_INET6 )return 0 ;
tools/testing/selftests/bpf/progs/cgrp_ls_sleepable.c +0 -1
@@ -24,7 +24,6 @@ void bpf_rcu_read_unlock(void) __ksym; SEC("?iter.s/cgroup")int cgroup_iter (struct bpf_iter__cgroup *ctx) { -struct seq_file *seq = ctx->meta->seq;struct cgroup *cgrp = ctx->cgroup;long *ptr;
tools/testing/selftests/bpf/progs/core_kern.c +1 -1
@@ -77,7 +77,7 @@ int balancer_ingress(struct __sk_buff *ctx)void *data_end = (void *)(long )ctx->data_end;void *data = (void *)(long )ctx->data;void *ptr; -int ret =0 , nh_off, i =0 ; +int nh_off, i =0 ; nh_off =14 ;
tools/testing/selftests/bpf/progs/cpumask_failure.c +3 -0
@@ -23,6 +23,7 @@ int BPF_PROG(test_alloc_no_release, struct task_struct *task, u64 clone_flags)struct bpf_cpumask *cpumask; cpumask =create_cpumask (); +__sink (cpumask);/* cpumask is never released. */ return 0 ;
@@ -51,6 +52,7 @@ int BPF_PROG(test_acquire_wrong_cpumask, struct task_struct *task, u64 clone_fla/* Can't acquire a non-struct bpf_cpumask. */ cpumask =bpf_cpumask_acquire ((struct bpf_cpumask *)task->cpus_ptr); +__sink (cpumask);return 0 ; }
@@ -63,6 +65,7 @@ int BPF_PROG(test_mutate_cpumask, struct task_struct *task, u64 clone_flags)/* Can't set the CPU of a non-struct bpf_cpumask. */ bpf_cpumask_set_cpu (0 , (struct bpf_cpumask *)task->cpus_ptr); +__sink (cpumask);return 0 ; }
tools/testing/selftests/bpf/progs/cpumask_success.c +0 -1
@@ -353,7 +353,6 @@ SEC("tp_btf/task_newtask")int BPF_PROG (test_insert_leave ,struct task_struct *task,u64 clone_flags) {struct bpf_cpumask *cpumask; -struct __cpumask_map_value *v; cpumask =create_cpumask ();if (!cpumask)
tools/testing/selftests/bpf/progs/dynptr_fail.c +3 -2
@@ -271,7 +271,7 @@ SEC("?raw_tp") __failure __msg("value is outside of the allowed memory range")int data_slice_out_of_bounds_map_value (void *ctx) { -__u32 key =0 , map_val; +__u32 map_val;struct bpf_dynptr ptr;void *data;
@@ -388,7 +388,6 @@ int data_slice_missing_null_check2(void *ctx)/* this should fail */ *data2 =3 ; -done:bpf_ringbuf_discard_dynptr (&ptr,0 );return 0 ; }
@@ -440,6 +439,7 @@ int invalid_write1(void *ctx)/* this should fail */ data =bpf_dynptr_data (&ptr,0 ,1 ); +__sink (data);return 0 ; }
@@ -1374,6 +1374,7 @@ int invalid_slice_rdwr_rdonly(struct __sk_buff *skb)* changing packet data */ hdr =bpf_dynptr_slice_rdwr (&ptr,0 , buffer,sizeof (buffer)); +__sink (hdr);return 0 ; }
tools/testing/selftests/bpf/progs/dynptr_success.c +1 -4
@@ -35,7 +35,7 @@ SEC("?tp/syscalls/sys_enter_nanosleep")int test_read_write (void *ctx) {char write_data[64 ] ="hello there, world!!" ; -char read_data[64 ] = {}, buf[64 ] = {}; +char read_data[64 ] = {};struct bpf_dynptr ptr;int i;
@@ -170,7 +170,6 @@ int test_skb_readonly(struct __sk_buff *skb) {__u8 write_data[2 ] = {1 ,2 };struct bpf_dynptr ptr; -__u64 *data;int ret;if (bpf_dynptr_from_skb (skb,0 , &ptr)) {
@@ -191,10 +190,8 @@ int test_skb_readonly(struct __sk_buff *skb) SEC("?cgroup_skb/egress")int test_dynptr_skb_data (struct __sk_buff *skb) { -__u8 write_data[2 ] = {1 ,2 };struct bpf_dynptr ptr;__u64 *data; -int ret;if (bpf_dynptr_from_skb (skb,0 , &ptr)) { err =1 ;
tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c +0 -2
@@ -120,8 +120,6 @@ int new_get_skb_ifindex(int val, struct __sk_buff *skb, int var)void *data = (void *)(long )skb->data;struct ipv6hdr ip6, *ip6p;int ifindex = skb->ifindex; -__u32 eth_proto; -__u32 nh_off;/* check that BPF extension can read packet via direct packet access */ if (data +14 +sizeof (ip6) > data_end)
tools/testing/selftests/bpf/progs/freplace_attach_probe.c +1 -1
@@ -23,7 +23,7 @@ struct { SEC("freplace/handle_kprobe")int new_handle_kprobe (struct pt_regs *ctx) { -struct hmap_elem zero = {}, *val; +struct hmap_elem *val;int key =0 ; val =bpf_map_lookup_elem (&hash_map, &key);
tools/testing/selftests/bpf/progs/iters.c +5 -6
@@ -45,7 +45,6 @@ __failure __msg("unbounded memory access")int iter_err_unsafe_asm_loop (const void *ctx) {struct bpf_iter_num it; -int *v, i =0 ;MY_PID_GUARD ();
@@ -88,7 +87,7 @@ __successint iter_while_loop (const void *ctx) {struct bpf_iter_num it; -int *v, i; +int *v;MY_PID_GUARD ();
@@ -106,7 +105,7 @@ __successint iter_while_loop_auto_cleanup (const void *ctx) { __attribute__((cleanup (bpf_iter_num_destroy)))struct bpf_iter_num it; -int *v, i; +int *v;MY_PID_GUARD ();
@@ -124,7 +123,7 @@ __successint iter_for_loop (const void *ctx) {struct bpf_iter_num it; -int *v, i; +int *v;MY_PID_GUARD ();
@@ -192,7 +191,7 @@ __successint iter_manual_unroll_loop (const void *ctx) {struct bpf_iter_num it; -int *v, i; +int *v;MY_PID_GUARD ();
@@ -621,7 +620,7 @@ __successint iter_stack_array_loop (const void *ctx) {long arr1[16 ], arr2[16 ], sum =0 ; -int *v, i; +int i;MY_PID_GUARD ();
tools/testing/selftests/bpf/progs/linked_funcs1.c +3 -0
@@ -5,6 +5,7 @@#include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> #include <bpf/bpf_core_read.h> +#include "bpf_misc.h" /* weak and shared between two files */ const volatile int my_tid__weak ;
@@ -51,6 +52,7 @@ __weak int set_output_weak(int x)* cause problems for BPF static linker */ whatever = bpf_core_type_size(struct task_struct); +__sink (whatever); output_weak1 = x;return x;
@@ -71,6 +73,7 @@ int BPF_PROG(handler1, struct pt_regs *regs, long id)/* make sure we have CO-RE relocations in main program */ whatever = bpf_core_type_size(struct task_struct); +__sink (whatever);set_output_val2 (1000 );set_output_ctx2 (ctx);/* ctx definition is hidden in BPF_PROG macro */
tools/testing/selftests/bpf/progs/linked_funcs2.c +3 -0
@@ -5,6 +5,7 @@#include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> #include <bpf/bpf_core_read.h> +#include "bpf_misc.h" /* weak and shared between both files */ const volatile int my_tid__weak ;
@@ -51,6 +52,7 @@ __weak int set_output_weak(int x)* cause problems for BPF static linker */ whatever = 2 * bpf_core_type_size(struct task_struct); +__sink (whatever); output_weak2 = x;return 2 * x;
@@ -71,6 +73,7 @@ int BPF_PROG(handler2, struct pt_regs *regs, long id)/* make sure we have CO-RE relocations in main program */ whatever = bpf_core_type_size(struct task_struct); +__sink (whatever);set_output_val1 (2000 );set_output_ctx1 (ctx);/* ctx definition is hidden in BPF_PROG macro */
tools/testing/selftests/bpf/progs/linked_list.c +0 -4
@@ -313,7 +313,6 @@ SEC("tc")int map_list_push_pop_multiple (void *ctx) {struct map_value *v; -int ret; v =bpf_map_lookup_elem (&array_map, &(int ){0 });if (!v)
@@ -326,7 +325,6 @@ int inner_map_list_push_pop_multiple(void *ctx) {struct map_value *v;void *map; -int ret; map =bpf_map_lookup_elem (&map_of_maps, &(int ){0 });if (!map)
@@ -352,7 +350,6 @@ SEC("tc")int map_list_in_list (void *ctx) {struct map_value *v; -int ret; v =bpf_map_lookup_elem (&array_map, &(int ){0 });if (!v)
@@ -365,7 +362,6 @@ int inner_map_list_in_list(void *ctx) {struct map_value *v;void *map; -int ret; map =bpf_map_lookup_elem (&map_of_maps, &(int ){0 });if (!map)
tools/testing/selftests/bpf/progs/linked_list_fail.c +0 -1
@@ -557,7 +557,6 @@ SEC("?tc")int incorrect_head_off2 (void *ctx) {struct foo *f; -struct bar *b; f =bpf_obj_new (typeof (*f));if (!f)
tools/testing/selftests/bpf/progs/local_storage.c +0 -1
@@ -77,7 +77,6 @@ int BPF_PROG(inode_rename, struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry, unsigned int flags) { - __u32 pid = bpf_get_current_pid_tgid() >> 32; struct local_storage *storage;int err;
tools/testing/selftests/bpf/progs/map_kptr.c +0 -3
@@ -515,7 +515,6 @@ int test_ls_map_kptr_ref1(void *ctx) {struct task_struct *current;struct map_value *v; -int ret; current =bpf_get_current_task_btf ();if (!current)
@@ -534,7 +533,6 @@ int test_ls_map_kptr_ref2(void *ctx) {struct task_struct *current;struct map_value *v; -int ret; current =bpf_get_current_task_btf ();if (!current)
@@ -550,7 +548,6 @@ int test_ls_map_kptr_ref_del(void *ctx) {struct task_struct *current;struct map_value *v; -int ret; current =bpf_get_current_task_btf ();if (!current)
tools/testing/selftests/bpf/progs/netcnt_prog.c +0 -1
@@ -26,7 +26,6 @@ SEC("cgroup/skb")int bpf_nextcnt (struct __sk_buff *skb) {union percpu_net_cnt *percpu_cnt; -char fmt[] ="%d %llu %llu\n" ;union net_cnt *cnt;__u64 ts, dt;int ret;
tools/testing/selftests/bpf/progs/netif_receive_skb.c +0 -1
@@ -53,7 +53,6 @@ static int __strncmp(const void *m1, const void *m2, size_t len) do { \ static const char _expectedval[EXPECTED_STRSIZE] = \ _expected; \ - static const char _ptrtype[64] = #_type; \ __u64 _hflags = _flags | BTF_F_COMPACT; \ static _type _ptrdata = __VA_ARGS__; \ static struct btf_ptr _ptr = { }; \
tools/testing/selftests/bpf/progs/perfbuf_bench.c +0 -1
@@ -22,7 +22,6 @@ long dropped __attribute__((aligned(128))) = 0; SEC("fentry/" SYS_PREFIX "sys_getpgid")int bench_perfbuf (void *ctx) { -__u64 *sample;int i;for (i =0 ; i < batch_cnt; i++) {
tools/testing/selftests/bpf/progs/pyperf.h +1 -1
@@ -345,7 +345,7 @@ int __on_event(struct bpf_raw_tracepoint_args *ctx) SEC("raw_tracepoint/kfree_skb")int on_event (struct bpf_raw_tracepoint_args * ctx) { -int i, ret =0 ; +int ret =0 ; ret |=__on_event (ctx); ret |=__on_event (ctx); ret |=__on_event (ctx);
tools/testing/selftests/bpf/progs/rbtree_btf_fail__wrong_node_type.c +0 -11
@@ -16,17 +16,6 @@ struct node_data {struct bpf_list_node node; }; -static bool less (struct bpf_rb_node *a,const struct bpf_rb_node *b) -{ -struct node_data *node_a; -struct node_data *node_b; - - node_a = container_of(a, struct node_data, node); - node_b = container_of(b, struct node_data, node); - -return node_a->key < node_b->key; -} -#define private (name) SEC(".data." #name) __hidden __attribute__((aligned(8))) private(A) struct bpf_spin_lock glock; private(A) struct bpf_rb_root groot __contains(node_data, node);
tools/testing/selftests/bpf/progs/rbtree_fail.c +2 -1
@@ -105,7 +105,7 @@ long rbtree_api_remove_unadded_node(void *ctx) } SEC("?tc") -__failure __msg("Unreleased reference id=2 alloc_insn=11") +__failure __msg("Unreleased reference id=2 alloc_insn=10") long rbtree_api_remove_no_drop(void *ctx) {struct bpf_rb_node *res;
@@ -119,6 +119,7 @@ long rbtree_api_remove_no_drop(void *ctx) res =bpf_rbtree_remove (&groot, res); n = container_of(res, struct node_data, node); +__sink (n);bpf_spin_unlock (&glock);/* bpf_obj_drop(n) is missing here */
tools/testing/selftests/bpf/progs/rcu_read_lock.c +0 -4
@@ -179,8 +179,6 @@ SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")int miss_lock (void *ctx) {struct task_struct *task; -struct css_set *cgroups; -struct cgroup *dfl_cgrp;/* missing bpf_rcu_read_lock() */ task =bpf_get_current_task_btf ();
@@ -195,8 +193,6 @@ SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")int miss_unlock (void *ctx) {struct task_struct *task; -struct css_set *cgroups; -struct cgroup *dfl_cgrp;/* missing bpf_rcu_read_unlock() */ task =bpf_get_current_task_btf ();
tools/testing/selftests/bpf/progs/read_bpf_task_storage_busy.c +0 -1
@@ -23,7 +23,6 @@ SEC("raw_tp/sys_enter")int BPF_PROG (read_bpf_task_storage_busy ) {int *value; -int key;if (!CONFIG_PREEMPT )return 0 ;
tools/testing/selftests/bpf/progs/recvmsg4_prog.c +0 -2
@@ -17,8 +17,6 @@ SEC("cgroup/recvmsg4")int recvmsg4_prog (struct bpf_sock_addr *ctx) {struct bpf_sock *sk; -__u32 user_ip4; -__u16 user_port; sk = ctx->sk;if (!sk)
tools/testing/selftests/bpf/progs/recvmsg6_prog.c +0 -2
@@ -20,8 +20,6 @@ SEC("cgroup/recvmsg6")int recvmsg6_prog (struct bpf_sock_addr *ctx) {struct bpf_sock *sk; -__u32 user_ip4; -__u16 user_port; sk = ctx->sk;if (!sk)
tools/testing/selftests/bpf/progs/sendmsg4_prog.c +0 -2
@@ -21,8 +21,6 @@ SEC("cgroup/sendmsg4")int sendmsg_v4_prog (struct bpf_sock_addr *ctx) { -int prio; -if (ctx->type !=SOCK_DGRAM )return 0 ;
tools/testing/selftests/bpf/progs/sockmap_verdict_prog.c +4 -0
@@ -1,6 +1,7 @@#include <linux/bpf.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_endian.h> +#include "bpf_misc.h" struct { __uint(type, BPF_MAP_TYPE_SOCKMAP);
@@ -40,6 +41,9 @@ int bpf_prog2(struct __sk_buff *skb)__u8 *d = data;__u8 sk, map; +__sink (lport); +__sink (rport); +if (data +8 > data_end)return SK_DROP ;
tools/testing/selftests/bpf/progs/strobemeta.h +0 -1
@@ -391,7 +391,6 @@ static __always_inline void *read_map_var(struct strobemeta_cfg *cfg,struct strobe_map_raw map;void *location;uint64_t len; -int i; descr->tag_len =0 ;/* presume no tag is set */ descr->cnt =-1 ;/* presume no value is set */
tools/testing/selftests/bpf/progs/tailcall_bpf2bpf3.c +11 -0
@@ -2,6 +2,7 @@#include <linux/bpf.h> #include <bpf/bpf_helpers.h> #include "bpf_legacy.h" +#include "bpf_misc.h" struct { __uint(type, BPF_MAP_TYPE_PROG_ARRAY);
@@ -20,6 +21,8 @@ int subprog_tail2(struct __sk_buff *skb)else bpf_tail_call_static (skb, &jmp_table,1 ); +__sink (arr[sizeof (arr) -1 ]); +return skb->len; }
@@ -30,6 +33,8 @@ int subprog_tail(struct __sk_buff *skb)bpf_tail_call_static (skb, &jmp_table,0 ); +__sink (arr[sizeof (arr) -1 ]); +return skb->len *2 ; }
@@ -38,6 +43,8 @@ int classifier_0(struct __sk_buff *skb) {volatile char arr[128 ] = {}; +__sink (arr[sizeof (arr) -1 ]); +return subprog_tail2 (skb); }
@@ -46,6 +53,8 @@ int classifier_1(struct __sk_buff *skb) {volatile char arr[128 ] = {}; +__sink (arr[sizeof (arr) -1 ]); +return skb->len *3 ; }
@@ -54,6 +63,8 @@ int entry(struct __sk_buff *skb) {volatile char arr[128 ] = {}; +__sink (arr[sizeof (arr) -1 ]); +return subprog_tail (skb); }
tools/testing/selftests/bpf/progs/tailcall_bpf2bpf6.c +3 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/bpf.h> #include <bpf/bpf_helpers.h> +#include "bpf_misc.h" #define __unused __attribute__((unused))
@@ -36,6 +37,8 @@ int entry(struct __sk_buff *skb)/* Have data on stack which size is not a multiple of 8 */ volatile char arr[1 ] = {}; +__sink (arr[0 ]); +return subprog_tail (skb); }
tools/testing/selftests/bpf/progs/task_kfunc_failure.c +1 -0
@@ -109,6 +109,7 @@ int BPF_PROG(task_kfunc_acquire_unreleased, struct task_struct *task, u64 clone_ acquired =bpf_task_acquire (task);/* Acquired task is never released. */ +__sink (acquired);return 0 ; }
tools/testing/selftests/bpf/progs/task_kfunc_success.c +0 -6
@@ -171,8 +171,6 @@ static void lookup_compare_pid(const struct task_struct *p) SEC("tp_btf/task_newtask")int BPF_PROG (test_task_from_pid_arg ,struct task_struct *task,u64 clone_flags) { -struct task_struct *acquired; -if (!is_test_kfunc_task ())return 0 ;
@@ -183,8 +181,6 @@ int BPF_PROG(test_task_from_pid_arg, struct task_struct *task, u64 clone_flags) SEC("tp_btf/task_newtask")int BPF_PROG (test_task_from_pid_current ,struct task_struct *task,u64 clone_flags) { -struct task_struct *current, *acquired; -if (!is_test_kfunc_task ())return 0 ;
@@ -208,8 +204,6 @@ static int is_pid_lookup_valid(s32 pid) SEC("tp_btf/task_newtask")int BPF_PROG (test_task_from_pid_invalid ,struct task_struct *task,u64 clone_flags) { -struct task_struct *acquired; -if (!is_test_kfunc_task ())return 0 ;
tools/testing/selftests/bpf/progs/test_bpf_nf.c +0 -1
@@ -75,7 +75,6 @@ nf_ct_test(struct nf_conn *(*lookup_fn)(void *, struct bpf_sock_tuple *, u32,struct bpf_ct_opts___local opts_def = { .l4proto =IPPROTO_TCP , .netns_id =-1 };struct bpf_sock_tuple bpf_tuple;struct nf_conn *ct; -int err;__builtin_memset (&bpf_tuple,0 ,sizeof (bpf_tuple.ipv4));
tools/testing/selftests/bpf/progs/test_cls_redirect_dynptr.c +0 -1
@@ -455,7 +455,6 @@ static ret_t forward_to_next_hop(struct __sk_buff *skb, struct bpf_dynptr *dynptstatic ret_t skip_next_hops (__u64 *offset,int n) { -__u32 res;switch (n) {case 1 : *offset +=sizeof (struct in_addr );
tools/testing/selftests/bpf/progs/test_core_reloc_bitfields_probed.c +0 -1
@@ -42,7 +42,6 @@ int test_core_bitfields(void *ctx) {struct core_reloc_bitfields *in = (void *)&data.in;struct core_reloc_bitfields_output *out = (void *)&data.out; -uint64_t res; out->ub1 =BPF_CORE_READ_BITFIELD_PROBED (in, ub1); out->ub2 =BPF_CORE_READ_BITFIELD_PROBED (in, ub2);
tools/testing/selftests/bpf/progs/test_global_func1.c +4 -0
@@ -18,6 +18,8 @@ int f1(struct __sk_buff *skb) {volatile char buf[MAX_STACK ] = {}; +__sink (buf[MAX_STACK -1 ]); +return f0 (0 , skb) + skb->len; }
@@ -34,6 +36,8 @@ int f3(int val, struct __sk_buff *skb, int var) {volatile char buf[MAX_STACK ] = {}; +__sink (buf[MAX_STACK -1 ]); +return skb->ifindex * val * var; }
tools/testing/selftests/bpf/progs/test_global_func2.c +4 -0
@@ -18,6 +18,8 @@ int f1(struct __sk_buff *skb) {volatile char buf[MAX_STACK ] = {}; +__sink (buf[MAX_STACK -1 ]); +return f0 (0 , skb) + skb->len; }
@@ -34,6 +36,8 @@ int f3(int val, struct __sk_buff *skb, int var) {volatile char buf[MAX_STACK ] = {}; +__sink (buf[MAX_STACK -1 ]); +return skb->ifindex * val * var; }
tools/testing/selftests/bpf/progs/test_hash_large_key.c +1 -1
@@ -28,7 +28,7 @@ struct bigelement { SEC("raw_tracepoint/sys_enter")int bpf_hash_large_key_test (void *ctx) { -int zero =0 , err =1 , value =42 ; +int zero =0 , value =42 ;struct bigelement *key; key =bpf_map_lookup_elem (&key_map, &zero);
tools/testing/selftests/bpf/progs/test_ksyms_btf_write_check.c +0 -1
@@ -35,7 +35,6 @@ SEC("raw_tp/sys_enter")int handler2 (const void *ctx) {int *active; -__u32 cpu; active =bpf_this_cpu_ptr (&bpf_prog_active);write_active (active);
tools/testing/selftests/bpf/progs/test_legacy_printk.c +1 -1
@@ -56,7 +56,7 @@ int handle_legacy(void *ctx) SEC("tp/raw_syscalls/sys_enter")int handle_modern (void *ctx) { -int zero =0 , cur_pid; +int cur_pid; cur_pid =bpf_get_current_pid_tgid () >>32 ;if (cur_pid != my_pid_var)
tools/testing/selftests/bpf/progs/test_map_lock.c +1 -1
@@ -33,7 +33,7 @@ struct { SEC("cgroup/skb")int bpf_map_lock_test (struct __sk_buff *skb) { -struct hmap_elem zero = {}, *val; +struct hmap_elem *val;int rnd =bpf_get_prandom_u32 ();int key =0 , err =1 , i;struct array_elem *q;
tools/testing/selftests/bpf/progs/test_obj_id.c +2 -0
@@ -4,6 +4,7 @@#include <stddef.h> #include <linux/bpf.h> #include <bpf/bpf_helpers.h> +#include "bpf_misc.h" struct { __uint(type, BPF_MAP_TYPE_ARRAY);
@@ -19,6 +20,7 @@ int test_obj_id(void *ctx)__u64 *value; value =bpf_map_lookup_elem (&test_map_id, &key); +__sink (value);return 0 ; }
tools/testing/selftests/bpf/progs/test_parse_tcp_hdr_opt.c +0 -1
@@ -87,7 +87,6 @@ int xdp_ingress_v6(struct xdp_md *xdp)__u8 tcp_hdr_opt_len =0 ;struct tcphdr *tcp_hdr;__u64 tcp_offset =0 ; -__u32 off;int err; tcp_offset =sizeof (struct ethhdr ) +sizeof (struct ipv6hdr );
tools/testing/selftests/bpf/progs/test_parse_tcp_hdr_opt_dynptr.c +1 -1
@@ -30,7 +30,7 @@ __u32 server_id;static int parse_hdr_opt (struct bpf_dynptr *ptr,__u32 *off,__u8 *hdr_bytes_remaining,__u32 *server_id) { -__u8 *tcp_opt, kind, hdr_len; +__u8 kind, hdr_len;__u8 buffer[sizeof (kind) +sizeof (hdr_len) +sizeof (*server_id)];__u8 *data;
tools/testing/selftests/bpf/progs/test_pkt_access.c +5 -0
@@ -13,6 +13,7 @@#include <linux/pkt_cls.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_endian.h> +#include "bpf_misc.h" /* llvm will optimize both subprograms into exactly the same BPF assembly *
@@ -51,6 +52,8 @@ int get_skb_len(struct __sk_buff *skb) {volatile char buf[MAX_STACK ] = {}; +__sink (buf[MAX_STACK -1 ]); +return skb->len; }
@@ -73,6 +76,8 @@ int get_skb_ifindex(int val, struct __sk_buff *skb, int var) {volatile char buf[MAX_STACK ] = {}; +__sink (buf[MAX_STACK -1 ]); +return skb->ifindex * val * var; }
tools/testing/selftests/bpf/progs/test_ringbuf.c +0 -1
@@ -41,7 +41,6 @@ int test_ringbuf(void *ctx) {int cur_pid =bpf_get_current_pid_tgid () >>32 ;struct sample *sample; -int zero =0 ;if (cur_pid != pid)return 0 ;
tools/testing/selftests/bpf/progs/test_ringbuf_map_key.c +1 -0
@@ -53,6 +53,7 @@ int test_ringbuf_mem_map_key(void *ctx)/* test using 'sample' (PTR_TO_MEM | MEM_ALLOC) as map key arg */ lookup_val = (int *)bpf_map_lookup_elem (&hash_map, sample); +__sink (lookup_val);/* workaround - memcpy is necessary so that verifier doesn't * complain with:
tools/testing/selftests/bpf/progs/test_ringbuf_multi.c +0 -1
@@ -59,7 +59,6 @@ int test_ringbuf(void *ctx)int cur_pid =bpf_get_current_pid_tgid () >>32 ;struct sample *sample;void *rb; -int zero =0 ;if (cur_pid != pid)return 0 ;
tools/testing/selftests/bpf/progs/test_select_reuseport_kern.c +1 -1
@@ -64,7 +64,7 @@ SEC("sk_reuseport")int _select_by_skb_data (struct sk_reuseport_md *reuse_md) {__u32 linum, index =0 , flags =0 , index_zero =0 ; -__u32 *result_cnt, *linum_value; +__u32 *result_cnt;struct data_check data_check = {};struct cmd *cmd, cmd_copy;void *data, *data_end;
tools/testing/selftests/bpf/progs/test_sk_assign.c +2 -2
@@ -15,6 +15,7 @@#include <sys/socket.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_endian.h> +#include "bpf_misc.h" #if defined(IPROUTE2_HAVE_LIBBPF )/* Use a new-style map definition. */
@@ -57,7 +58,6 @@ get_tuple(struct __sk_buff *skb, bool *ipv4, bool *tcp)void *data = (void *)(long )skb->data;struct bpf_sock_tuple *result;struct ethhdr *eth; -__u64 tuple_len;__u8 proto =0 ;__u64 ihl_len;
@@ -94,6 +94,7 @@ get_tuple(struct __sk_buff *skb, bool *ipv4, bool *tcp)return NULL ; *tcp = (proto ==IPPROTO_TCP ); +__sink (ihl_len);return result; }
@@ -173,7 +174,6 @@ int bpf_sk_assign_test(struct __sk_buff *skb)struct bpf_sock_tuple *tuple;bool ipv4 = false;bool tcp = false; -int tuple_len;int ret =0 ; tuple =get_tuple (skb, &ipv4, &tcp);
tools/testing/selftests/bpf/progs/test_sk_lookup.c +2 -7
@@ -391,7 +391,6 @@ SEC("sk_lookup")int ctx_narrow_access (struct bpf_sk_lookup *ctx) {struct bpf_sock *sk; -int err, family;__u32 val_u32;bool v4;
@@ -645,9 +644,7 @@ static __always_inline int select_server_a(struct bpf_sk_lookup *ctx) SEC("sk_lookup")int multi_prog_redir1 (struct bpf_sk_lookup *ctx) { -int ret; - - ret =select_server_a (ctx); + (void )select_server_a (ctx);bpf_map_update_elem (&run_map, &KEY_PROG1 , &PROG_DONE ,BPF_ANY );return SK_PASS ; }
@@ -655,9 +652,7 @@ int multi_prog_redir1(struct bpf_sk_lookup *ctx) SEC("sk_lookup")int multi_prog_redir2 (struct bpf_sk_lookup *ctx) { -int ret; - - ret =select_server_a (ctx); + (void )select_server_a (ctx);bpf_map_update_elem (&run_map, &KEY_PROG2 , &PROG_DONE ,BPF_ANY );return SK_PASS ; }
tools/testing/selftests/bpf/progs/test_sk_lookup_kern.c +0 -2
@@ -110,7 +110,6 @@ int err_modify_sk_pointer(struct __sk_buff *skb) {struct bpf_sock_tuple tuple = {};struct bpf_sock *sk; -__u32 family; sk =bpf_sk_lookup_tcp (skb, &tuple,sizeof (tuple),BPF_F_CURRENT_NETNS ,0 );if (sk) {
@@ -125,7 +124,6 @@ int err_modify_sk_or_null_pointer(struct __sk_buff *skb) {struct bpf_sock_tuple tuple = {};struct bpf_sock *sk; -__u32 family; sk =bpf_sk_lookup_tcp (skb, &tuple,sizeof (tuple),BPF_F_CURRENT_NETNS ,0 ); sk +=1 ;
tools/testing/selftests/bpf/progs/test_sock_fields.c +1 -1
@@ -121,7 +121,7 @@ static void tpcpy(struct bpf_tcp_sock *dst, SEC("cgroup_skb/egress")int egress_read_sock_fields (struct __sk_buff *skb) { -struct bpf_spinlock_cnt cli_cnt_init = { .lock =0 , .cnt =0xeB9F }; +struct bpf_spinlock_cnt cli_cnt_init = { .lock = {}, .cnt =0xeB9F };struct bpf_spinlock_cnt *pkt_out_cnt, *pkt_out_cnt10;struct bpf_tcp_sock *tp, *tp_ret;struct bpf_sock *sk, *sk_ret;
tools/testing/selftests/bpf/progs/test_sockmap_kern.h +11 -3
@@ -14,6 +14,7 @@#include <sys/socket.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_endian.h> +#include "bpf_misc.h" /* Sockmap sample program connects a client and a backend together * using cgroups.
@@ -111,12 +112,15 @@ int bpf_prog2(struct __sk_buff *skb)int len, *f, ret, zero =0 ;__u64 flags =0 ; +__sink (rport);if (lport ==10000 ) ret =10 ;else ret =1 ; len = (__u32 )skb->data_end - (__u32 )skb->data; +__sink (len); + f =bpf_map_lookup_elem (&sock_skb_opts, &zero);if (f && *f) { ret =3 ;
@@ -180,7 +184,6 @@ int bpf_prog3(struct __sk_buff *skb)if (err)return SK_DROP ;bpf_write_pass (skb,13 ); -tls_out:return ret; }
@@ -188,8 +191,7 @@ SEC("sockops")int bpf_sockmap (struct bpf_sock_ops *skops) {__u32 lport, rport; -int op, err =0 , index, key, ret; - +int op, err, ret; op = (int ) skops->op;
@@ -228,6 +230,8 @@ int bpf_sockmap(struct bpf_sock_ops *skops)break ; } +__sink (err); +return 0 ; }
@@ -321,6 +325,10 @@ int bpf_prog8(struct sk_msg_md *msg) }else {return SK_DROP ; } + +__sink (data_end); +__sink (data); +return SK_PASS ; }SEC ("sk_msg4" )
tools/testing/selftests/bpf/progs/test_spin_lock.c +3 -0
@@ -3,6 +3,7 @@#include <linux/bpf.h> #include <linux/version.h> #include <bpf/bpf_helpers.h> +#include "bpf_misc.h" struct hmap_elem {volatile int cnt;
@@ -89,6 +90,8 @@ int bpf_spin_lock_test(struct __sk_buff *skb) credit = q->credit;bpf_spin_unlock (&q->lock); +__sink (credit); +/* spin_lock in cgroup local storage */ cls =bpf_get_local_storage (&cls_map,0 );bpf_spin_lock (&cls->lock);
tools/testing/selftests/bpf/progs/test_tc_dtime.c +2 -2
@@ -163,9 +163,9 @@ static int skb_get_type(struct __sk_buff *skb) ip6h = data +sizeof (struct ethhdr );if (ip6h +1 > data_end)return -1 ; -if (v6_equal (ip6h->saddr, (struct in6_addr )ip6_src)) +if (v6_equal (ip6h->saddr, (struct in6_addr ){{ip6_src}})) ns =SRC_NS ; -else if (v6_equal (ip6h->saddr, (struct in6_addr )ip6_dst)) +else if (v6_equal (ip6h->saddr, (struct in6_addr ){{ip6_dst}})) ns =DST_NS ; inet_proto = ip6h->nexthdr; trans = ip6h +1 ;
tools/testing/selftests/bpf/progs/test_tc_neigh.c +2 -2
@@ -94,7 +94,7 @@ int tc_dst(struct __sk_buff *skb) redirect =is_remote_ep_v4 (skb,__bpf_constant_htonl (ip4_src));break ;case __bpf_constant_htons (ETH_P_IPV6 ): - redirect =is_remote_ep_v6 (skb, (struct in6_addr )ip6_src); + redirect =is_remote_ep_v6 (skb, (struct in6_addr ){{ip6_src}});break ; }
@@ -119,7 +119,7 @@ int tc_src(struct __sk_buff *skb) redirect =is_remote_ep_v4 (skb,__bpf_constant_htonl (ip4_dst));break ;case __bpf_constant_htons (ETH_P_IPV6 ): - redirect =is_remote_ep_v6 (skb, (struct in6_addr )ip6_dst); + redirect =is_remote_ep_v6 (skb, (struct in6_addr ){{ip6_dst}});break ; }
tools/testing/selftests/bpf/progs/test_tcpbpf_kern.c +0 -2
@@ -46,8 +46,6 @@ int bpf_testcb(struct bpf_sock_ops *skops)struct bpf_sock_ops *reuse = skops;struct tcphdr *thdr;int window_clamp =9216 ; -int good_call_rv =0 ; -int bad_call_rv =0 ;int save_syn =1 ;int rv =-1 ;int v =0 ;
tools/testing/selftests/bpf/progs/test_tunnel_kern.c +0 -6
@@ -209,7 +209,6 @@ int erspan_get_tunnel(struct __sk_buff *skb) {struct bpf_tunnel_key key;struct erspan_metadata md; -__u32 index;int ret; ret =bpf_skb_get_tunnel_key (skb, &key,sizeof (key),0 );
@@ -289,7 +288,6 @@ int ip4ip6erspan_get_tunnel(struct __sk_buff *skb) {struct bpf_tunnel_key key;struct erspan_metadata md; -__u32 index;int ret; ret = bpf_skb_get_tunnel_key(skb, &key, sizeof(key),
@@ -405,8 +403,6 @@ int vxlan_get_tunnel_src(struct __sk_buff *skb)int ret;struct bpf_tunnel_key key;struct vxlan_metadata md; -__u32 orig_daddr; -__u32 index =0 ; ret =bpf_skb_get_tunnel_key (skb, &key,sizeof (key),BPF_F_TUNINFO_FLAGS );
@@ -443,9 +439,7 @@ int veth_set_outer_dst(struct __sk_buff *skb)void *data_end = (void *)(long )skb->data_end;struct udphdr *udph;struct iphdr *iph; -__u32 index =0 ;int ret =0 ; -int shrink;__s64 csum;if ((void *)eth +sizeof (*eth) > data_end) {
tools/testing/selftests/bpf/progs/test_usdt_multispec.c +0 -2
@@ -18,8 +18,6 @@ int usdt_100_sum; SEC("usdt//proc/self/exe:test:usdt_100")int BPF_USDT (usdt_100 ,int x) { -long tmp; -if (my_pid != (bpf_get_current_pid_tgid () >>32 ))return 0 ;
tools/testing/selftests/bpf/progs/test_verif_scale1.c +1 -1
@@ -11,7 +11,7 @@ int balancer_ingress(struct __sk_buff *ctx)void *data_end = (void *)(long )ctx->data_end;void *data = (void *)(long )ctx->data;void *ptr; -int ret =0 , nh_off, i =0 ; +int nh_off, i =0 ; nh_off =14 ;
tools/testing/selftests/bpf/progs/test_verif_scale2.c +1 -1
@@ -11,7 +11,7 @@ int balancer_ingress(struct __sk_buff *ctx)void *data_end = (void *)(long )ctx->data_end;void *data = (void *)(long )ctx->data;void *ptr; -int ret =0 , nh_off, i =0 ; +int nh_off, i =0 ; nh_off =14 ;
tools/testing/selftests/bpf/progs/test_verif_scale3.c +1 -1
@@ -11,7 +11,7 @@ int balancer_ingress(struct __sk_buff *ctx)void *data_end = (void *)(long )ctx->data_end;void *data = (void *)(long )ctx->data;void *ptr; -int ret =0 , nh_off, i =0 ; +int nh_off, i =0 ; nh_off =32 ;
tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c +0 -2
@@ -5,8 +5,6 @@ SEC("xdp")int _xdp_adjust_tail_grow (struct xdp_md *xdp) { -void *data_end = (void *)(long )xdp->data_end; -void *data = (void *)(long )xdp->data;int data_len =bpf_xdp_get_buff_len (xdp);int offset =0 ;/* SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) */
tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c +0 -2
@@ -45,8 +45,6 @@ SEC("fentry/FUNC")int BPF_PROG (trace_on_entry ,struct xdp_buff *xdp) {struct meta meta; -void *data_end = (void *)(long )xdp->data_end; -void *data = (void *)(long )xdp->data; meta.ifindex = xdp->rxq->dev->ifindex; meta.pkt_len =bpf_xdp_get_buff_len ((struct xdp_md *)xdp);
tools/testing/selftests/bpf/progs/test_xdp_dynptr.c +0 -2
@@ -82,7 +82,6 @@ static __always_inline int handle_ipv4(struct xdp_md *xdp, struct bpf_dynptr *xdstruct iptnl_info *tnl;struct ethhdr *new_eth;struct ethhdr *old_eth; -__u32 transport_hdr_sz;struct iphdr *iph;__u16 *next_iph;__u16 payload_len;
@@ -165,7 +164,6 @@ static __always_inline int handle_ipv6(struct xdp_md *xdp, struct bpf_dynptr *xdstruct iptnl_info *tnl;struct ethhdr *new_eth;struct ethhdr *old_eth; -__u32 transport_hdr_sz;struct ipv6hdr *ip6h;__u16 payload_len;struct vip vip = {};
tools/testing/selftests/bpf/progs/test_xdp_noinline.c +0 -43
73 lines not on this page · raw message
tools/testing/selftests/bpf/progs/test_xdp_vlan.c +0 -13
@@ -209,19 +209,6 @@ int xdp_prognum2(struct xdp_md *ctx)return XDP_PASS ; } -static __always_inline -void shift_mac_4bytes_16bit(void *data) -{ -__u16 *p = data; - - p[7 ] = p[5 ];/* delete p[7] was vlan_hdr->h_vlan_TCI */ - p[6 ] = p[4 ];/* delete p[6] was ethhdr->h_proto */ - p[5 ] = p[3 ]; - p[4 ] = p[2 ]; - p[3 ] = p[1 ]; - p[2 ] = p[0 ]; -} -static __always_inline void shift_mac_4bytes_32bit(void *data) {
tools/testing/selftests/bpf/progs/type_cast.c +0 -1
@@ -63,7 +63,6 @@ SEC("?tp_btf/sys_enter")int BPF_PROG (untrusted_ptr ,struct pt_regs *regs,long id) {struct task_struct *task, *task_dup; -long *ptr; task =bpf_get_current_task_btf (); task_dup = bpf_rdonly_cast(task, bpf_core_type_id_kernel(struct task_struct));
tools/testing/selftests/bpf/progs/udp_limit.c +0 -2
@@ -17,7 +17,6 @@ SEC("cgroup/sock_create")int sock (struct bpf_sock *ctx) {int *sk_storage; -__u32 key;if (ctx->type !=SOCK_DGRAM )return 1 ;
@@ -46,7 +45,6 @@ SEC("cgroup/sock_release")int sock_release (struct bpf_sock *ctx) {int *sk_storage; -__u32 key;if (ctx->type !=SOCK_DGRAM )return 1 ;
tools/testing/selftests/bpf/progs/user_ringbuf_success.c +0 -6
@@ -162,8 +162,6 @@ SEC("fentry/" SYS_PREFIX "sys_prctl")int test_user_ringbuf_protocol (void *ctx) {long status =0 ; -struct sample *sample =NULL ; -struct bpf_dynptr ptr;if (!is_test_process ())return 0 ;
@@ -183,10 +181,6 @@ int test_user_ringbuf_protocol(void *ctx) SEC("fentry/" SYS_PREFIX "sys_getpgid")int test_user_ringbuf (void *ctx) { -int status =0 ; -struct sample *sample =NULL ; -struct bpf_dynptr ptr; -if (!is_test_process ())return 0 ;
tools/testing/selftests/bpf/progs/xdp_features.c +0 -1
@@ -70,7 +70,6 @@ xdp_process_echo_packet(struct xdp_md *xdp, bool dut)struct tlv_hdr *tlv;struct udphdr *uh;__be16 port; -__u8 *cmd;if (eh +1 > (struct ethhdr *)data_end)return -EINVAL ;
tools/testing/selftests/bpf/progs/xdping_kern.c +0 -2
@@ -89,7 +89,6 @@ static __always_inline int icmp_check(struct xdp_md *ctx, int type) SEC("xdp")int xdping_client (struct xdp_md *ctx) { -void *data_end = (void *)(long )ctx->data_end;void *data = (void *)(long )ctx->data;struct pinginfo *pinginfo =NULL ;struct ethhdr *eth = data;
@@ -153,7 +152,6 @@ int xdping_client(struct xdp_md *ctx) SEC("xdp")int xdping_server (struct xdp_md *ctx) { -void *data_end = (void *)(long )ctx->data_end;void *data = (void *)(long )ctx->data;struct ethhdr *eth = data;struct icmphdr *icmph;
tools/testing/selftests/bpf/progs/xdpwall.c +0 -1
@@ -321,7 +321,6 @@ int edgewall(struct xdp_md *ctx)void *data = (void *)(long )(ctx->data);struct fw_match_info match_info = {};struct pkt_info info = {}; -__u8 parse_err =NO_ERR ;void *transport_hdr;struct ethhdr *eth;bool filter_res;
Signature · 1 line
2.34.1
Andrii Nakryiko
maintainerPATCH 4/4 selftests/bpf: make BPF compiler flags stricter
In reply to Andrii NakryikoWe recently added -Wuninitialized, but it's not enough to catch various silly mistakes or omissions. Let's go all the way to -Wall, just like we do for user-space code.
--- tools/testing/selftests/bpf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/Makefile +2 -2
@@ -352,12 +352,12 @@ CLANG_TARGET_ARCH = --target=$(notdir $(CROSS_COMPILE:%-=%)) endif CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG),$(CLANG_TARGET_ARCH)) -BPF_CFLAGS = -g -Werror -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN) \ +BPF_CFLAGS = -g -Wall -Werror -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN) \ -I$(INCLUDE_DIR) -I$(CURDIR) -I$(APIDIR) \ -I$(abspath $(OUTPUT)/../usr/include) CLANG_CFLAGS = $(CLANG_SYS_INCLUDES) \ - -Wno-compare-distinct-pointer-types -Wuninitialized + -Wno-compare-distinct-pointer-types $(OUTPUT)/test_l4lb_noinline.o: BPF_CFLAGS += -fno-inline $(OUTPUT)/test_xdp_noinline.o: BPF_CFLAGS += -fno-inline
Signature · 1 line
2.34.1
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 11 lines · On Wed, 8 Mar 2023 21:40:11 -0800 you wrote:
Make BPF-side compiler flags stricter by adding -Wall. Fix tons of small issues pointed out by compiler immediately after that. That includes newly added
bpf_for(),bpf_for_each(), andbpf_repeat()macros.Andrii Nakryiko (4):
selftests/bpf: prevent unused variable warning inbpf_for()selftests/bpf: add__sink()macro to fake variable consumption selftests/bpf: fix lots of silly mistakes pointed out by compiler selftests/bpf: make BPF compiler flags stricter[...]
Here is the summary with links:
- [bpf-next,1/4] selftests/bpf: prevent unused variable warning in bpf_for()
https://git.kernel.org/bpf/bpf-next/c/2498e6231bfd - [bpf-next,2/4] selftests/bpf: add __sink() macro to fake variable consumption https://git.kernel.org/bpf/bpf-next/c/713461b895ef - [bpf-next,3/4] selftests/bpf: fix lots of silly mistakes pointed out by compiler https://git.kernel.org/bpf/bpf-next/c/c8ed66859397 - [bpf-next,4/4] selftests/bpf: make BPF compiler flags stricter https://git.kernel.org/bpf/bpf-next/c/3d5a55ddc255
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html