Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More coccinelle fixes #24606

Merged
merged 3 commits into from
Mar 30, 2023
Merged

More coccinelle fixes #24606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d52e4e3
bpf: Add semi-colons after __maybe_unused label attributes
qmonnet Mar 29, 2023
bbaa5fc
bpf: Add some missing const qualifiers
qmonnet Mar 28, 2023
a050bb2
cocci: Set COCCINELLE_HOME to fix path for isomorphisms and macros files
qmonnet Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/lint-bpf-checks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ jobs:
- uses: docker://cilium/coccicheck:2.4@sha256:24abe3fbb8e829fa41a68a3b76cb4df84fd5a87a7d1d6254c1c1fe5effb5bd1b
with:
entrypoint: ./contrib/coccinelle/check-cocci.sh
# Note: Setting COCCINELLE_HOME can be removed, here and in the
# messages in the .cocci files, next time we upgrade coccinelle.
# The issue was fixed, after v1.1.1 that we're using, in
# https://gitlab.inria.fr/coccinelle/coccinelle/-/commit/540888ff426e.
env:
COCCINELLE_HOME: /usr/local/lib/coccinelle

set_clang_dir:
name: Set clang directory
Expand Down
2 changes: 1 addition & 1 deletion bpf/lib/conntrack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ static __always_inline __u8 __ct_lookup(const void *map, struct __ctx_buff *ctx,
return CT_ESTABLISHED;
}

