UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

selftests/bpf: Return true/false (not 1/0) from bool functions 

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
This commit is contained in:
Haowen Bai 2022-04-01 10:15:54 +08:00 committed by Andrii Nakryiko
parent e299bcd4d1
commit f6d60facd9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/testing/selftests/bpf/progs/test_l4lb_noinline.c
View File

@ -218,7 +218,7 @@ static __noinline bool get_packet_dst(struct real_definition **real,
if (hash != 0x358459b7 /* jhash of ipv4 packet */ && if (hash != 0x358459b7 /* jhash of ipv4 packet */ &&
hash != 0x2f4bc6bb /* jhash of ipv6 packet */) hash != 0x2f4bc6bb /* jhash of ipv6 packet */)
return 0; return false;
real_pos = bpf_map_lookup_elem(&ch_rings, &key); real_pos = bpf_map_lookup_elem(&ch_rings, &key);
if (!real_pos) if (!real_pos)

12
tools/testing/selftests/bpf/progs/test_xdp_noinline.c
View File

@ -564,22 +564,22 @@ static bool get_packet_dst(struct real_definition **real,
hash = get_packet_hash(pckt, hash_16bytes); hash = get_packet_hash(pckt, hash_16bytes);
if (hash != 0x358459b7 /* jhash of ipv4 packet */ && if (hash != 0x358459b7 /* jhash of ipv4 packet */ &&
hash != 0x2f4bc6bb /* jhash of ipv6 packet */) hash != 0x2f4bc6bb /* jhash of ipv6 packet */)
return 0; return false;
key = 2 * vip_info->vip_num + hash % 2; key = 2 * vip_info->vip_num + hash % 2;
real_pos = bpf_map_lookup_elem(&ch_rings, &key); real_pos = bpf_map_lookup_elem(&ch_rings, &key);
if (!real_pos) if (!real_pos)
return 0; return false;
key = *real_pos; key = *real_pos;
*real = bpf_map_lookup_elem(&reals, &key); *real = bpf_map_lookup_elem(&reals, &key);
if (!(*real)) if (!(*real))
return 0; return false;
if (!(vip_info->flags & (1 << 1))) { if (!(vip_info->flags & (1 << 1))) {
__u32 conn_rate_key = 512 + 2; __u32 conn_rate_key = 512 + 2;
struct lb_stats *conn_rate_stats = struct lb_stats *conn_rate_stats =
bpf_map_lookup_elem(&stats, &conn_rate_key); bpf_map_lookup_elem(&stats, &conn_rate_key);
if (!conn_rate_stats) if (!conn_rate_stats)
return 1; return true;
cur_time = bpf_ktime_get_ns(); cur_time = bpf_ktime_get_ns();
if ((cur_time - conn_rate_stats->v2) >> 32 > 0xffFFFF) { if ((cur_time - conn_rate_stats->v2) >> 32 > 0xffFFFF) {
conn_rate_stats->v1 = 1; conn_rate_stats->v1 = 1;
@ -587,14 +587,14 @@ static bool get_packet_dst(struct real_definition **real,
} else { } else {
conn_rate_stats->v1 += 1; conn_rate_stats->v1 += 1;
if (conn_rate_stats->v1 >= 1) if (conn_rate_stats->v1 >= 1)
return 1; return true;
} }
if (pckt->flow.proto == IPPROTO_UDP) if (pckt->flow.proto == IPPROTO_UDP)
new_dst_lru.atime = cur_time; new_dst_lru.atime = cur_time;
new_dst_lru.pos = key; new_dst_lru.pos = key;
bpf_map_update_elem(lru_map, &pckt->flow, &new_dst_lru, 0); bpf_map_update_elem(lru_map, &pckt->flow, &new_dst_lru, 0);
} }
return 1; return true;
} }
__attribute__ ((noinline)) __attribute__ ((noinline))