From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yx1-f54.google.com (mail-yx1-f54.google.com [74.125.224.54]) (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 A232D33F8C2 for ; Wed, 18 Mar 2026 20:09:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773864571; cv=none; b=beSVrWkBbvvhoI/LmHkH9j9302pbg0OJjN2siEU2ICzUSs2DeDe63R/4y976sqDZyRLXSU1GonQe/ZFf6TuNzkd161KpmxVXH5J6rlvPV7xH8LdZrp1gH09fr+zL9qdgZ5C7grM1GsQ2zeOOQPwgL7m1pwj+oySr860ouHk6mDE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773864571; c=relaxed/simple; bh=G/CSiwUSEOqLczHCD6ZmlD84NXvI596h7Wx0J+y9n9k=; h=Date:From:To:Cc:Message-ID:In-Reply-To:References:Subject: Mime-Version:Content-Type; b=J8DSbdc7vBtAmLBPJvYCjEUmv1fwmQ3e1u7lFZjAg7WtjK4Tnc3MVPiNeIip3ouw9XBBQ04p2/i93Lfe0PVjtWbuIGuo8cbvKOPsgN3zOsI0dkdN7VsgMoY5gtYdvccT25tkCqG524m2AvUTjzltxYX+RChYGEPvmKPw/PaQr/M= 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=MZMYXdmD; arc=none smtp.client-ip=74.125.224.54 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="MZMYXdmD" Received: by mail-yx1-f54.google.com with SMTP id 956f58d0204a3-64aedd812baso377207d50.3 for ; Wed, 18 Mar 2026 13:09:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773864570; x=1774469370; 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=o8FFlAehcFfcN+ZVaCQWmsQGGFzkurvOjaypfavq2lg=; b=MZMYXdmDVzHZa5p6P7mAka8KD060PRXBRA1yAuCtDEkKGNO3oh17HBS9U1Ym6oboEr Fc7buwL31S0vjxP6Vcz0yG2yw8SNf2VykEOqSfB6vHkpzQE6Hzqg1uE1f6GuYc/bcJLD WLsNbFssjONpqsSZfrab5oPVlRuQ/XgK3k9FLzmHpRx2OBJ0ZIyn+4VLd3BkApZTHdlM ZmGoK+NO5DQXX/ezXG1p6bod9EsghRQkhdup+ZuZce62SQVJAgZisDI/rdO+pRyciahx 2bgv/OSR5DR/0EGRzx8CJRyXUZOSQX6031uikbsfnt+bxz8X0rGwVG8IOFEdSHqPbkht IHAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773864570; x=1774469370; 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=o8FFlAehcFfcN+ZVaCQWmsQGGFzkurvOjaypfavq2lg=; b=c9++Z3cXS3vaW4g4VaxcLCULTzAGW9vb8LR0J0NaA/M1NEVdjIB8KzSoiF2AZqKrAv rNcWsr8FxI22FqLayYV1kdBZFVZf6v8ItuT17Uy9FSk46ier5Jq9GWusmB0VDS/ARIwB j7wf3YhY0YnguerBfJngWXWdF8cb1YJALOD+u8Us8vDUlK7JmbEza6wQ7YzKP+tr8YBz PASavc90Ah2djXSG1hvaclGZ7L3EPQwzIwxlxjGTVbx6mky3q+1z3Usm3CGgILjZVSiJ hhmVsFSxxXetIvJVnI3Gaord/kKICxALmi31rYHkjeSATpCLemsiJSj74F6EJLolNUW8 AvZg== X-Forwarded-Encrypted: i=1; AJvYcCVbWytPcXn3gay0+08Lb5/mVdfIAJDz9IqeNTguB7H534xcBhqwz4jsJGa6c4HEqw2hRoDBKlz6kj/FzSU=@vger.kernel.org X-Gm-Message-State: AOJu0YyoKH18HqPrtFqYw0JUW7N935/CmQSkLOSE9DXjSPO4geWSG8np n0daC7xagi0y2e3azazDXTfVhtk61xYHbcvoJM48JcGYOPovqNzKY4Xc X-Gm-Gg: ATEYQzydiR4xTk7RHBJ8PWOp+xF9Mao/MuhK1H2Fdvoe84a6ZIgM6mtFAKlZ2kOjs/J qGqB1gIihCuZTwtl0ySJng2TVlUFcfvSwHsfFPiD5R6EDSNlIxHP6c/6ckYGA2m5WkEZVaVMZa/ Jagbr69myHWVazy4gunZoQPGmQ84dCq53nx9Mnr0lMAI+ntz7VFEgLz1bnKRWXeHUAv1oBtAynB Xj5vFpQlNE4lRcJ1wPUUTzpLEeIQ5NdBSbs4plFxbb464048m7OOMBF9ygxiHmP8Awdjfe2DmAF aIrQfaMziNJ7uiyLtF+vzaGvnwzmEQEB+MUjXbcy7sA7ZFm4P7fVgWYDWJ0Ruu9hOSYyRORzubg pxp190sunFokqBrTuxL4URXq8otxQlk3g/xUFMf51/8M+fpuAwagbmM9mS3nJhN9HkcPPGiuScp t58NHCrYH7cCuHUWrc7pelb+LZzR2FDb9A8Ke8k4udpBbQd17o9Rrp8uj0kxLIikxoZvGr5fxT2 0fL X-Received: by 2002:a53:ca02:0:b0:64c:a49b:ed78 with SMTP id 956f58d0204a3-64e915bd965mr3283791d50.38.1773864569681; Wed, 18 Mar 2026 13:09:29 -0700 (PDT) Received: from gmail.com (180.134.85.34.bc.googleusercontent.com. [34.85.134.180]) by smtp.gmail.com with UTF8SMTPSA id 956f58d0204a3-64e91bb9344sm2236439d50.12.2026.03.18.13.09.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 13:09:29 -0700 (PDT) Date: Wed, 18 Mar 2026 16:09:28 -0400 From: Willem de Bruijn To: Nick Hudson , bpf@vger.kernel.org, netdev@vger.kernel.org Cc: Willem de Bruijn , Nick Hudson , Max Tottenham , Anna Glasgall , Martin KaFai Lau , Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org Message-ID: In-Reply-To: <20260318134242.2725749-6-nhudson@akamai.com> References: <20260318134242.2725749-1-nhudson@akamai.com> <20260318134242.2725749-6-nhudson@akamai.com> Subject: Re: [PATCH v2 5/5] 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} > - 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. > > 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 | 31 +++++++++++++++++++++++++++++++ > 1 file changed, 31 insertions(+) > > diff --git a/net/core/filter.c b/net/core/filter.c > index 47aec44a9cd3..35af1199ab97 100644 > --- a/net/core/filter.c > +++ b/net/core/filter.c > @@ -3665,6 +3665,37 @@ 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))) > + shinfo->gso_type &= ~(SKB_GSO_UDP_TUNNEL | > + SKB_GSO_UDP_TUNNEL_CSUM); > + 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_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))) > + if (skb->encapsulation) > + skb->encapsulation = 0; Is there any chance that this might clear it while some other tunnel is still active? From a quick grep on skb->encapsulation the only possible hit I see is SKB_GSO_ESP. > + } > + > /* Header must be checked, and gso_segs recomputed. */ > shinfo->gso_type |= SKB_GSO_DODGY; > shinfo->gso_segs = 0; > -- > 2.34.1 >