ct_new: __maybe_unused
ct_new: __maybe_unused;
*monitor = TRACE_PAYLOAD_LEN;
return CT_NEW;
}
Expand Down
4 changes: 2 additions & 2 deletions bpf/lib/egress_policies.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ srv6_decapsulation(struct __ctx_buff *ctx)
}
#endif /* ENABLE_SRV6_SRH_ENCAP */
case IPPROTO_IPIP:
parse_outer_ipv4: __maybe_unused
parse_outer_ipv4: __maybe_unused;
if (ctx_change_proto(ctx, new_proto, 0) < 0)
return DROP_WRITE_ERROR;
if (ctx_store_bytes(ctx, offsetof(struct ethhdr, h_proto),
Expand All @@ -327,7 +327,7 @@ parse_outer_ipv4: __maybe_unused
shrink += sizeof(struct iphdr);
break;
case IPPROTO_IPV6:
parse_outer_ipv6: __maybe_unused
parse_outer_ipv6: __maybe_unused;
shrink += sizeof(struct ipv6hdr);
break;
default:
Expand Down
5 changes: 3 additions & 2 deletions bpf/lib/icmp6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,9 @@ static __always_inline int icmp6_send_echo_reply(struct __ctx_buff *ctx,
*
* Send an ICMPv6 nadv reply in return to an ICMPv6 ndisc.
*/
static __always_inline int send_icmp6_ndisc_adv(struct __ctx_buff *ctx,
int nh_off, union macaddr *mac, bool to_router)
static __always_inline int
send_icmp6_ndisc_adv(struct __ctx_buff *ctx, int nh_off,
const union macaddr *mac, bool to_router)
{
struct icmp6hdr icmp6hdr __align_stack_8 = {}, icmp6hdr_old __align_stack_8;
__u8 opts[8], opts_old[8];
Expand Down
7 changes: 4 additions & 3 deletions bpf/lib/proxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ combine_ports(__u16 dport, __u16 sport)
* ingress. Will modify 'tuple'! \
*/ \
static __always_inline int \
NAME(struct __ctx_buff *ctx, CT_TUPLE_TYPE * ct_tuple, __be16 proxy_port, void *tproxy_addr) \
NAME(struct __ctx_buff *ctx, const CT_TUPLE_TYPE * ct_tuple, \
__be16 proxy_port, void *tproxy_addr) \
{ \
struct bpf_sock_tuple *tuple = (struct bpf_sock_tuple *)ct_tuple; \
__u8 nexthdr = ct_tuple->nexthdr; \
Expand Down Expand Up @@ -351,12 +352,12 @@ ctx_redirect_to_proxy_first(struct __ctx_buff *ctx, __be16 proxy_port)
}
#endif /* ENABLE_TPROXY */

mark: __maybe_unused
mark: __maybe_unused;
cilium_dbg(ctx, DBG_CAPTURE_PROXY_POST, proxy_port, 0);
ctx->mark = MARK_MAGIC_TO_PROXY | (proxy_port << 16);
ctx_change_type(ctx, PACKET_HOST);

out: __maybe_unused
out: __maybe_unused;
return ret;
}

Expand Down
8 changes: 5 additions & 3 deletions contrib/coccinelle/aligned.cocci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ cnt += 1

if cnt > 0:
print("""Use the following command to fix the above issues:
docker run --rm --user 1000 --workdir /workspace -v `pwd`:/workspace \\
-it docker.io/cilium/coccicheck:2.4@sha256:24abe3fbb8e829fa41a68a3b76cb4df84fd5a87a7d1d6254c1c1fe5effb5bd1b spatch --sp-file contrib/coccinelle/aligned.cocci \\
--include-headers --very-quiet --in-place bpf/\n
docker run --rm --user 1000 --workdir /workspace -v `pwd`:/workspace \\
-e COCCINELLE_HOME=/usr/local/lib/coccinelle \\
-it docker.io/cilium/coccicheck:2.4@sha256:24abe3fbb8e829fa41a68a3b76cb4df84fd5a87a7d1d6254c1c1fe5effb5bd1b \\
spatch --include-headers --very-quiet --in-place bpf/ \\
--sp-file contrib/coccinelle/aligned.cocci\n
""")
8 changes: 5 additions & 3 deletions contrib/coccinelle/const.cocci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ cnt += 1

if cnt > 0:
print("""Use the following command to fix the above issues:
docker run --rm --user 1000 --workdir /workspace -v `pwd`:/workspace \\
-it docker.io/cilium/coccicheck:2.4@sha256:24abe3fbb8e829fa41a68a3b76cb4df84fd5a87a7d1d6254c1c1fe5effb5bd1b spatch --sp-file contrib/coccinelle/const.cocci \\
--include-headers --very-quiet --in-place bpf/\n
docker run --rm --user 1000 --workdir /workspace -v `pwd`:/workspace \\
-e COCCINELLE_HOME=/usr/local/lib/coccinelle \\
-it docker.io/cilium/coccicheck:2.4@sha256:24abe3fbb8e829fa41a68a3b76cb4df84fd5a87a7d1d6254c1c1fe5effb5bd1b \\
spatch --include-headers --very-quiet --in-place bpf/ \\
--sp-file contrib/coccinelle/const.cocci\n
""")
8 changes: 5 additions & 3 deletions contrib/coccinelle/identity_is_node.cocci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ if len(p2) > 0:

if cnt > 0:
print("""Use the following command to fix the above issues:
docker run --rm --user 1000 --workdir /workspace -v `pwd`:/workspace \\
-it docker.io/cilium/coccicheck:2.4@sha256:24abe3fbb8e829fa41a68a3b76cb4df84fd5a87a7d1d6254c1c1fe5effb5bd1b spatch --sp-file contrib/coccinelle/identity_is_node.cocci \\
--include-headers --very-quiet --in-place bpf/\n
docker run --rm --user 1000 --workdir /workspace -v `pwd`:/workspace \\
-e COCCINELLE_HOME=/usr/local/lib/coccinelle \\
-it docker.io/cilium/coccicheck:2.4@sha256:24abe3fbb8e829fa41a68a3b76cb4df84fd5a87a7d1d6254c1c1fe5effb5bd1b \\
spatch --include-headers --very-quiet --in-place bpf/ \\
--sp-file contrib/coccinelle/identity_is_node.cocci\n
""")
5 changes: 4 additions & 1 deletion contrib/coccinelle/tail_calls.cocci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,5 +109,8 @@ cnt += 1
if cnt > 0:
print("""Unlogged tail calls found. Please fix and use the following command to check:
docker run --rm --user 1000 --workdir /workspace -v `pwd`:/workspace \\
-it docker.io/cilium/coccicheck:2.4@sha256:24abe3fbb8e829fa41a68a3b76cb4df84fd5a87a7d1d6254c1c1fe5effb5bd1b make -C bpf coccicheck\n
-e COCCINELLE_HOME=/usr/local/lib/coccinelle \\
-it docker.io/cilium/coccicheck:2.4@sha256:24abe3fbb8e829fa41a68a3b76cb4df84fd5a87a7d1d6254c1c1fe5effb5bd1b \\
spatch --include-headers --very-quiet --in-place bpf/ \\
--sp-file contrib/coccinelle/tail_calls.cocci\n
""")
8 changes: 5 additions & 3 deletions contrib/coccinelle/zero_trace_reason.cocci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ cnt += 1

if cnt > 0:
print("""Use the following command to fix the above issues:
docker run --rm --user 1000 --workdir /workspace -v `pwd`:/workspace \\
-it docker.io/cilium/coccicheck:2.4@sha256:24abe3fbb8e829fa41a68a3b76cb4df84fd5a87a7d1d6254c1c1fe5effb5bd1b spatch --sp-file contrib/coccinelle/zero_trace_reason.cocci \\
--include-headers --very-quiet --in-place bpf/\n
docker run --rm --user 1000 --workdir /workspace -v `pwd`:/workspace \\
-e COCCINELLE_HOME=/usr/local/lib/coccinelle \\
-it docker.io/cilium/coccicheck:2.4@sha256:24abe3fbb8e829fa41a68a3b76cb4df84fd5a87a7d1d6254c1c1fe5effb5bd1b \\
spatch --include-headers --very-quiet --in-place bpf/ \\
--sp-file contrib/coccinelle/zero_trace_reason.cocci\n
""")