bpf, selftests: Adapt cls_redirect to call csum_level helper (c4ba153b) · Commits · 戴 / test

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 <daniel@iogearbox.net> Signed-off-by:

Alexei Starovoitov <ast@kernel.org> Reviewed-by:

Lorenz Bauer <lmb@cloudflare.com> Link: https://lore.kernel.org/bpf/e7458f10e3f3d795307cbc5ad870112671d9c6f7.1591108731.git.daniel@iogearbox.net

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -380,9 +380,10 @@ static ret_t accept_locally(struct __sk_buff skb, encap_headers_t encap)
		}

		if (bpf_skb_adjust_room(skb, -encap_overhead, BPF_ADJ_ROOM_MAC,
		BPF_F_ADJ_ROOM_FIXED_GSO)) {
		BPF_F_ADJ_ROOM_FIXED_GSO \|
		BPF_F_ADJ_ROOM_NO_CSUM_RESET) \|\|
		bpf_csum_level(skb, BPF_CSUM_LEVEL_DEC))
		return TC_ACT_SHOT;
		}

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

		if (bpf_skb_adjust_room(skb, delta, BPF_ADJ_ROOM_NET,
		BPF_F_ADJ_ROOM_FIXED_GSO)) {
		BPF_F_ADJ_ROOM_FIXED_GSO \|
		BPF_F_ADJ_ROOM_NO_CSUM_RESET) \|\|
		bpf_csum_level(skb, BPF_CSUM_LEVEL_INC)) {
		metrics->errors_total_encap_adjust_failed++;
		return TC_ACT_SHOT;
		}

Admin message