selftests/bpf: Return true/false (not 1/0) from bool functions
authorHaowen Bai <baihaowen@meizu.com>
Fri, 1 Apr 2022 02:15:54 +0000 (10:15 +0800)
committerAndrii Nakryiko <andrii@kernel.org>
Sun, 3 Apr 2022 23:42:43 +0000 (16:42 -0700)
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>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/1648779354-14700-1-git-send-email-baihaowen@meizu.com
tools/testing/selftests/bpf/progs/test_l4lb_noinline.c
tools/testing/selftests/bpf/progs/test_xdp_noinline.c

index 19e4d2071c605299aba7986306039dde4eece808..c8bc0c6947aa6f00dc289496a7fb643a374e75cc 100644 (file)
@@ -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)
index 596c4e71bf3ac21b056ef7002934db0cbe499c13..125d872d7981f5c376c3d46af9d3ee7d3ab95aa6 100644 (file)
@@ -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))