From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f175.google.com (mail-dy1-f175.google.com [74.125.82.175]) (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 22EAE3DC4A4 for ; Mon, 1 Jun 2026 17:03:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780333440; cv=none; b=G3u1l0Voey1FLbzh5+IMWcqetw4k9m7zyCVv5CTDiKrA5ZZT0PpPLOkmv1H9I3Ii1SZrv47oAlNzIsxZPezsbIUwRk8tL2JWDmA+S9aLj8Vw9S+lkS3SloRPDVi3xwvAxiKq6TNBS4EHMQiOZUXREcWkF7/tUECfwomnOJlOl7U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780333440; c=relaxed/simple; bh=CJv+ORdfM4d1gC+/h8eXW8d3TcRUhKDuN3NsrTLwwrY=; h=Mime-Version:Content-Type:Date:Message-Id:Cc:Subject:From:To: References:In-Reply-To; b=QEpZB8ixNawE436p8Nl39MH7m5IdauqRhq3nPXphIec3C69Z5QEO/iV4eq4B+YPZMbnYql3ThEHWz85ln8SSG5EmVM59YlP0GINuoIXtnq/am6Mv5xKDAjUo6tUDzrZWpsmAyGLExpg8gibejFo7+4ZHL6AQkTzE+rcT7eLOklo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=etsalapatis.com; spf=pass smtp.mailfrom=etsalapatis.com; dkim=pass (2048-bit key) header.d=etsalapatis-com.20251104.gappssmtp.com header.i=@etsalapatis-com.20251104.gappssmtp.com header.b=c8zku+oa; arc=none smtp.client-ip=74.125.82.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=etsalapatis.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=etsalapatis.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=etsalapatis-com.20251104.gappssmtp.com header.i=@etsalapatis-com.20251104.gappssmtp.com header.b="c8zku+oa" Received: by mail-dy1-f175.google.com with SMTP id 5a478bee46e88-3045c195251so10772300eec.1 for ; Mon, 01 Jun 2026 10:03:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=etsalapatis-com.20251104.gappssmtp.com; s=20251104; t=1780333437; x=1780938237; darn=vger.kernel.org; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-transfer-encoding:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=aDxjxajjjz+WXaa2HC01+77k69ejzz46zXU7TmxK8gU=; b=c8zku+oaTIE4+vxpg+7KrmNNGHSop9C2WtVqZ0oNF05BPNaGvHUFnuI+zI6GzXfbwe ikqnmpozZwPsBcNwcOMRiaiGeY+Uz/Ei7hVEf1GFRfspgu+JnJWGtvWUvwLzNNBxzmZV C1Jl8n4oCCOf4D+8PkSlfit9DAhknGJU5mkSt4wST1Uakbpbh62lZ2mY8EVCgOVf/t5W EapBjL4E3k85qK76XW5vZn4P8pBMK9m0p4UwoguxdeybgyWnuMfD1ct2hIW/KA5rvMyi hmaw0U5n2Kc6SHQH+69W/JX9K1Ty6GamRqnYNR0jHm5TDEfoaU6EGInEEh1t5+Mzagtp +f7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780333437; x=1780938237; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-transfer-encoding:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=aDxjxajjjz+WXaa2HC01+77k69ejzz46zXU7TmxK8gU=; b=Y7uskzEkWNnTeaAt9CiGaq3cmO9y/IRwcyMLOWO4F9El5+tu/+fStK8d+KNyImg4p/ QI7RLhsy+5UjqiTtugiFvH9s45WifGb7gCCxlLyKCTT4JKjb+1yTMnF1zKL9dgKd+MIt 3Mnd6HV1e/sLDO7qrlZCN0U5Wcl9tBBInEQ4+zmoLLZUnBlS4EafWMw7eChAhnvacgDR TlJbsPxbLKxJ2I6k0UbY6wOcWQID0Ha39CEUX0bs6h+WpqxCy3xLda2CZiMqhgojLBxA ZX4TLPZuG4jn0pyiAw3V/lmWZFj9YND6b+PWMK3hkyAwjySSzYDmdpaUE5kfanYppYCA HSXg== X-Forwarded-Encrypted: i=1; AFNElJ9eblDEQ8n6fbVKNo0jvbb9Za6WjgItwF850UXVjTSEGfj6V3iTjabTXFpOcpfXwDLIh1Kkg/lMlqTU1KE=@vger.kernel.org X-Gm-Message-State: AOJu0Yx43ktids6EdKSDc8m+uxTw8ivkoMxCB74HfXcUHfK8HdCDzFpE uSL5OQ7wRjbYavx/8aGQ2QPj8L0Be5iz17G91+4OyxyGIq2LDnyuz131Tktho56hfBk= X-Gm-Gg: Acq92OHf0aj/6Ua2kw5XKPHCejrNGh5PzaSX7SNZiCR+tf129CqNDd+VE39Sk37KCd+ ZiYNsit+tWoqNL1UL/R6FU134+ijrs1ZLzdvxMLlJOSKpCDqQ1CLd2M7hC+U8WGcIramkVQtCAJ QUOjlBCcZBgyn4dgv/RXbqgtN2uZEUUY3Gb/nUV5JXvxsnX5BqhRdhqxysN0Oea/miqU8k2tiiy V2X8kJWqq3tAGrPImanID0lOe8k4KIgmvrW+zcI7NA94fII45VorYq0SdKuOYTmBhn6Wf42eQAc w1qoKgSHlv5kKWzNfZXCWs5mBXCLTBfHWuVqNKcjB6txGpf2sJcaO3V4XqwJ4vxsjMC0yJrF64a AR9BT+0HdYzUFO/aKTMtKn3cORZ9XJqvrFSTmgrvemydPkbl3mdyCaUkWznA8wTWaC9gF6eymML wKhQhjPeKSidlkZUk= X-Received: by 2002:a05:7301:1f0d:b0:2ed:e14:42e9 with SMTP id 5a478bee46e88-304fa693628mr6131496eec.34.1780333437177; Mon, 01 Jun 2026 10:03:57 -0700 (PDT) Received: from localhost ([2620:10d:c090:600::a996]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-304ed5a0b7dsm9613132eec.22.2026.06.01.10.03.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 01 Jun 2026 10:03:55 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Mon, 01 Jun 2026 13:03:52 -0400 Message-Id: Cc: "David S . Miller" , "Eric Dumazet" , "Jakub Kicinski" , "Paolo Abeni" , "Simon Horman" , "Andrii Nakryiko" , "Eduard Zingerman" , "Alexei Starovoitov" , "Daniel Borkmann" , "Martin KaFai Lau" , "Kumar Kartikeya Dwivedi" , "Song Liu" , "Yonghong Song" , "Jiri Olsa" , "Shuah Khan" , "Guillaume Nault" , "Ido Schimmel" , "Fernando Fernandez Mancera" , "Peter Oskolkov" , , , , , "Leon Hwang" Subject: Re: [PATCH bpf v3 1/2] bpf: Update transport_header when encapsulating UDP tunnel in lwt From: "Emil Tsalapatis" To: "Leon Hwang" , X-Mailer: aerc 0.21.0-0-g5549850facc2 References: <20260601150203.20352-1-leon.hwang@linux.dev> <20260601150203.20352-2-leon.hwang@linux.dev> In-Reply-To: <20260601150203.20352-2-leon.hwang@linux.dev> On Mon Jun 1, 2026 at 11:02 AM EDT, Leon Hwang wrote: > Currently, bpf_lwt_push_ip_encap() does not update skb->transport_header. > When a driver, e.g. ice, reuses the stale skb->transport_header to > offload checksum computation to NIC hardware, VxLAN packets encapsulated > by bpf_lwt_push_encap() helper may be dropped due to incorrect checksum. > > Update skb->transport_header in bpf_lwt_push_ip_encap() whenever the > encapsulated packet uses UDP, so checksum offload works correctly. > > Fixes: 52f278774e79 ("bpf: implement BPF_LWT_ENCAP_IP mode in bpf_lwt_pus= h_encap") > Cc: Leon Hwang > Signed-off-by: Leon Hwang > --- > net/core/lwt_bpf.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/net/core/lwt_bpf.c b/net/core/lwt_bpf.c > index f71ef82a5f3d..65d1dfbf3312 100644 > --- a/net/core/lwt_bpf.c > +++ b/net/core/lwt_bpf.c > @@ -599,6 +599,7 @@ static int handle_gso_encap(struct sk_buff *skb, bool= ipv4, int encap_len) > =20 > int bpf_lwt_push_ip_encap(struct sk_buff *skb, void *hdr, u32 len, bool = ingress) > { > + bool is_udp_tunnel; > struct iphdr *iph; > bool ipv4; > int err; > @@ -612,10 +613,16 @@ int bpf_lwt_push_ip_encap(struct sk_buff *skb, void= *hdr, u32 len, bool ingress) > ipv4 =3D true; > if (unlikely(len < iph->ihl * 4)) > return -EINVAL; > + is_udp_tunnel =3D iph->protocol =3D=3D IPPROTO_UDP; > + if (unlikely(is_udp_tunnel && len < iph->ihl * 4 + sizeof(struct udphd= r))) > + return -EINVAL; > } else if (iph->version =3D=3D 6) { > ipv4 =3D false; > if (unlikely(len < sizeof(struct ipv6hdr))) > return -EINVAL; > + is_udp_tunnel =3D ((struct ipv6hdr *)iph)->nexthdr =3D=3D NEXTHDR_UDP; > + if (unlikely(is_udp_tunnel && len < sizeof(struct ipv6hdr) + sizeof(st= ruct udphdr))) > + return -EINVAL; > } else { > return -EINVAL; > } > @@ -637,6 +644,10 @@ int bpf_lwt_push_ip_encap(struct sk_buff *skb, void = *hdr, u32 len, bool ingress) > if (ingress) > skb_postpush_rcsum(skb, iph, len); > skb_reset_network_header(skb); > + if (ipv4 && is_udp_tunnel) > + skb_set_transport_header(skb, skb_network_offset(skb) + iph->ihl * 4); > + else if (!ipv4 && is_udp_tunnel) > + skb_set_transport_header(skb, skb_network_offset(skb) + sizeof(struct = ipv6hdr)); Minor nit: Could we do something like if (is_udp_tunnel) { size_t hrdsz =3D ipv4 ? iph->ihl * 4 : sizeof(struct ipv6hdr); skb_set_transport_header(skb9, skb_network_offset(skb)) + hdrsz; } to make the logic clearer? > memcpy(skb_network_header(skb), hdr, len); > bpf_compute_data_pointers(skb); > skb_clear_hash(skb);