From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.218.50 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795052342; b=GrydkVoEy07arJaV3t1RKUtQNJWBjJPSt4k0ClIuj9Ioqk33lX+OaOiY8YMyg0J1lX20 g4Y3myEVr7KKNnhTk8V/Wlg21l5ZuuAW+wHILdlSBJ9zJwOZExKYtOYdHqnNBRxAaAwsH f3dpWkAmSoztUas1OIvDcOhTPDEBFg5F7vB3Ma+Wu629ai6Exef7mVY3NeShfOw+pGzXw uKmbFZvq/qvBxFyNKMtVdhM9/lq7FafEQdtw5GPTalkExopiSO9O+RfWSwAWZGcqEYeam ZQeQCd2AQTkkpT53Smnu/vmKr8z0PGFplk6gmnp5sUhghuYOw0JQp0NYbK8snYAdLgw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795052342; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=V8b9Xr+PWLvqGu4WpQgOElD92SGdeGrweLOVXhTTR5I=; b=OfL6I1foYrS3q3V2Ze93F3q1LJNFXpI+LioT11LFU/0/Hye/TyJ4nLaqa6Dp5Xq5GBAF +RL31sKHVK1l/TnyH4AwEnE70bNbwsggf7smq0YzwujDp/DUQLB5+XyWbmglQD5rXIrQZ nFjESS5H7Es8CcNSmMhcik2OykjDef6HgFqpcet9SvV1UJYFKbXHbhyBj2OjPxZd1Q72V xLo2X7JbgaebMZ0DubpOhFCRqoV/rQup3gd0d/ETb6ACK7Ve+kfTdwDVQ+/LJHV61j3Nb bvGxifEzVrU2dqH6MVuNtNu4SSXe1VqgusUvOWgSXHWBpEynhITbzPB3dbXaTaCna7w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=cloudflare.com; spf=pass smtp.mailfrom=cloudflare.com; dkim=pass header.d=cloudflare.com header.i=@cloudflare.com header.a=rsa-sha256 header.s=google09082023 header.b=ClQHi9Jj; arc=none smtp.remote-ip=209.85.218.50 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A4CA660A2603 for ; Thu, 19 Nov 2026 01:39:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org A4CA660A2603 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.a=rsa-sha256 header.s=google09082023 header.b=ClQHi9Jj Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-c50aaad19fbso188639266b.0 for ; Wed, 18 Nov 2026 17:39:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1795052340; x=1795657140; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=V8b9Xr+PWLvqGu4WpQgOElD92SGdeGrweLOVXhTTR5I=; b=ClQHi9JjXoX4gTp6fvWVDSIMJfXoJvnKkpby2BNVmZvlTzGnDQpkEF/IufiAiWQDH3 4XbMCOS47+h0fAKMCnm7WhLUxKugmbck0lSfi71pSBvZOMURzMMiew44ukKyVJFPvO5I 5hq3GT0CUvWZYRgATWvN+vLV9ZH/AZaeESPlb8kZxOQCOJxQFDTMQAZ7SnGt0aMYU7A/ JPRJil2TEZ3QeJKcb1w1My8Guz5oP1K9+gHubcFJ2ct7bq/syhytJwrMO7oTwfqzK4G5 3IlcAIc225uQBqYxj3sntB9+5D/XKAyw++VxdLH6hm91GBumqags9CMh5SVs6VVcOuXJ VEDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795052340; x=1795657140; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=V8b9Xr+PWLvqGu4WpQgOElD92SGdeGrweLOVXhTTR5I=; b=RZPOS7EbBdHCRL1DY3jsR7QrQbHcJ2PT//pi55pSDzasCY5xEnbQNLeGlhn+Md1y1V yklZoAmk+kxzPmFg3SS2h52DBjp0BfAHaqQ9z7m1icZSjbHViU0qPkEvFKRf9VfcjIKB eEbo1PvNvijsJBu9Zqy7q4N13JohbjLn0BrF4FmcwO6ThGI1nEE/diFP/eM5YLRz92nW P95cMzeROh2DasZVUBEuuXt6wfhccQ0yOT7YJ8+WDqtOKFDbWAEpMmCGSHiPtESjwGhX PNePmaY8aeUT4P1QWeckU/JQlRO69nbWRoezeMU1mgFdBib3Ciwf2CAOEzFu2nqej+Fe R0wA== X-Forwarded-Encrypted: i=1; AL+hErHHqZRXp1HTYRS086x6kC2BG1uO/DuUTCM4s6FaFVX0t55RNM+TvClIKnx06eB2b3mTCVsmn2GG2u8=@vger.kernel.org X-Gm-Message-State: APuU4Z8tgfVGFtvSFBEW4sShLjYF3aaZvX4qZ/AGB+ygDQw7QfKkuDG3 NoVQLfVODBBdoORtCvSVOPrQbythyZqVFa0K2BCQIMcDCStbDxiQK16w7VBD/LTxJLs= X-Gm-Gg: AYBFou2skAB0D5JRk/4x2of1+qc/4nblDa41tWcdt4fn5PfAKx0DTQzgJtXMt4Zm6jb TsLxBQS3RXNs2pbRGBEi2rKw6EJXDtGrA7xcuPmRPwjdNDu+wPLMe3hamOpC/hPTbxA9Q/+96+x ZBbzFx/yF1zMUicOy646dau9GGWcL32KMKQ4xbxT85Ua53TNt6DCqFr8sai6JbVr/SOZHkBvVNN 4ppEYxvzfBgcf699N9dKohuaiRERl4kSvuGbfrfccH3WF+EW64tad8II0nxTelhOjHRSviTTN0N QSaO43q3habys4AqyLXxHlnwvO4HqiJY+AkG7P7e/NIl9M06PqspxVYRYjSwPz/E5gCGzJFdlZV axRTOqKEPsthVu2ZkEpj+Piq+FNtNtvHFct27icbfvWVBMhiOuBWdrjx/SAL+zsdrPS7DLawPD3 TYVyqaOoUZVIR39Lip5s9aouzFjYNWr2ieBapylk5bP7msZbCdCqP2cKcaC/KU8U2GFBWz59Puk Tb7Xb/D/Gpp163l+FUyjuor1tSVO9PD0LDoVIdBjp/QkQ5MSpNEJUB6qmCRYF0lcVw9VA4tPp/E IWrikv4aeJdJfpTx2QvPlM9pGOHpp0KFBsyg7GyXxc7CqXTKxc/cN5/I6w== X-Received: by 2002:a17:907:802:b0:c49:cfcd:69e5 with SMTP id a640c23a62f3a-c510e2f11afmr435569066b.32.1795052340058; Wed, 18 Nov 2026 17:39:00 -0800 (PST) Received: from L9JK9NPFH9 ([104.28.20.56]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c51233c4080sm59785966b.16.2026.11.18.17.38.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 18 Nov 2026 17:38:59 -0800 (PST) From: Tianyi Gao To: netdev@vger.kernel.org, Jakub Kicinski , Paolo Abeni , Eric Dumazet Cc: "David S. Miller" , Simon Horman , David Keogh , Jesper Dangaard Brouer , Daniel Borkmann , David Woodhouse , Dragos Tatulea , Nimrod Oren , Alasdair McWilliam , Willem de Bruijn , Maciej Fijalkowski , Stanislav Fomichev , Magnus Karlsson , David Ahern , Ido Schimmel , Alexei Starovoitov , John Fastabend , Donald Hunter , Andrew Lunn , Jonathan Corbet , Shuah Khan , Shuah Khan , Randy Dunlap , Breno Leitao , =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= , Danielle Ratson , Kuniyuki Iwashima , bpf@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-team@cloudflare.com, nh-open-source@amazon.com, Stephen Hemminger , "Gustavo A. R. Silva" , "Remy D. Farley" , Amery Hung , Andrii Nakryiko , Andy Roulin , Anil Kaushik , Demos Ra , Eduard Zingerman , Emil Tsalapatis , Hangbin Liu , Ihor Solodrai , Jiayuan Chen , Jiri Olsa , Joe Damato , Kumar Kartikeya Dwivedi , Li RongQing , Louis Scalbert , Marc Kleine-Budde , Martin KaFai Lau , Martin Karsten , Matt Bobrowski , Michael Bommarito , Nikolay Aleksandrov , Runyu Xiao , Song Liu , Thorsten Leemhuis , Wang Zhan , Yonghong Song , Zhou Qiuyue , Tianyi Gao , Tianyi Gao Subject: [PATCH net-next v2 07/11] selftests: net: tx_extra_headroom: test a push at TC egress Date: Thu, 19 Nov 2026 01:38:26 +0000 Message-ID: <20261119013830.36935-8-tianyi@cloudflare.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261119013830.36935-1-tianyi@cloudflare.com> References: <20261119013830.36935-1-tianyi@cloudflare.com> X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add test cases for the "tx_extra_headroom:" decl tag on tcx egress programs. The new programs in tx_extra_headroom.bpf.c push 20 or 30 bytes after the MAC header with bpf_skb_adjust_room() and record whether skb->head changed. A new skb->head means that pskb_expand_head() reallocated the packet. The record program from the previous patch runs first and records tx_extra_headroom. The cases check that: - a push without a tag reallocates and a push with a tag of 20 does not; - tx_extra_headroom is 20 with the tagged program and 0 after it is detached; - with XDP on the peer, tx_extra_headroom is 256 + 20; - with tags of 20 and 30, tx_extra_headroom is 50 and neither push reallocates; - with a tag of 512 and XDP on the peer, tx_extra_headroom is 512 and not 256 + 512. The next patch tests the tags that the verifier rejects. Signed-off-by: Tianyi Gao --- The push program follows tools/testing/selftests/bpf/progs/test_dst_clear.c. Replacing a program with BPF_F_REPLACE or BPF_LINK_UPDATE is not tested, because bpftool cannot do either. v2: - Built from v1 5/8. Attach with tcx and declare the headroom with a decl tag, instead of a tc filter and IFLA_TX_EXTRA_HEADROOM. - Add the detach, peer XDP, two program and maximum cases. --- .../selftests/net/tx_extra_headroom.bpf.c | 59 +++++++++++- .../selftests/net/tx_extra_headroom.py | 92 ++++++++++++++++++- 2 files changed, 148 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/tx_extra_headroom.bpf.c b/tools/testing/selftests/net/tx_extra_headroom.bpf.c index d80f4567873a..df6cf112af90 100644 --- a/tools/testing/selftests/net/tx_extra_headroom.bpf.c +++ b/tools/testing/selftests/net/tx_extra_headroom.bpf.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Record the headroom fields of a test packet. */ +/* Record the headroom fields of a test packet and push headers onto it. */ #include #include #include @@ -12,6 +12,8 @@ #include #define UDP_TEST_PORT 9999 +#define PUSH_LEN 20 +#define PUSH_MARK 0x1d struct net_device { unsigned short needed_headroom; @@ -20,6 +22,8 @@ struct net_device { struct sk_buff { struct net_device *dev; + unsigned char *head; + unsigned char *data; __u8 pp_recycle:1; } __attribute__((preserve_access_index)); @@ -29,6 +33,9 @@ __u32 count; __u32 needed_headroom; __u32 tx_extra_headroom; bool pp_recycle; +__u32 pushes; +__u32 headroom; +bool reallocated; static bool is_test_packet(struct __sk_buff *skb) { @@ -78,4 +85,54 @@ int record(struct __sk_buff *skb) return TCX_NEXT; } +static int push(struct __sk_buff *skb, int len) +{ + struct sk_buff *kskb; + unsigned char *head; + + if (skb->mark != PUSH_MARK && !is_test_packet(skb)) + return TCX_NEXT; + + kskb = bpf_cast_to_kern_ctx(skb); + headroom = kskb->data - kskb->head; + + /* pskb_expand_head() always allocates a new skb->head. */ + head = kskb->head; + if (!bpf_skb_adjust_room(skb, len, BPF_ADJ_ROOM_MAC, 0)) + pushes++; + if (kskb->head != head) + reallocated = true; + + /* The next program cannot parse the packet after the push. */ + skb->mark = PUSH_MARK; + return TCX_NEXT; +} + +SEC("tcx/egress") +int push_untagged(struct __sk_buff *skb) +{ + return push(skb, PUSH_LEN); +} + +SEC("tcx/egress") +__attribute__((btf_decl_tag("tx_extra_headroom:20"))) +int push_tagged(struct __sk_buff *skb) +{ + return push(skb, PUSH_LEN); +} + +SEC("tcx/egress") +__attribute__((btf_decl_tag("tx_extra_headroom:30"))) +int push_tagged_30(struct __sk_buff *skb) +{ + return push(skb, 30); +} + +SEC("tcx/egress") +__attribute__((btf_decl_tag("tx_extra_headroom:512"))) +int tag_max(struct __sk_buff *skb) +{ + return TCX_NEXT; +} + char _license[] SEC("license") = "GPL"; diff --git a/tools/testing/selftests/net/tx_extra_headroom.py b/tools/testing/selftests/net/tx_extra_headroom.py index 4058d0e64fc5..122a1a1b5ca9 100755 --- a/tools/testing/selftests/net/tx_extra_headroom.py +++ b/tools/testing/selftests/net/tx_extra_headroom.py @@ -7,7 +7,7 @@ import socket import struct from pathlib import Path -from lib.py import ksft_run, ksft_exit, ksft_eq, ksft_gt +from lib.py import ksft_run, ksft_exit, ksft_eq, ksft_ge, ksft_gt from lib.py import KsftSkipEx, KsftFailEx from lib.py import ksft_busy_wait, ksft_variants, KsftNamedVariant from lib.py import cmd, defer, ip, bpftool, bpf_prog_map_ids @@ -18,8 +18,10 @@ XDP_OBJ = Path(__file__).parent / "lib/xdp_dummy.bpf.o" XDP_HELPER = Path(__file__).parent / "lib/xdp_helper" PIN_DIR = Path("/sys/fs/bpf/tx_extra_headroom") PORT = 9999 # UDP_TEST_PORT in tx_extra_headroom.bpf.c +PUSH_LEN = 20 # PUSH_LEN in tx_extra_headroom.bpf.c ETH_P_ALL = 0x0003 XDP_PACKET_HEADROOM = 256 +TX_EXTRA_HEADROOM_MAX = 512 # NETDEV_TX_EXTRA_HEADROOM_MAX def _setup_addrs(peer_ns, dev, peer): @@ -270,6 +272,87 @@ def test_bridge_vxlan() -> None: XDP_PACKET_HEADROOM) +@ksft_variants([ + KsftNamedVariant("untagged", "push_untagged", 0, True), + KsftNamedVariant("tagged", "push_tagged", PUSH_LEN, False), +]) +def test_push(prog, tx_extra_headroom, reallocated) -> None: + """Check that the tag of a tcx program avoids a reallocation.""" + with NetNS() as send_ns, NetNS() as peer_ns, NetNSEnter(str(send_ns)): + _setup_veth(peer_ns) + map_id = _load_progs() + _attach_tcx("veth0", "egress", "record") + _attach_tcx("veth0", "egress", prog) + _send_udp4() + bss = _read_bss(map_id) + + ksft_eq(bss["pushes"], 1) + ksft_eq(bss["tx_extra_headroom"], tx_extra_headroom) + ksft_eq(bss["reallocated"], reallocated) + + +def test_push_detach() -> None: + """Check that detaching the tagged program clears tx_extra_headroom.""" + with NetNS() as send_ns, NetNS() as peer_ns, NetNSEnter(str(send_ns)): + _setup_veth(peer_ns) + map_id = _load_progs() + _attach_tcx("veth0", "egress", "record") + _attach_tcx("veth0", "egress", "push_tagged") + _send_udp4() + ksft_eq(_read_bss(map_id)["tx_extra_headroom"], PUSH_LEN) + # Without a program argument, bpftool detaches the last program. + bpftool("net detach tcx_egress dev veth0") + _send_udp4() + ksft_eq(_read_bss(map_id)["tx_extra_headroom"], 0) + + +def test_push_peer_xdp() -> None: + """Check that the tag adds to the headroom for XDP on the peer.""" + with NetNS() as send_ns, NetNS() as peer_ns, NetNSEnter(str(send_ns)): + _setup_veth(peer_ns) + map_id = _load_progs() + _attach_tcx("veth0", "egress", "record") + _attach_tcx("veth0", "egress", "push_tagged") + _attach_xdp(peer_ns) + _send_udp4() + bss = _read_bss(map_id) + + ksft_eq(bss["pushes"], 1) + ksft_eq(bss["tx_extra_headroom"], XDP_PACKET_HEADROOM + PUSH_LEN) + ksft_ge(bss["headroom"] - PUSH_LEN, XDP_PACKET_HEADROOM, + "headroom left for XDP after the push") + + +def test_push_two_progs() -> None: + """Check that the tags of two tcx programs add up.""" + with NetNS() as send_ns, NetNS() as peer_ns, NetNSEnter(str(send_ns)): + _setup_veth(peer_ns) + map_id = _load_progs() + _attach_tcx("veth0", "egress", "record") + _attach_tcx("veth0", "egress", "push_tagged") + _attach_tcx("veth0", "egress", "push_tagged_30") + _send_udp4() + bss = _read_bss(map_id) + + ksft_eq(bss["pushes"], 2) + ksft_eq(bss["tx_extra_headroom"], PUSH_LEN + 30) + ksft_eq(bss["reallocated"], False, "a push reallocated the head") + + +def test_tag_max() -> None: + """Check that the maximum tag is accepted and that the sum is capped.""" + with NetNS() as send_ns, NetNS() as peer_ns, NetNSEnter(str(send_ns)): + _setup_veth(peer_ns) + map_id = _load_progs() + _attach_tcx("veth0", "egress", "record") + _attach_tcx("veth0", "egress", "tag_max") + _attach_xdp(peer_ns) + _send_udp4() + bss = _read_bss(map_id) + + ksft_eq(bss["tx_extra_headroom"], TX_EXTRA_HEADROOM_MAX) + + def main() -> None: """Run all test cases.""" ksft_run([test_peer_xdp, @@ -277,7 +360,12 @@ def main() -> None: test_peer_xdp_netkit, test_detach, test_bond, - test_bridge_vxlan]) + test_bridge_vxlan, + test_push, + test_push_detach, + test_push_peer_xdp, + test_push_two_progs, + test_tag_max]) ksft_exit() -- 2.56.0