From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.netfilter.org (mail.netfilter.org [217.70.190.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0883A29C35A; Fri, 27 Jun 2025 15:02:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.190.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751036562; cv=none; b=qCoHR1Jd5vrsBbD0aN8x9iIaFWNbVGyh2GBTTCl448ZVjal/YY0ZXlgWLMyJA+h80GTaCNt2QauWnSOtu91VkwQO5+95ABC7w80wnolmCdaopN3b2q/X+RHOdEVl0yvIZXFKG3v3qVDhHq/Z8uelVSEYhG4BKPp9IqtgTgelZsI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751036562; c=relaxed/simple; bh=w+yCshq1AkXfy4TG62/0dF7Z5UjrzjrNi/Pr8M8ehnI=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=LQafMbqjgWi6poA6aja3CXu/DLMMBIvnz8L+x63sAFWlzJRwMlCh/FERIYT2z50G0u1MAqf3e2vvNX73H9KD/zJMSNNqd/WkZ2SSDFLJb4KGkJb0zQsIyUgsD7sdHwJfaPTp/UqtO2U+XtZEx11k8ZJuoF0LIG8R327p7WE4SVQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=netfilter.org; spf=pass smtp.mailfrom=netfilter.org; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b=UF1YQMtS; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b=u7DNS3ec; arc=none smtp.client-ip=217.70.190.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=netfilter.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=netfilter.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b="UF1YQMtS"; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b="u7DNS3ec" Received: by mail.netfilter.org (Postfix, from userid 109) id B6DD76026B; Fri, 27 Jun 2025 17:02:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netfilter.org; s=2025; t=1751036550; bh=3up0GGkeLjfGH9K3CPQwwnONHBuElUgJFrn89fyMrvo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=UF1YQMtSh3F8PdvMtyrPzxuJQAGPhyrJcIIGLhfQCl1OelebSKJ8AA4zsSl6dicGH MsbDDMFQPWJkq2LP3kSMb88DSXVdHNOKVPotWd1CaZ5FcDOwJYVdr74MkT7RhSoeI8 txoxqdFeVaAKomNrfErgf9ZjyMeDzDFob1SjcEYfV6wjZ4WvcWnb0rv5PFkSVomhJI dAAxtDWzaFEeygdiGj0iCaFuMgB7JSpcsLf5+OVvtsX1gToGk8gOY0lh0JKvHAXyzQ qfmThY9JxwCIru5nCrbSfJdo5CEzJf4nV9bdWlEUmu48yAJ4i7JhY0KkKs1ls/tek4 PS152NW/abUgg== X-Spam-Level: Received: from netfilter.org (mail-agni [217.70.190.124]) by mail.netfilter.org (Postfix) with ESMTPSA id A025760265; Fri, 27 Jun 2025 17:02:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netfilter.org; s=2025; t=1751036547; bh=3up0GGkeLjfGH9K3CPQwwnONHBuElUgJFrn89fyMrvo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=u7DNS3ecPip3oMYv/xopaI1mRYnKhmKMv5k240A1tzuTh4BUnmTaxfLxrxb52F0eo UkeINdBbYrljmFJb1pKVXgEtg7aR+1WsmqJ+1Vboi/tgj0JR3Mlcz5YojFopQ+pnm8 6d9cyxaMYmBdlQQfUEa8Zesta/3g0u0to2hCsPpBkZctlToqGIz/X+3y0QtZ3r4p9K 7Stm2lz43BdEnt1hWwQC/TnLgAW3mIVomPAmLEKLIJVmB4vYW7+V2ULTBbaU/hvekE hkpBI9qwHdmVmsXu7mP1jKVxRWwt1k7yRpCelD5taIOYxOQBMjes4fEbYMEnkHCIvg EN3853hRAL6aQ== Date: Fri, 27 Jun 2025 17:02:25 +0200 From: Pablo Neira Ayuso To: Lorenzo Bianconi Cc: "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jozsef Kadlecsik , Shuah Khan , netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH net-next v2 1/2] net: netfilter: Add IPIP flowtable SW acceleration Message-ID: References: <20250627-nf-flowtable-ipip-v2-0-c713003ce75b@kernel.org> <20250627-nf-flowtable-ipip-v2-1-c713003ce75b@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20250627-nf-flowtable-ipip-v2-1-c713003ce75b@kernel.org> On Fri, Jun 27, 2025 at 02:45:28PM +0200, Lorenzo Bianconi wrote: > Introduce SW acceleration for IPIP tunnels in the netfilter flowtable > infrastructure. > IPIP SW acceleration can be tested running the following scenario where > the traffic is forwarded between two NICs (eth0 and eth1) and an IPIP > tunnel is used to access a remote site (using eth1 as the underlay device): > > ETH0 -- TUN0 <==> ETH1 -- [IP network] -- TUN1 (192.168.100.2) > > $ip addr show > 6: eth0: mtu 1500 qdisc noqueue state UP group default qlen 1000 > link/ether 00:00:22:33:11:55 brd ff:ff:ff:ff:ff:ff > inet 192.168.0.2/24 scope global eth0 > valid_lft forever preferred_lft forever > 7: eth1: mtu 1500 qdisc noqueue state UP group default qlen 1000 > link/ether 00:11:22:33:11:55 brd ff:ff:ff:ff:ff:ff > inet 192.168.1.1/24 scope global eth1 > valid_lft forever preferred_lft forever > 8: tun0@NONE: mtu 1480 qdisc noqueue state UNKNOWN group default qlen 1000 > link/ipip 192.168.1.1 peer 192.168.1.2 > inet 192.168.100.1/24 scope global tun0 > valid_lft forever preferred_lft forever > > $ip route show > default via 192.168.100.2 dev tun0 > 192.168.0.0/24 dev eth0 proto kernel scope link src 192.168.0.2 > 192.168.1.0/24 dev eth1 proto kernel scope link src 192.168.1.1 > 192.168.100.0/24 dev tun0 proto kernel scope link src 192.168.100.1 > > $nft list ruleset > table inet filter { > flowtable ft { > hook ingress priority filter > devices = { eth0, eth1 } > } > > chain forward { > type filter hook forward priority filter; policy accept; > meta l4proto { tcp, udp } flow add @ft > } > } Is there a proof that this accelerates forwarding? > Signed-off-by: Lorenzo Bianconi > --- > net/ipv4/ipip.c | 21 +++++++++++++++++++++ > net/netfilter/nf_flow_table_ip.c | 28 ++++++++++++++++++++++++++-- > 2 files changed, 47 insertions(+), 2 deletions(-) > > diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c > index 3e03af073a1ccc3d7597a998a515b6cfdded40b5..05fb1c859170d74009d693bc8513183bdec3ff90 100644 > --- a/net/ipv4/ipip.c > +++ b/net/ipv4/ipip.c > @@ -353,6 +353,26 @@ ipip_tunnel_ctl(struct net_device *dev, struct ip_tunnel_parm_kern *p, int cmd) > return ip_tunnel_ctl(dev, p, cmd); > } > > +static int ipip_fill_forward_path(struct net_device_path_ctx *ctx, > + struct net_device_path *path) > +{ > + struct ip_tunnel *tunnel = netdev_priv(ctx->dev); > + const struct iphdr *tiph = &tunnel->parms.iph; > + struct rtable *rt; > + > + rt = ip_route_output(dev_net(ctx->dev), tiph->daddr, 0, 0, 0, > + RT_SCOPE_UNIVERSE); > + if (IS_ERR(rt)) > + return PTR_ERR(rt); > + > + path->type = DEV_PATH_ETHERNET; > + path->dev = ctx->dev; > + ctx->dev = rt->dst.dev; > + ip_rt_put(rt); > > + return 0; > +} > + > static const struct net_device_ops ipip_netdev_ops = { > .ndo_init = ipip_tunnel_init, > .ndo_uninit = ip_tunnel_uninit, > @@ -362,6 +382,7 @@ static const struct net_device_ops ipip_netdev_ops = { > .ndo_get_stats64 = dev_get_tstats64, > .ndo_get_iflink = ip_tunnel_get_iflink, > .ndo_tunnel_ctl = ipip_tunnel_ctl, > + .ndo_fill_forward_path = ipip_fill_forward_path, > }; > > #define IPIP_FEATURES (NETIF_F_SG | \ > diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c > index 8cd4cf7ae21120f1057c4fce5aaca4e3152ae76d..255ed53c11c927549dc87ffc6c399385e3fb68ff 100644 > --- a/net/netfilter/nf_flow_table_ip.c > +++ b/net/netfilter/nf_flow_table_ip.c > @@ -277,13 +277,31 @@ static unsigned int nf_flow_xmit_xfrm(struct sk_buff *skb, > return NF_STOLEN; > } > > +static bool nf_flow_ip4_encap_proto(struct sk_buff *skb, u16 *size) > +{ > + struct iphdr *iph; > + > + if (!pskb_may_pull(skb, sizeof(*iph))) > + return false; > + > + iph = (struct iphdr *)skb_network_header(skb); > + *size = iph->ihl << 2; > + > + return iph->protocol == IPPROTO_IPIP; > +} > > static bool nf_flow_skb_encap_protocol(struct sk_buff *skb, __be16 proto, > u32 *offset) > { > struct vlan_ethhdr *veth; > __be16 inner_proto; > + u16 size; > > switch (skb->protocol) { > + case htons(ETH_P_IP): > + if (nf_flow_ip4_encap_proto(skb, &size)) > + *offset += size; This is blindly skipping the outer IP header. > + return true; > case htons(ETH_P_8021Q): > if (!pskb_may_pull(skb, skb_mac_offset(skb) + sizeof(*veth))) > return false; > @@ -310,6 +328,7 @@ static void nf_flow_encap_pop(struct sk_buff *skb, > struct flow_offload_tuple_rhash *tuplehash) > { > struct vlan_hdr *vlan_hdr; > + u16 size; > int i; > > for (i = 0; i < tuplehash->tuple.encap_num; i++) { > @@ -331,6 +350,12 @@ static void nf_flow_encap_pop(struct sk_buff *skb, > break; > } > } > + > + if (skb->protocol == htons(ETH_P_IP) && > + nf_flow_ip4_encap_proto(skb, &size)) { > + skb_pull(skb, size); > + skb_reset_network_header(skb); > + } I have a similar patch from 2023, I think I keep somewhere in my trees. > } > > static unsigned int nf_flow_queue_xmit(struct net *net, struct sk_buff *skb, > @@ -357,8 +382,7 @@ nf_flow_offload_lookup(struct nf_flowtable_ctx *ctx, > { > struct flow_offload_tuple tuple = {}; > > - if (skb->protocol != htons(ETH_P_IP) && > - !nf_flow_skb_encap_protocol(skb, htons(ETH_P_IP), &ctx->offset)) > + if (!nf_flow_skb_encap_protocol(skb, htons(ETH_P_IP), &ctx->offset)) > return NULL; > > if (nf_flow_tuple_ip(ctx, skb, &tuple) < 0) > > -- > 2.50.0 >