From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f171.google.com (mail-yw1-f171.google.com [209.85.128.171]) (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 592793D524E for ; Wed, 8 Apr 2026 15:10:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775661030; cv=none; b=aMFrux8I2hfhcGPE5Pco6pWVP7TlwddAoiIPOW37vhRZ5ungEBU9xVNo+ZQuYGOoFZYFCwPrzSciBDz37tIC1l+vhZUvtXBpkIAvhlUFbdaQfJCw7Sba4+XDyHclPJBaomVRQvz3WBQDMsJ+gnjfLz+EE0kiRtpwjxy655KYbic= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775661030; c=relaxed/simple; bh=vOpR3QprRCoCSUSNkfjF5VxENkiKE25FatWfq3c5xfI=; h=Date:From:To:Cc:Message-ID:In-Reply-To:References:Subject: Mime-Version:Content-Type; b=jM3vmtd67Qz18FIDusnF2o08FEw4i5tsSSUgvTplxoHwHrbAKiF27OV6Ba9IHK8dzQ+Ed8TKZyLINKZtyAYlOjmbQJDD9tSMg7LgftfuhWlpPgnHYLKvCWdAzllbFvgAiBwCiHI+/M6/Z8K93YGMjhcrQtmu7lLmwFQtu8oaTMQ= 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=Rtr5j7Yp; arc=none smtp.client-ip=209.85.128.171 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="Rtr5j7Yp" Received: by mail-yw1-f171.google.com with SMTP id 00721157ae682-794719afcd4so162227b3.1 for ; Wed, 08 Apr 2026 08:10:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775661028; x=1776265828; 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=JWIArzpyOOvfAEAf63T5ijzN/e9W9mTmg83yyPjlKNo=; b=Rtr5j7Ypk51ub5o1xrBiGukwtti9l4BH0sKzRygdmBLfTjxc0PMxVjgVtCPzCoFT3Z Ekw6YIabsynSFo4qw3+ijG63HzDmv8tvISZmUpmzhnWqqPqik5smnCYm1S7n2zCfY+Gr XwRF/+g0EMCPlzGkajo0dgubWZBlAFgHV4TcVHtJw861Q3RuYQRjnuUECpbDFKBkLA7k WRgUFMgGNQQBVOTR7jsDrC7cNRdaS61rZGs0u1E7meYlhzvqmbjz5q8MoymGHvphc+Af ltmEWw39ldh59HfiR9RoCXtxhaeYGGW3bvU3eqd7hGjNLiWurnhqD9ar0sltWsoZHb0p EuCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775661028; x=1776265828; 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=JWIArzpyOOvfAEAf63T5ijzN/e9W9mTmg83yyPjlKNo=; b=Mu3AFn0YnG/Laezp/T1b5+ORE5oHMC+XcxUc2Db2+NbjM6ovbE3NImJyo8YYGYAFRu Gx57ss9AUJildHAho8N8QaRsGW/50oNVMbjvFcJXXHin7buGw2NvPoy0lq/DmGbGRYY8 6X84uCjO4Rb46ilQhfDyN//mJ2JXbTwc17B4ZN+jjwvYectlGjw3yY0ADlKJQjbXnB/a G0ec01hJVxzzA+jV6beZn+79mdZozi9FvckhgTKat/uFcqPJ1RxzfrHIMrwGCTilAZVd H5RL7oHYyvj7lnMMIAJ/mqDDw3hpoI3h+sfshTXVNBE31PhtBPOphdzU7c7NwDWaY57S 6YwA== X-Forwarded-Encrypted: i=1; AJvYcCXLOvNmY10jIcYj2voXfbDIMcf+7FQbqfxZZ8hDHdzuWcFxLJNdMgLWPZpjJVxaQ3sgM7tsXucoQGbWA8A=@vger.kernel.org X-Gm-Message-State: AOJu0YwF8L6iBiGIJ95Ll4oMUiqI4aAZQB4Rj/pMLA5EJ2fHA75tUF0N 1z+CM4r9rb2bEIjkVe43NQaMUz12r7nljT6Ke5b0gkHKuC32BsX7d9LB X-Gm-Gg: AeBDievO9ENF0QqTlRV3XQmBXgnbvQp0VE95YQx0SrN2CYTW2vo2JQZx32t6BULTDLz kR5JjaInpC/JmF1jpWJBAwA5FR8YJimVCm+M9hMLgQVVXSOX1cCJeJx6zIr3Z5J4SPkGfahC/wd IczQ4oJuT1fiRf7MsYEJxDYekk5ySkfIlvlNqciRMJj+eRzkAYINndVp/bZNuFixPaz0t0wbKGC fr/6dFnXYvPxEI2pODfUb8gLKTE2rRWRvnvtdF5LBG0NVJ1QPJISyCLvBBGZmGmonCkno8+6cW2 qwdQxIyk8k9A97h8bYi8R4Vy0aW4TT4TOzWjAeToNEUzHQDV6uItcUN9M9tgjIR420eltVbTrHv 0OSpDT82bwwT9h77L9NQunAbj2DIR5mExCRgCEw4f/bpsxFcihOfvBnmjRdUi4LgZm7AL6Eg3Re JHVHVPoJPRCmHe2bBlVEHdtgFc7lOjeAV3B0vFrMkCE4iuZKkfQVmwb231SmKWs0dOQhcf8pM4d PBb X-Received: by 2002:a05:690c:88:b0:79f:d961:47d3 with SMTP id 00721157ae682-7a4d3ac7a52mr210788537b3.21.1775661028199; Wed, 08 Apr 2026 08:10:28 -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-7a36e42ff26sm89073237b3.9.2026.04.08.08.10.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 08:10:27 -0700 (PDT) Date: Wed, 08 Apr 2026 11:10:25 -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 , Max Tottenham , Anna Glasgall , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org Message-ID: In-Reply-To: <20260407105005.1639815-6-nhudson@akamai.com> References: <20260407105005.1639815-1-nhudson@akamai.com> <20260407105005.1639815-6-nhudson@akamai.com> Subject: Re: [PATCH bpf-next v3 5/6] bpf: clear decap tunnel GSO state in skb_adjust_room 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: > On shrink in bpf_skb_adjust_room(), clear tunnel-specific GSO flags > according to the decapsulation flags: > > - BPF_F_ADJ_ROOM_DECAP_L4_UDP clears SKB_GSO_UDP_TUNNEL{,_CSUM}, and > SKB_GSO_TUNNEL_REMCSUM > - BPF_F_ADJ_ROOM_DECAP_L4_GRE clears SKB_GSO_GRE{,_CSUM} > - BPF_F_ADJ_ROOM_DECAP_IPXIP4 clears SKB_GSO_IPXIP4 > - BPF_F_ADJ_ROOM_DECAP_IPXIP6 clears SKB_GSO_IPXIP6 > > When all tunnel-related GSO bits are cleared, also clear > skb->encapsulation. > > Handle the ESP inside a UDP tunnel case where encapsulation should remain > set. > > If UDP decap is performed and GSO state removed then reset encap_hdr_csum, and > remcsum_offload. > > Co-developed-by: Max Tottenham > Signed-off-by: Max Tottenham > Co-developed-by: Anna Glasgall > Signed-off-by: Anna Glasgall > Signed-off-by: Nick Hudson > --- > net/core/filter.c | 40 ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 40 insertions(+) > > diff --git a/net/core/filter.c b/net/core/filter.c > index 7f8d43420afb..04059d07d368 100644 > --- a/net/core/filter.c > +++ b/net/core/filter.c > @@ -3667,6 +3667,46 @@ static int bpf_skb_net_shrink(struct sk_buff *skb, u32 off, u32 len_diff, > if (!(flags & BPF_F_ADJ_ROOM_FIXED_GSO)) > skb_increase_gso_size(shinfo, len_diff); > > + /* Selective GSO flag clearing based on decap type. > + * Only clear the flags for the tunnel layer being removed. > + */ > + if ((flags & BPF_F_ADJ_ROOM_DECAP_L4_UDP) && > + (shinfo->gso_type & (SKB_GSO_UDP_TUNNEL | > + SKB_GSO_UDP_TUNNEL_CSUM | > + SKB_GSO_TUNNEL_REMCSUM))) > + shinfo->gso_type &= ~(SKB_GSO_UDP_TUNNEL | > + SKB_GSO_UDP_TUNNEL_CSUM | > + SKB_GSO_TUNNEL_REMCSUM); REMCSUM was previously not included in the series. It is a non-obvious and rare enough feature that I would exclude it, or move it to a separate patch. > + if ((flags & BPF_F_ADJ_ROOM_DECAP_L4_GRE) && > + (shinfo->gso_type & (SKB_GSO_GRE | SKB_GSO_GRE_CSUM))) > + shinfo->gso_type &= ~(SKB_GSO_GRE | > + SKB_GSO_GRE_CSUM); > + if ((flags & BPF_F_ADJ_ROOM_DECAP_IPXIP4) && > + (shinfo->gso_type & SKB_GSO_IPXIP4)) > + shinfo->gso_type &= ~SKB_GSO_IPXIP4; > + if ((flags & BPF_F_ADJ_ROOM_DECAP_IPXIP6) && > + (shinfo->gso_type & SKB_GSO_IPXIP6)) > + shinfo->gso_type &= ~SKB_GSO_IPXIP6; > + > + /* Clear encapsulation flag only when no tunnel GSO flags remain */ > + if (flags & (BPF_F_ADJ_ROOM_DECAP_L4_MASK | > + BPF_F_ADJ_ROOM_DECAP_IPXIP_MASK)) { > + if (!(shinfo->gso_type & (SKB_GSO_UDP_TUNNEL | > + SKB_GSO_UDP_TUNNEL_CSUM | > + SKB_GSO_GRE | > + SKB_GSO_GRE_CSUM | > + SKB_GSO_IPXIP4 | > + SKB_GSO_IPXIP6 | > + SKB_GSO_ESP))) > + if (skb->encapsulation) > + skb->encapsulation = 0; > + > + if (flags & BPF_F_ADJ_ROOM_DECAP_L4_UDP) { > + skb->encap_hdr_csum = !!(shinfo->gso_type & SKB_GSO_UDP_TUNNEL_CSUM); Since the flag is never set, only possibly cleared: just clear this field when clearing the flag? It appears that this is only used for deprecated UFO anyway. > + skb->remcsum_offload = !!(shinfo->gso_type & SKB_GSO_TUNNEL_REMCSUM); Always zero?