Commit 94bf6aad authored by Linkui Xiao's avatar Linkui Xiao Committed by Andrii Nakryiko

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:407:9-10: WARNING:
return of 0/1 in function 'decap_v4' with return type bool
tools/testing/selftests/bpf/progs/test_xdp_noinline.c:389:9-10: WARNING:
return of 0/1 in function 'decap_v6' with return type bool
tools/testing/selftests/bpf/progs/test_xdp_noinline.c:290:9-10: WARNING:
return of 0/1 in function 'encap_v6' with return type bool
tools/testing/selftests/bpf/progs/test_xdp_noinline.c:264:9-10: WARNING:
return of 0/1 in function 'parse_tcp' with return type bool
tools/testing/selftests/bpf/progs/test_xdp_noinline.c:242:9-10: WARNING:
return of 0/1 in function 'parse_udp' with return type bool

Generated by: scripts/coccinelle/misc/boolreturn.cocci
Suggested-by: default avatarStanislav Fomichev <sdf@google.com>
Signed-off-by: default avatarLinkui Xiao <xiaolinkui@kylinos.cn>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Reviewed-by: default avatarStanislav Fomichev <sdf@google.com>
Link: https://lore.kernel.org/bpf/20220714015647.25074-1-xiaolinkui@kylinos.cn
parent bf3f0037
...@@ -239,7 +239,7 @@ bool parse_udp(void *data, void *data_end, ...@@ -239,7 +239,7 @@ bool parse_udp(void *data, void *data_end,
udp = data + off; udp = data + off;
if (udp + 1 > data_end) if (udp + 1 > data_end)
return 0; return false;
if (!is_icmp) { if (!is_icmp) {
pckt->flow.port16[0] = udp->source; pckt->flow.port16[0] = udp->source;
pckt->flow.port16[1] = udp->dest; pckt->flow.port16[1] = udp->dest;
...@@ -247,7 +247,7 @@ bool parse_udp(void *data, void *data_end, ...@@ -247,7 +247,7 @@ bool parse_udp(void *data, void *data_end,
pckt->flow.port16[0] = udp->dest; pckt->flow.port16[0] = udp->dest;
pckt->flow.port16[1] = udp->source; pckt->flow.port16[1] = udp->source;
} }
return 1; return true;
} }
static __attribute__ ((noinline)) static __attribute__ ((noinline))
...@@ -261,7 +261,7 @@ bool parse_tcp(void *data, void *data_end, ...@@ -261,7 +261,7 @@ bool parse_tcp(void *data, void *data_end,
tcp = data + off; tcp = data + off;
if (tcp + 1 > data_end) if (tcp + 1 > data_end)
return 0; return false;
if (tcp->syn) if (tcp->syn)
pckt->flags |= (1 << 1); pckt->flags |= (1 << 1);
if (!is_icmp) { if (!is_icmp) {
...@@ -271,7 +271,7 @@ bool parse_tcp(void *data, void *data_end, ...@@ -271,7 +271,7 @@ bool parse_tcp(void *data, void *data_end,
pckt->flow.port16[0] = tcp->dest; pckt->flow.port16[0] = tcp->dest;
pckt->flow.port16[1] = tcp->source; pckt->flow.port16[1] = tcp->source;
} }
return 1; return true;
} }
static __attribute__ ((noinline)) static __attribute__ ((noinline))
...@@ -287,7 +287,7 @@ bool encap_v6(struct xdp_md *xdp, struct ctl_value *cval, ...@@ -287,7 +287,7 @@ bool encap_v6(struct xdp_md *xdp, struct ctl_value *cval,
void *data; void *data;
if (bpf_xdp_adjust_head(xdp, 0 - (int)sizeof(struct ipv6hdr))) if (bpf_xdp_adjust_head(xdp, 0 - (int)sizeof(struct ipv6hdr)))
return 0; return false;
data = (void *)(long)xdp->data; data = (void *)(long)xdp->data;
data_end = (void *)(long)xdp->data_end; data_end = (void *)(long)xdp->data_end;
new_eth = data; new_eth = data;
...@@ -295,7 +295,7 @@ bool encap_v6(struct xdp_md *xdp, struct ctl_value *cval, ...@@ -295,7 +295,7 @@ bool encap_v6(struct xdp_md *xdp, struct ctl_value *cval,
old_eth = data + sizeof(struct ipv6hdr); old_eth = data + sizeof(struct ipv6hdr);
if (new_eth + 1 > data_end || if (new_eth + 1 > data_end ||
old_eth + 1 > data_end || ip6h + 1 > data_end) old_eth + 1 > data_end || ip6h + 1 > data_end)
return 0; return false;
memcpy(new_eth->eth_dest, cval->mac, 6); memcpy(new_eth->eth_dest, cval->mac, 6);
memcpy(new_eth->eth_source, old_eth->eth_dest, 6); memcpy(new_eth->eth_source, old_eth->eth_dest, 6);
new_eth->eth_proto = 56710; new_eth->eth_proto = 56710;
...@@ -314,7 +314,7 @@ bool encap_v6(struct xdp_md *xdp, struct ctl_value *cval, ...@@ -314,7 +314,7 @@ bool encap_v6(struct xdp_md *xdp, struct ctl_value *cval,
ip6h->saddr.in6_u.u6_addr32[2] = 3; ip6h->saddr.in6_u.u6_addr32[2] = 3;
ip6h->saddr.in6_u.u6_addr32[3] = ip_suffix; ip6h->saddr.in6_u.u6_addr32[3] = ip_suffix;
memcpy(ip6h->daddr.in6_u.u6_addr32, dst->dstv6, 16); memcpy(ip6h->daddr.in6_u.u6_addr32, dst->dstv6, 16);
return 1; return true;
} }
static __attribute__ ((noinline)) static __attribute__ ((noinline))
...@@ -335,7 +335,7 @@ bool encap_v4(struct xdp_md *xdp, struct ctl_value *cval, ...@@ -335,7 +335,7 @@ bool encap_v4(struct xdp_md *xdp, struct ctl_value *cval,
ip_suffix <<= 15; ip_suffix <<= 15;
ip_suffix ^= pckt->flow.src; ip_suffix ^= pckt->flow.src;
if (bpf_xdp_adjust_head(xdp, 0 - (int)sizeof(struct iphdr))) if (bpf_xdp_adjust_head(xdp, 0 - (int)sizeof(struct iphdr)))
return 0; return false;
data = (void *)(long)xdp->data; data = (void *)(long)xdp->data;
data_end = (void *)(long)xdp->data_end; data_end = (void *)(long)xdp->data_end;
new_eth = data; new_eth = data;
...@@ -343,7 +343,7 @@ bool encap_v4(struct xdp_md *xdp, struct ctl_value *cval, ...@@ -343,7 +343,7 @@ bool encap_v4(struct xdp_md *xdp, struct ctl_value *cval,
old_eth = data + sizeof(struct iphdr); old_eth = data + sizeof(struct iphdr);
if (new_eth + 1 > data_end || if (new_eth + 1 > data_end ||
old_eth + 1 > data_end || iph + 1 > data_end) old_eth + 1 > data_end || iph + 1 > data_end)
return 0; return false;
memcpy(new_eth->eth_dest, cval->mac, 6); memcpy(new_eth->eth_dest, cval->mac, 6);
memcpy(new_eth->eth_source, old_eth->eth_dest, 6); memcpy(new_eth->eth_source, old_eth->eth_dest, 6);
new_eth->eth_proto = 8; new_eth->eth_proto = 8;
...@@ -367,8 +367,8 @@ bool encap_v4(struct xdp_md *xdp, struct ctl_value *cval, ...@@ -367,8 +367,8 @@ bool encap_v4(struct xdp_md *xdp, struct ctl_value *cval,
csum += *next_iph_u16++; csum += *next_iph_u16++;
iph->check = ~((csum & 0xffff) + (csum >> 16)); iph->check = ~((csum & 0xffff) + (csum >> 16));
if (bpf_xdp_adjust_head(xdp, (int)sizeof(struct iphdr))) if (bpf_xdp_adjust_head(xdp, (int)sizeof(struct iphdr)))
return 0; return false;
return 1; return true;
} }
static __attribute__ ((noinline)) static __attribute__ ((noinline))
...@@ -386,10 +386,10 @@ bool decap_v6(struct xdp_md *xdp, void **data, void **data_end, bool inner_v4) ...@@ -386,10 +386,10 @@ bool decap_v6(struct xdp_md *xdp, void **data, void **data_end, bool inner_v4)
else else
new_eth->eth_proto = 56710; new_eth->eth_proto = 56710;
if (bpf_xdp_adjust_head(xdp, (int)sizeof(struct ipv6hdr))) if (bpf_xdp_adjust_head(xdp, (int)sizeof(struct ipv6hdr)))
return 0; return false;
*data = (void *)(long)xdp->data; *data = (void *)(long)xdp->data;
*data_end = (void *)(long)xdp->data_end; *data_end = (void *)(long)xdp->data_end;
return 1; return true;
} }
static __attribute__ ((noinline)) static __attribute__ ((noinline))
...@@ -404,10 +404,10 @@ bool decap_v4(struct xdp_md *xdp, void **data, void **data_end) ...@@ -404,10 +404,10 @@ bool decap_v4(struct xdp_md *xdp, void **data, void **data_end)
memcpy(new_eth->eth_dest, old_eth->eth_dest, 6); memcpy(new_eth->eth_dest, old_eth->eth_dest, 6);
new_eth->eth_proto = 8; new_eth->eth_proto = 8;
if (bpf_xdp_adjust_head(xdp, (int)sizeof(struct iphdr))) if (bpf_xdp_adjust_head(xdp, (int)sizeof(struct iphdr)))
return 0; return false;
*data = (void *)(long)xdp->data; *data = (void *)(long)xdp->data;
*data_end = (void *)(long)xdp->data_end; *data_end = (void *)(long)xdp->data_end;
return 1; return true;
} }
static __attribute__ ((noinline)) static __attribute__ ((noinline))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment