Skip to content

Commit c4ba153

Browse files
borkmannAlexei Starovoitov
authored andcommitted
bpf, selftests: Adapt cls_redirect to call csum_level helper
Adapt bpf_skb_adjust_room() to pass in BPF_F_ADJ_ROOM_NO_CSUM_RESET flag and use the new bpf_csum_level() helper to inc/dec the checksum level by one after the encap/decap. Signed-off-by: Daniel Borkmann <[email protected]> Signed-off-by: Alexei Starovoitov <[email protected]> Reviewed-by: Lorenz Bauer <[email protected]> Link: https://lore.kernel.org/bpf/e7458f10e3f3d795307cbc5ad870112671d9c6f7.1591108731.git.daniel@iogearbox.net
1 parent 7cdec54 commit c4ba153

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

tools/testing/selftests/bpf/progs/test_cls_redirect.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,10 @@ static ret_t accept_locally(struct __sk_buff *skb, encap_headers_t *encap)
380380
}
381381

382382
if (bpf_skb_adjust_room(skb, -encap_overhead, BPF_ADJ_ROOM_MAC,
383-
BPF_F_ADJ_ROOM_FIXED_GSO)) {
383+
BPF_F_ADJ_ROOM_FIXED_GSO |
384+
BPF_F_ADJ_ROOM_NO_CSUM_RESET) ||
385+
bpf_csum_level(skb, BPF_CSUM_LEVEL_DEC))
384386
return TC_ACT_SHOT;
385-
}
386387

387388
return bpf_redirect(skb->ifindex, BPF_F_INGRESS);
388389
}
@@ -472,7 +473,9 @@ static ret_t forward_with_gre(struct __sk_buff *skb, encap_headers_t *encap,
472473
}
473474

474475
if (bpf_skb_adjust_room(skb, delta, BPF_ADJ_ROOM_NET,
475-
BPF_F_ADJ_ROOM_FIXED_GSO)) {
476+
BPF_F_ADJ_ROOM_FIXED_GSO |
477+
BPF_F_ADJ_ROOM_NO_CSUM_RESET) ||
478+
bpf_csum_level(skb, BPF_CSUM_LEVEL_INC)) {
476479
metrics->errors_total_encap_adjust_failed++;
477480
return TC_ACT_SHOT;
478481
}

0 commit comments

Comments
 (0)