{"id":2233028,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2233028/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260505-b4-flowtable-sw-accel-ip6ip-v1-2-9ac39ccc9ea9@kernel.org/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.2/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260505-b4-flowtable-sw-accel-ip6ip-v1-2-9ac39ccc9ea9@kernel.org>","list_archive_url":null,"date":"2026-05-05T14:49:24","name":"[nf-next,2/4] net: netfilter: Add encap_proto to flow_offload_tunnel","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"bd1a21c88d81ea60ca0ac189dd3abee8bfb16304","submitter":{"id":76007,"url":"http://patchwork.ozlabs.org/api/1.2/people/76007/?format=json","name":"Lorenzo Bianconi","email":"lorenzo@kernel.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260505-b4-flowtable-sw-accel-ip6ip-v1-2-9ac39ccc9ea9@kernel.org/mbox/","series":[{"id":502850,"url":"http://patchwork.ozlabs.org/api/1.2/series/502850/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=502850","date":"2026-05-05T14:49:22","name":"Add IPv4 over IPv6 flowtable SW acceleration","version":1,"mbox":"http://patchwork.ozlabs.org/series/502850/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2233028/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2233028/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","netfilter-devel@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=E/H8COlV;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c04:e001:36c::12fc:5321; helo=tor.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-12443-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org\n header.b=\"E/H8COlV\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=10.30.226.201"],"Received":["from tor.lore.kernel.org (tor.lore.kernel.org\n [IPv6:2600:3c04:e001:36c::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g91fD4Nc9z1yK2\n\tfor ; Wed, 06 May 2026 00:50:44 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby tor.lore.kernel.org (Postfix) with ESMTP id 90C2F303BB95\n\tfor ; Tue, 5 May 2026 14:50:08 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 5539D47ECF5;\n\tTue, 5 May 2026 14:50:03 +0000 (UTC)","from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org\n [10.30.226.201])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id D42072264A9;\n\tTue, 5 May 2026 14:50:02 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id 0062FC2BCF4;\n\tTue, 5 May 2026 14:50:01 +0000 (UTC)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1777992602; cv=none;\n b=jRcG66B1okg5Jm0xW31dMTuRWTXQyOy7EuiPeEBDj3fz5uRHAT7BrcwUFV0I77w0FCbDLhvOo99CFQ6SPjYtP6lvqw5Qq0PaNldd45C1Qy7z5KQleFFYNH3W4T+7/4hJgY9SjhMP822uYKcx37BZj/LeOyMphIoUzRheTwGJgac=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1777992602; c=relaxed/simple;\n\tbh=92G/hBpoy+tgBOS2x/I53r2sZ5pAyr7z2fg9vOcfHhA=;\n\th=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References:\n\t In-Reply-To:To:Cc;\n b=XQ0qd3VEwd2RZU+t149U9O0jT2EX7ft/xbYKoyhbi9GsatBIckYNWlLrHd1shPtrh7E9Oyp34zUTddfBfv0ewXebM3bTrI3ShPuEV+em8pJIONsHdctvV17ZHIlv9/GcXFMtl+Z9OGILCFXRhaymzPppsmSCcwz4bVZHEqY48so=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org\n header.b=E/H8COlV; arc=none smtp.client-ip=10.30.226.201","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n\ts=k20201202; t=1777992602;\n\tbh=92G/hBpoy+tgBOS2x/I53r2sZ5pAyr7z2fg9vOcfHhA=;\n\th=From:Date:Subject:References:In-Reply-To:To:Cc:From;\n\tb=E/H8COlVuRum6H/mSSSp2b5NDHs8p1dq3Kmw00eTRTxcDX03eARk/qKClNqhX0z6s\n\t NZZBflhEaKRd9eWxiQKAzO7eFngAppDeSNcJPUh3NIXMXGThZHBXlB/uLnea6bwAyG\n\t YMqrzDM8uV0lMHb1+eyVHdutii0ueC9SWFbCPS5AzxqoXtvT110NUPxfzrqA6PECr3\n\t 4FEeOae2TYBj4zSB0/pO9IS4q/TvrVe6MudyGMu7z7iQ0m2HH2OTxpXuKUAHq6rvQp\n\t mlGjDwtnqSIhBoNHfG1jnkd4x+HUNj79hBRMDSvoRQqBxvhhipf7WuWZBCtc5EL74j\n\t EbyOaAbsvul6w==","From":"Lorenzo Bianconi ","Date":"Tue, 05 May 2026 16:49:24 +0200","Subject":"[PATCH nf-next 2/4] net: netfilter: Add encap_proto to\n flow_offload_tunnel","Precedence":"bulk","X-Mailing-List":"netfilter-devel@vger.kernel.org","List-Id":"","List-Subscribe":"","List-Unsubscribe":"","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Message-Id":"\n <20260505-b4-flowtable-sw-accel-ip6ip-v1-2-9ac39ccc9ea9@kernel.org>","References":"\n <20260505-b4-flowtable-sw-accel-ip6ip-v1-0-9ac39ccc9ea9@kernel.org>","In-Reply-To":"\n <20260505-b4-flowtable-sw-accel-ip6ip-v1-0-9ac39ccc9ea9@kernel.org>","To":"Andrew Lunn ,\n \"David S. Miller\" , Eric Dumazet ,\n Jakub Kicinski , Paolo Abeni ,\n Felix Fietkau , Matthias Brugger ,\n AngeloGioacchino Del Regno ,\n Simon Horman , David Ahern ,\n Ido Schimmel , Pablo Neira Ayuso ,\n Florian Westphal , Phil Sutter ,\n Shuah Khan ","Cc":"linux-arm-kernel@lists.infradead.org,\n linux-mediatek@lists.infradead.org, netdev@vger.kernel.org,\n netfilter-devel@vger.kernel.org, coreteam@netfilter.org,\n linux-kselftest@vger.kernel.org, Lorenzo Bianconi ","X-Mailer":"b4 0.14.3"},"content":"Add encap_proto (AF_INET or AF_INET6) to struct flow_offload_tunnel\nto allow its use as part of the hash table key during flowtable entry\nlookup.\nThis is a preliminary change to support IPv4 over IPv6 tunneling via\nthe flowtable infrastructure for software acceleration.\n\nSigned-off-by: Lorenzo Bianconi \n---\n include/linux/netdevice.h | 1 +\n include/net/netfilter/nf_flow_table.h | 1 +\n net/ipv4/ipip.c | 1 +\n net/ipv6/ip6_tunnel.c | 1 +\n net/netfilter/nf_flow_table_ip.c | 2 ++\n net/netfilter/nf_flow_table_path.c | 2 ++\n 6 files changed, 8 insertions(+)","diff":"diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h\nindex 85bd9d46b5a0..02f593397fad 100644\n--- a/include/linux/netdevice.h\n+++ b/include/linux/netdevice.h\n@@ -902,6 +902,7 @@ struct net_device_path {\n \t\t\t};\n \n \t\t\tu8\tl3_proto;\n+\t\t\tu8\tencap_proto;\n \t\t} tun;\n \t\tstruct {\n \t\t\tenum {\ndiff --git a/include/net/netfilter/nf_flow_table.h b/include/net/netfilter/nf_flow_table.h\nindex b09c11c048d5..96e8ecf0f530 100644\n--- a/include/net/netfilter/nf_flow_table.h\n+++ b/include/net/netfilter/nf_flow_table.h\n@@ -118,6 +118,7 @@ struct flow_offload_tunnel {\n \t};\n \n \tu8\tl3_proto;\n+\tu8\tencap_proto;\n };\n \n struct flow_offload_tuple {\ndiff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c\nindex ff95b1b9908e..5425af051d5a 100644\n--- a/net/ipv4/ipip.c\n+++ b/net/ipv4/ipip.c\n@@ -369,6 +369,7 @@ static int ipip_fill_forward_path(struct net_device_path_ctx *ctx,\n \tpath->tun.src_v4.s_addr = tiph->saddr;\n \tpath->tun.dst_v4.s_addr = tiph->daddr;\n \tpath->tun.l3_proto = IPPROTO_IPIP;\n+\tpath->tun.encap_proto = AF_INET;\n \tpath->dev = ctx->dev;\n \n \tctx->dev = rt->dst.dev;\ndiff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c\nindex 3d64e672eeee..c99ed41bfc99 100644\n--- a/net/ipv6/ip6_tunnel.c\n+++ b/net/ipv6/ip6_tunnel.c\n@@ -1851,6 +1851,7 @@ static int ip6_tnl_fill_forward_path(struct net_device_path_ctx *ctx,\n \t\tpath->type = DEV_PATH_TUN;\n \t\tpath->tun.src_v6 = t->parms.laddr;\n \t\tpath->tun.dst_v6 = t->parms.raddr;\n+\t\tpath->tun.encap_proto = AF_INET6;\n \t\tif (ctx->ether_type == cpu_to_be16(ETH_P_IP))\n \t\t\tpath->tun.l3_proto = IPPROTO_IPIP;\n \t\telse\ndiff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c\nindex fd56d663cb5b..9efd76b57847 100644\n--- a/net/netfilter/nf_flow_table_ip.c\n+++ b/net/netfilter/nf_flow_table_ip.c\n@@ -198,6 +198,7 @@ static void nf_flow_tuple_encap(struct nf_flowtable_ctx *ctx,\n \t\t\ttuple->tun.dst_v4.s_addr = iph->daddr;\n \t\t\ttuple->tun.src_v4.s_addr = iph->saddr;\n \t\t\ttuple->tun.l3_proto = IPPROTO_IPIP;\n+\t\t\ttuple->tun.encap_proto = AF_INET;\n \t\t}\n \t\tbreak;\n \tcase htons(ETH_P_IPV6):\n@@ -206,6 +207,7 @@ static void nf_flow_tuple_encap(struct nf_flowtable_ctx *ctx,\n \t\t\ttuple->tun.dst_v6 = ip6h->daddr;\n \t\t\ttuple->tun.src_v6 = ip6h->saddr;\n \t\t\ttuple->tun.l3_proto = IPPROTO_IPV6;\n+\t\t\ttuple->tun.encap_proto = AF_INET6;\n \t\t}\n \t\tbreak;\n \tdefault:\ndiff --git a/net/netfilter/nf_flow_table_path.c b/net/netfilter/nf_flow_table_path.c\nindex df4e180ed3c2..5a5774d9b6f5 100644\n--- a/net/netfilter/nf_flow_table_path.c\n+++ b/net/netfilter/nf_flow_table_path.c\n@@ -127,6 +127,7 @@ static void nft_dev_path_info(const struct net_device_path_stack *stack,\n \t\t\t\tinfo->tun.src_v6 = path->tun.src_v6;\n \t\t\t\tinfo->tun.dst_v6 = path->tun.dst_v6;\n \t\t\t\tinfo->tun.l3_proto = path->tun.l3_proto;\n+\t\t\t\tinfo->tun.encap_proto = path->tun.encap_proto;\n \t\t\t\tinfo->num_tuns++;\n \t\t\t} else {\n \t\t\t\tif (info->num_encaps >= NF_FLOW_TABLE_ENCAP_MAX) {\n@@ -270,6 +271,7 @@ static void nft_dev_forward_path(const struct nft_pktinfo *pkt,\n \t\troute->tuple[!dir].in.tun.src_v6 = info.tun.dst_v6;\n \t\troute->tuple[!dir].in.tun.dst_v6 = info.tun.src_v6;\n \t\troute->tuple[!dir].in.tun.l3_proto = info.tun.l3_proto;\n+\t\troute->tuple[!dir].in.tun.encap_proto = info.tun.encap_proto;\n \t\troute->tuple[!dir].in.num_tuns = info.num_tuns;\n \t}\n \n","prefixes":["nf-next","2/4"]}