Skip to content

Commit

Permalink
bpf: fix DROP_MISSED_TAIL_CALL warnings emitted by coccicheck
Browse files Browse the repository at this point in the history
The coccicheck has been silently failing for a while [1], and the CI was
recently fixed for the v1.13 branch bumping the related docker image in
100b580.

The check currently complains about two missing DROP_MISSED_TAIL_CALL
occurrences in bpf/lib/nodeport.h, although we do actually return it
(but indirectly). Let's make it more explicit, so that the check no
longer emits a warning.

[1]: 0dad157 ("cocci: Fix Python path for coccilib")

Related: 279bbdc ("bpf: Return DROP_MISSED_TAIL_CALL when missing some tail calls")
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
  • Loading branch information
giorio94 committed Sep 26, 2023
1 parent e83afb2 commit 65ecc5b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions bpf/lib/nodeport.h
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ static __always_inline int nodeport_lb6(struct __ctx_buff *ctx,
if (dsr) {
ctx_store_meta(ctx, CB_SRC_LABEL, src_identity);
ep_tail_call(ctx, CILIUM_CALL_IPV6_NODEPORT_DSR_INGRESS);
ret = DROP_MISSED_TAIL_CALL;
return DROP_MISSED_TAIL_CALL;
}

if (IS_ERR(ret))
Expand Down Expand Up @@ -2262,7 +2262,7 @@ static __always_inline int nodeport_lb4(struct __ctx_buff *ctx,
if (dsr) {
ctx_store_meta(ctx, CB_SRC_LABEL, src_identity);
ep_tail_call(ctx, CILIUM_CALL_IPV4_NODEPORT_DSR_INGRESS);
ret = DROP_MISSED_TAIL_CALL;
return DROP_MISSED_TAIL_CALL;
}

if (IS_ERR(ret))
Expand Down

0 comments on commit 65ecc5b

Please sign in to comment.