[PATCH bpf-next v6 0/6] bpf: decap flags and GSO state updates
From: Nick Hudson <hidden>
Date: 2026-05-04 11:15:41
Also in:
bpf
This series extends bpf_skb_adjust_room() with decapsulation-specific flags and tunnel GSO state updates for decap use cases. Motivation ---------- When BPF decapsulates tunneled packets, skb GSO state needs to be updated to match the removed tunnel layer. This includes clearing the corresponding tunnel GSO type bits and resetting encapsulation state once no tunnel GSO flags remain. Series Overview --------------- - Name the adjust_room flag enum for CO-RE lookups. - Refactor adjust_room helper masks for maintainable validation logic. - Add new DECAP flags to UAPI. - Add guard rails for incompatible/invalid decap flag combinations. - Implement decap GSO state clearing on shrink. - Add selftests to validate decap GSO and encapsulation state. Changes v5 -> v6: - Patch 5: extend decap-state handling for the new L4/IPXIP decap flags to non-GSO packets as well: when decapsulation is requested on a non-GSO skb, clear skb->encapsulation directly so behavior is consistent with the GSO path. - Patch 6: broaden tc_tunnel coverage to exercise and validate both GSO and non-GSO decapsulation paths. This includes selecting IPXIP decap flags from the outer tunnel header family, adding explicit post-decap encapsulation checks for non-GSO packets, and removing forced TSO disable so GSO cases are exercised in the test harness. Changes v4 -> v5: - Patch 5: Remove explicit clearing of encap_hdr_csum and remcsum_offload on UDP decap, per review feedback. - Patch 6: Remove SKB_GSO_TUNNEL_REMCSUM from SKB_GSO_UDP_TUNNEL_MASK in selftests, and minor test improvements. Changes v3 -> v4: - Patch 5: drop SKB_GSO_TUNNEL_REMCSUM handling from this series. - Patch 5: clear encap_hdr_csum and remcsum_offload directly on UDP decap. Changes v2 -> v3: - Add a new selftests patch to validate decap GSO state behavior. - Reorder the series so helper-mask refactoring precedes UAPI DECAP flag additions. - Refresh patch 2 and patch 3 split to keep refactoring behavior-neutral. - Patch 5: add decap tunnel GSO-state checks in "bpf: clear decap tunnel GSO state in skb_adjust_room" (per Gemini/sashiko). Changes v1 -> v2: - Patch 3: decap flag acceptance intentionally remains L3-only while adding helper masks. - Patch 4: decap with L4/IPXIP support enabled with guard rails. Co-developed-by: Max Tottenham <redacted> Signed-off-by: Max Tottenham <redacted> Co-developed-by: Anna Glasgall <redacted> Signed-off-by: Anna Glasgall <redacted> Signed-off-by: Nick Hudson <redacted> Nick Hudson (6): bpf: name the enum for BPF_FUNC_skb_adjust_room flags bpf: refactor masks for ADJ_ROOM flags and encap validation bpf: add BPF_F_ADJ_ROOM_DECAP_* flags for tunnel decapsulation bpf: allow new DECAP flags and add guard rails bpf: clear decap state on skb_adjust_room shrink path selftests/bpf: tc_tunnel - validate decap GSO and encapsulation state include/uapi/linux/bpf.h | 36 ++++++++++- net/core/filter.c | 119 ++++++++++++++++++++++++++++++----- tools/include/uapi/linux/bpf.h | 36 ++++++++++- tools/testing/selftests/bpf/prog_tests/test_tc_tunnel.c | 1 - tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 91 ++++++++++++++++++++++++--- 5 files changed, 252 insertions(+), 31 deletions(-) -- 2.34.1