From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C86C21256C for ; Thu, 16 Apr 2026 12:33:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776342818; cv=none; b=SVmr4YU7hTSvWqMY2l+Ybz8dIFZRKkABzN76VBgAnerM4URrYPIcPZVY5nuNX6qtlSh8XTolAS0jlYas2OdSgSZkUW3U+8Dp+4PnstZ1/ci94fx2WOjiaBww8Xrg0krrSu+1Humf3BFfLEZN0P3DuBQs+rZcjKpt6Eku+gNySpo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776342818; c=relaxed/simple; bh=CEb3cuo/uAP88ESWyuNyMkZh7DTfU9K7tpZY9polNZ8=; h=Date:From:To:Cc:Message-ID:In-Reply-To:References:Subject: Mime-Version:Content-Type; b=AKRv/dPIaTofbxUV6MiHNtqe4j0u1pvoyDGJssuQXysjgg7poS2XlCELIRHduNPbFYEl33h4YIwoP3q4P4pVhvbCB2wHzWF9N1eqCpOtyusmnngvOjO6cCZw37Yty+9VmR6TN5IJ5z3HrdfcODwcw9PskdNDH+XTGZNNDalM7I8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=V7GJG2gO; arc=none smtp.client-ip=209.85.128.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="V7GJG2gO" Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-7b6ae2ea4a1so29525777b3.2 for ; Thu, 16 Apr 2026 05:33:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776342816; x=1776947616; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=LArw8lu+z3P+Njr288piMWTqVUwbnY19SMC1K2R3E/8=; b=V7GJG2gOVXPXgEcWQ/6GxvBr9fAZXecoBQKOmbmF6wvO2XZB8MRBS/u6R34kQ6AYbZ dYY6FlHa+Edmfc9f1h6SDUcullyvuyeuYEnfZKWF1TFkZpeHOVjsB/pYwL7C+TXbiUV/ 2y1TA1D4YpQ42Yg52hDz3yc+V3EQi+zt+wQGF3zaMsbW6+pdQ+CokgFzDHY20MqdzrMa 5IUmVSMLejNWAAgnwUV/B6+awLkYCf5GatPGp/gJktsBfqABRplmATqWXgU8BtmHMTT1 Y2h0ZQ9p5VicyI3QtbEpzwIXWSolxXkBfSEE86HvCxevq/L0s+QPS1f5AgbJS0aEJrS8 0HNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776342816; x=1776947616; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=LArw8lu+z3P+Njr288piMWTqVUwbnY19SMC1K2R3E/8=; b=ajQcx6ZNyYEztsBCODrjO0OaGrcGaXb4kCy6HurK+IESxPR0fjvwS0abs/8m7K/3ze seeBiXv1mLbvI6FvFfeScjsWiPE3q1AWp+/Hde78jH5iwPFT1W68iwIYuSlxORyOmlX8 SUj6887kVAisHbHFB/EkjmlZXyD0nV9GrMzMjLt1K+o48Slf0wy9O7OnOmdDNhvgXZNb tedMpXRe8SqO51OqCEqKStd3z6Jtyq/1JXND1MTU8RxftDPbQT22MUeQs7L3luvEZmnR MGsLJyIO+skWVdXwu8Tq6y2McE+GHOajvwhqC9iCgxFeFic7h8YmflZyyC7iDRUMThEN YHTA== X-Forwarded-Encrypted: i=1; AFNElJ/GULko9/y50FuxiIe6qQFtXKjsstpPYebKjklZLchECsgR+NcC9ApqBcWgRVx2QMbdLi8oLSGGcMkynH8=@vger.kernel.org X-Gm-Message-State: AOJu0Yxvqmu1M42oKMGZeX8bh2j3R4VSYLiYOpep2/vgz+Gzh2J/N7qk DfSCaN7MO1bDVHZjQPum/86QI2Y5iaFf8R9/TSp5z2T+PKBJUT8V1b8E X-Gm-Gg: AeBDieshblCuH/TvaR0YBRjM1RqrnzIKErdn5qzMC0Qm5q/M2J0onJTUP2peWkeeEm+ dykEruD9gGpWHgSI39eRRcmknf03JtR3m9yaM9fjThZhHkxv5Uj4jsEvQ0UqX4Urz6OZQRcgiEy FYy39o5x9gwRqnbQahMgIG9q6FWTwtxwQnG6y84I167UbqkzYOj1+uBCfKrhUV/AOt6NB0tDMtw j3quyGdphQ+f2MShJehDEkc4DlOncvh9OTP9WKL9xRVNXy9eD/KZ1wouuiFhpfZCsXF6xPLjGXc aiTKZkJQVyB4RDnj41kZnci0rqGk4u/PJYMAo9q83xP6ZBsN1/l2hbAIHtlrLZxlX+KEQZQO9HR ggzcjwuqzMhTXRY5bHdNDR7iUpFOek2WdxBgMaeUTCGt6iy7xIIypMVnoKqlgQ/daltE4l20nrf vQvUC5ce/vhujfuIUpCaeSgOhmBLoq066sUZcY2mJQbAbxqrRNnZkMEXeiLY2rHlDI8YXwtld+N X8WioCaJmcS+RENYtnloXNhxA== X-Received: by 2002:a05:690c:6e85:b0:7b8:f152:753a with SMTP id 00721157ae682-7b8f15278bfmr15108987b3.19.1776342815689; Thu, 16 Apr 2026 05:33:35 -0700 (PDT) Received: from gmail.com (172.165.85.34.bc.googleusercontent.com. [34.85.165.172]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7b7693179a5sm21853427b3.36.2026.04.16.05.33.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Apr 2026 05:33:35 -0700 (PDT) Date: Thu, 16 Apr 2026 08:33:34 -0400 From: Willem de Bruijn To: Nick Hudson , bpf@vger.kernel.org, netdev@vger.kernel.org, Willem de Bruijn , Martin KaFai Lau Cc: Nick Hudson , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Shuah Khan , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Message-ID: In-Reply-To: <20260416075514.927101-7-nhudson@akamai.com> References: <20260416075514.927101-1-nhudson@akamai.com> <20260416075514.927101-7-nhudson@akamai.com> Subject: Re: [PATCH bpf-next v4 6/6] selftests/bpf: tc_tunnel validate decap GSO state Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Nick Hudson wrote: > Require BPF_F_ADJ_ROOM_DECAP_L4_UDP and BPF_F_ADJ_ROOM_DECAP_L4_GRE enum > values at runtime using CO-RE enum existence checks so missing kernel > support fails fast instead of silently proceeding. > > After bpf_skb_adjust_room() decapsulation, inspect skb_shared_info and > sk_buff state for GSO packets and assert that the expected tunnel GSO > bits are cleared and encapsulation matches the remaining tunnel state. > > Signed-off-by: Nick Hudson > --- > .../selftests/bpf/progs/test_tc_tunnel.c | 58 +++++++++++++++++++ > 1 file changed, 58 insertions(+) > > diff --git a/tools/testing/selftests/bpf/progs/test_tc_tunnel.c b/tools/testing/selftests/bpf/progs/test_tc_tunnel.c > index 7376df405a6b..74dfb694a210 100644 > --- a/tools/testing/selftests/bpf/progs/test_tc_tunnel.c > +++ b/tools/testing/selftests/bpf/progs/test_tc_tunnel.c > @@ -6,6 +6,7 @@ > > #include > #include > +#include > #include "bpf_tracing_net.h" > #include "bpf_compiler.h" > > @@ -37,6 +38,23 @@ struct vxlanhdr___local { > > #define EXTPROTO_VXLAN 0x1 > > +#define SKB_GSO_UDP_TUNNEL_MASK (SKB_GSO_UDP_TUNNEL | \ > + SKB_GSO_UDP_TUNNEL_CSUM | \ > + SKB_GSO_TUNNEL_REMCSUM) Leftover remcsum reference? > + > +#define SKB_GSO_TUNNEL_MASK (SKB_GSO_UDP_TUNNEL_MASK | \ Odd indentation? > + SKB_GSO_GRE | \ > + SKB_GSO_GRE_CSUM | \ > + SKB_GSO_IPXIP4 | \ > + SKB_GSO_IPXIP6 | \ > + SKB_GSO_ESP) > + > +#define BPF_F_ADJ_ROOM_DECAP_L4_MASK (BPF_F_ADJ_ROOM_DECAP_L4_UDP | \ > + BPF_F_ADJ_ROOM_DECAP_L4_GRE) > + > +#define BPF_F_ADJ_ROOM_DECAP_IPXIP_MASK (BPF_F_ADJ_ROOM_DECAP_IPXIP4 | \ > + BPF_F_ADJ_ROOM_DECAP_IPXIP6) > + > #define VXLAN_FLAGS bpf_htonl(1<<27) > #define VNI_ID 1 > #define VXLAN_VNI bpf_htonl(VNI_ID << 8) > @@ -592,6 +610,8 @@ int __encap_ip6vxlan_eth(struct __sk_buff *skb) > static int decap_internal(struct __sk_buff *skb, int off, int len, char proto) > { > __u64 flags = BPF_F_ADJ_ROOM_FIXED_GSO; > + struct sk_buff *kskb; > + struct skb_shared_info *shinfo; > struct ipv6_opt_hdr ip6_opt_hdr; > struct gre_hdr greh; > struct udphdr udph; > @@ -621,6 +641,11 @@ static int decap_internal(struct __sk_buff *skb, int off, int len, char proto) > break; > case IPPROTO_GRE: > olen += sizeof(struct gre_hdr); > + if (!bpf_core_enum_value_exists(enum bpf_adj_room_flags, > + BPF_F_ADJ_ROOM_DECAP_L4_GRE)) > + return TC_ACT_SHOT; > + flags |= BPF_F_ADJ_ROOM_DECAP_L4_GRE; > + > if (bpf_skb_load_bytes(skb, off + len, &greh, sizeof(greh)) < 0) > return TC_ACT_OK; > switch (bpf_ntohs(greh.protocol)) { > @@ -634,6 +659,10 @@ static int decap_internal(struct __sk_buff *skb, int off, int len, char proto) > break; > case IPPROTO_UDP: > olen += sizeof(struct udphdr); > + if (!bpf_core_enum_value_exists(enum bpf_adj_room_flags, > + BPF_F_ADJ_ROOM_DECAP_L4_UDP)) > + return TC_ACT_SHOT; > + flags |= BPF_F_ADJ_ROOM_DECAP_L4_UDP; > if (bpf_skb_load_bytes(skb, off + len, &udph, sizeof(udph)) < 0) > return TC_ACT_OK; > switch (bpf_ntohs(udph.dest)) { > @@ -655,6 +684,35 @@ static int decap_internal(struct __sk_buff *skb, int off, int len, char proto) > if (bpf_skb_adjust_room(skb, -olen, BPF_ADJ_ROOM_MAC, flags)) > return TC_ACT_SHOT; > > + kskb = bpf_cast_to_kern_ctx(skb); > + shinfo = bpf_core_cast(kskb->head + kskb->end, struct skb_shared_info); > + if (!shinfo->gso_size) > + return TC_ACT_OK; > + > + if ((flags & BPF_F_ADJ_ROOM_DECAP_L4_UDP) && > + (shinfo->gso_type & SKB_GSO_UDP_TUNNEL_MASK)) > + return TC_ACT_SHOT; > + > + if ((flags & BPF_F_ADJ_ROOM_DECAP_L4_GRE) && > + (shinfo->gso_type & (SKB_GSO_GRE | SKB_GSO_GRE_CSUM))) > + return TC_ACT_SHOT; > + > + if ((flags & BPF_F_ADJ_ROOM_DECAP_IPXIP4) && > + (shinfo->gso_type & SKB_GSO_IPXIP4)) > + return TC_ACT_SHOT; > + > + if ((flags & BPF_F_ADJ_ROOM_DECAP_IPXIP6) && > + (shinfo->gso_type & SKB_GSO_IPXIP6)) > + return TC_ACT_SHOT; > + > + if (flags & (BPF_F_ADJ_ROOM_DECAP_L4_MASK | > + BPF_F_ADJ_ROOM_DECAP_IPXIP_MASK)) { > + if ((shinfo->gso_type & SKB_GSO_TUNNEL_MASK) && !kskb->encapsulation) > + return TC_ACT_SHOT; > + if (!(shinfo->gso_type & SKB_GSO_TUNNEL_MASK) && kskb->encapsulation) > + return TC_ACT_SHOT; > + } > + > return TC_ACT_OK; > } > > -- > 2.34.1 >