| Message ID | 1648779354-14700-1-git-send-email-baihaowen@meizu.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f6d60facd9b65614594f1feaa4eee18ac60a9a18 |
| Delegated to: | BPF |
| Headers | show |
| Series | selftests/bpf: Return true/false (not 1/0) from bool functions | expand |
| Context | Check | Description |
|---|---|---|
| bpf/vmtest-bpf-next-PR | success | PR summary |
| netdev/tree_selection | success | Not a local patch |
On 3/31/22 7:15 PM, Haowen Bai wrote: > Return boolean values ("true" or "false") instead of 1 or 0 from bool > functions. This fixes the following warnings from coccicheck: > > ./tools/testing/selftests/bpf/progs/test_xdp_noinline.c:567:9-10: WARNING: > return of 0/1 in function 'get_packet_dst' with return type bool > ./tools/testing/selftests/bpf/progs/test_l4lb_noinline.c:221:9-10: WARNING: > return of 0/1 in function 'get_packet_dst' with return type bool > > Signed-off-by: Haowen Bai <baihaowen@meizu.com> Acked-by: Yonghong Song <yhs@fb.com>
On 3/31/22 8:15 PM, Haowen Bai wrote: > Return boolean values ("true" or "false") instead of 1 or 0 from bool > functions. This fixes the following warnings from coccicheck: > > ./tools/testing/selftests/bpf/progs/test_xdp_noinline.c:567:9-10: WARNING: > return of 0/1 in function 'get_packet_dst' with return type bool > ./tools/testing/selftests/bpf/progs/test_l4lb_noinline.c:221:9-10: WARNING: > return of 0/1 in function 'get_packet_dst' with return type bool > Thank you for including details on how the problem was found. > Signed-off-by: Haowen Bai <baihaowen@meizu.com> > --- Reviewed-by: Shuah Khan <skhan@linuxfoundation.org> thanks, -- Shuah
Hello: This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <andrii@kernel.org>: On Fri, 1 Apr 2022 10:15:54 +0800 you wrote: > Return boolean values ("true" or "false") instead of 1 or 0 from bool > functions. This fixes the following warnings from coccicheck: > > ./tools/testing/selftests/bpf/progs/test_xdp_noinline.c:567:9-10: WARNING: > return of 0/1 in function 'get_packet_dst' with return type bool > ./tools/testing/selftests/bpf/progs/test_l4lb_noinline.c:221:9-10: WARNING: > return of 0/1 in function 'get_packet_dst' with return type bool > > [...] Here is the summary with links: - selftests/bpf: Return true/false (not 1/0) from bool functions https://git.kernel.org/bpf/bpf-next/c/f6d60facd9b6 You are awesome, thank you!
diff --git a/tools/testing/selftests/bpf/progs/test_l4lb_noinline.c b/tools/testing/selftests/bpf/progs/test_l4lb_noinline.c index 19e4d20..c8bc0c6 100644 --- a/tools/testing/selftests/bpf/progs/test_l4lb_noinline.c +++ b/tools/testing/selftests/bpf/progs/test_l4lb_noinline.c @@ -218,7 +218,7 @@ static __noinline bool get_packet_dst(struct real_definition **real, if (hash != 0x358459b7 /* jhash of ipv4 packet */ && hash != 0x2f4bc6bb /* jhash of ipv6 packet */) - return 0; + return false; real_pos = bpf_map_lookup_elem(&ch_rings, &key); if (!real_pos) diff --git a/tools/testing/selftests/bpf/progs/test_xdp_noinline.c b/tools/testing/selftests/bpf/progs/test_xdp_noinline.c index 596c4e7..125d872 100644 --- a/tools/testing/selftests/bpf/progs/test_xdp_noinline.c +++ b/tools/testing/selftests/bpf/progs/test_xdp_noinline.c @@ -564,22 +564,22 @@ static bool get_packet_dst(struct real_definition **real, hash = get_packet_hash(pckt, hash_16bytes); if (hash != 0x358459b7 /* jhash of ipv4 packet */ && hash != 0x2f4bc6bb /* jhash of ipv6 packet */) - return 0; + return false; key = 2 * vip_info->vip_num + hash % 2; real_pos = bpf_map_lookup_elem(&ch_rings, &key); if (!real_pos) - return 0; + return false; key = *real_pos; *real = bpf_map_lookup_elem(&reals, &key); if (!(*real)) - return 0; + return false; if (!(vip_info->flags & (1 << 1))) { __u32 conn_rate_key = 512 + 2; struct lb_stats *conn_rate_stats = bpf_map_lookup_elem(&stats, &conn_rate_key); if (!conn_rate_stats) - return 1; + return true; cur_time = bpf_ktime_get_ns(); if ((cur_time - conn_rate_stats->v2) >> 32 > 0xffFFFF) { conn_rate_stats->v1 = 1; @@ -587,14 +587,14 @@ static bool get_packet_dst(struct real_definition **real, } else { conn_rate_stats->v1 += 1; if (conn_rate_stats->v1 >= 1) - return 1; + return true; } if (pckt->flow.proto == IPPROTO_UDP) new_dst_lru.atime = cur_time; new_dst_lru.pos = key; bpf_map_update_elem(lru_map, &pckt->flow, &new_dst_lru, 0); } - return 1; + return true; } __attribute__ ((noinline))
Return boolean values ("true" or "false") instead of 1 or 0 from bool functions. This fixes the following warnings from coccicheck: ./tools/testing/selftests/bpf/progs/test_xdp_noinline.c:567:9-10: WARNING: return of 0/1 in function 'get_packet_dst' with return type bool ./tools/testing/selftests/bpf/progs/test_l4lb_noinline.c:221:9-10: WARNING: return of 0/1 in function 'get_packet_dst' with return type bool Signed-off-by: Haowen Bai <baihaowen@meizu.com> --- tools/testing/selftests/bpf/progs/test_l4lb_noinline.c | 2 +- tools/testing/selftests/bpf/progs/test_xdp_noinline.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)