Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2231779/?format=api
{ "id": 2231779, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2231779/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260501122237.296262-13-pablo@netfilter.org/", "project": { "id": 26, "url": "http://patchwork.ozlabs.org/api/1.1/projects/26/?format=api", "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 }, "msgid": "<20260501122237.296262-13-pablo@netfilter.org>", "date": "2026-05-01T12:22:35", "name": "[net,12/14] netfilter: flowtable: fix inline vlan encapsulation in xmit path", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "4a59d63a0d42debd08df74fba9db47c6d20a19a6", "submitter": { "id": 1315, "url": "http://patchwork.ozlabs.org/api/1.1/people/1315/?format=api", "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260501122237.296262-13-pablo@netfilter.org/mbox/", "series": [ { "id": 502449, "url": "http://patchwork.ozlabs.org/api/1.1/series/502449/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=502449", "date": "2026-05-01T12:22:23", "name": "[net,01/14] netfilter: replace skb_try_make_writable() by skb_ensure_writable()", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/502449/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2231779/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2231779/checks/", "tags": {}, "headers": { "Return-Path": "\n <netfilter-devel+bounces-12382-incoming=patchwork.ozlabs.org@vger.kernel.org>", "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=netfilter.org header.i=@netfilter.org\n header.a=rsa-sha256 header.s=2025 header.b=bVZfvuOa;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c0a:e001:db::12fc:5321; helo=sea.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-12382-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)", "smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org\n header.b=\"bVZfvuOa\"", "smtp.subspace.kernel.org;\n arc=none smtp.client-ip=217.70.190.124", "smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=netfilter.org", "smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=netfilter.org" ], "Received": [ "from sea.lore.kernel.org (sea.lore.kernel.org\n [IPv6:2600:3c0a:e001:db::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 4g6Vdf4qsNz1xqf\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 01 May 2026 22:26:30 +1000 (AEST)", "from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id 658703053CE7\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 1 May 2026 12:23:02 +0000 (UTC)", "from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 277883A2560;\n\tFri, 1 May 2026 12:23:02 +0000 (UTC)", "from mail.netfilter.org (mail.netfilter.org [217.70.190.124])\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 392B33A2570;\n\tFri, 1 May 2026 12:23:00 +0000 (UTC)", "from localhost.localdomain (mail-agni [217.70.190.124])\n\tby mail.netfilter.org (Postfix) with ESMTPSA id A987D60264;\n\tFri, 1 May 2026 14:22:57 +0200 (CEST)" ], "ARC-Seal": "i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1777638181; cv=none;\n b=Tov9NNEvze3IdurWn6y/qCHDKW+9u6c7QGW1OZLkRfvugs8iTquQSEEoVbedGhZvf6XBLUOePrANJodoaB2OqxEBvBqiNTdJZXw/AVjM9ozZPJuIb1hywEPF5I7OdHKs8PTy/GwkqyLoBR9fy8posxzGoVHnv1bAaVPtbXowDrU=", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1777638181; c=relaxed/simple;\n\tbh=M0UZUuKgrIRNaBMt/8x8zOytTab4oxl2z1jQD4UIxH8=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=MWnUpf0mJlLd+xhAzmWjf6t3j80MfJZR7RgfXUOhz9z2OA97oh/UZRek4WF470Ex5A67sQ3CNxXhoXg8PIAiGJrsg0cyl9tz2oUYAJdL4jHTEkpGm+CBFcVcwMihztUeh+gsvQ2fmNElJ1xEIY6+28RaRvJeFWzJXKHcQBlRhGg=", "ARC-Authentication-Results": "i=1; smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=netfilter.org;\n spf=pass smtp.mailfrom=netfilter.org;\n dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org\n header.b=bVZfvuOa; arc=none smtp.client-ip=217.70.190.124", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=netfilter.org;\n\ts=2025; t=1777638178;\n\tbh=Oo9tIKNsHOuzs/xq1EwlaH/1o2XSKon/6fLon20kMNY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=bVZfvuOaqUKqEMO4H/i6aP31AlqYu2i+CQmvq/k5uc0UOi3kXx1bf4HagIZ92lQ7K\n\t vEDtbDH8K3R5w0Dx/II9vnoNWZNx88FjJdqNQtfVqU8XVnoPfMdWBnOQBZH5qNAM/S\n\t BasJFnOIgorzU5i8JYmFUaTEMsDb4uqVmogPykHwT5c5GBaaJg/0XCqOYeacoj3nMk\n\t afQ87twQE6MDtKSgJZckHSCCg8LlrtND+YFICwO6O+F5TFtJXD9GjuUM4blUvXtCE4\n\t KjD65r+CzfC5Nate95ghkpR8Eiqe+sT/1cKWC+fwi63B16porTrRGmSWBbZY/F2cx1\n\t w56eJymhkkA7A==", "From": "Pablo Neira Ayuso <pablo@netfilter.org>", "To": "netfilter-devel@vger.kernel.org", "Cc": "davem@davemloft.net,\n\tnetdev@vger.kernel.org,\n\tkuba@kernel.org,\n\tpabeni@redhat.com,\n\tedumazet@google.com,\n\tfw@strlen.de,\n\thorms@kernel.org", "Subject": "[PATCH net 12/14] netfilter: flowtable: fix inline vlan encapsulation\n in xmit path", "Date": "Fri, 1 May 2026 14:22:35 +0200", "Message-ID": "<20260501122237.296262-13-pablo@netfilter.org>", "X-Mailer": "git-send-email 2.47.3", "In-Reply-To": "<20260501122237.296262-1-pablo@netfilter.org>", "References": "<20260501122237.296262-1-pablo@netfilter.org>", "Precedence": "bulk", "X-Mailing-List": "netfilter-devel@vger.kernel.org", "List-Id": "<netfilter-devel.vger.kernel.org>", "List-Subscribe": "<mailto:netfilter-devel+subscribe@vger.kernel.org>", "List-Unsubscribe": "<mailto:netfilter-devel+unsubscribe@vger.kernel.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit" }, "content": "Several issues in the inline vlan support:\n\n- The layer 2 encapsulation representation in the tuple takes encap[0] as\n the outer header and encap[1] as the inner header as seen from the ingress\n path. Reverse the encap loop to push first the inner then the outer vlan\n header.\n\n- Postpone pushing the layer 2 header once destination device is known.\n This allows to calculate the needed hearoom via LL_RESERVED_SPACE to\n accommodate the layer 2 headers.\n\n- Add and use nf_flow_vlan_push() as suggested by Eric Woudstra, this\n is a simplified version of skb_vlan_push() for egress path only.\n\nFixes: c653d5a78f34 (\"netfilter: flowtable: inline vlan encapsulation in xmit path\")\nSigned-off-by: Pablo Neira Ayuso <pablo@netfilter.org>\n---\n net/netfilter/nf_flow_table_ip.c | 110 ++++++++++++++++++++-----------\n 1 file changed, 73 insertions(+), 37 deletions(-)", "diff": "diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c\nindex 8d5fb7e940a1..0ce3c209050c 100644\n--- a/net/netfilter/nf_flow_table_ip.c\n+++ b/net/netfilter/nf_flow_table_ip.c\n@@ -462,32 +462,6 @@ static void nf_flow_encap_pop(struct nf_flowtable_ctx *ctx,\n \t\tnf_flow_ip_tunnel_pop(ctx, skb);\n }\n \n-struct nf_flow_xmit {\n-\tconst void\t\t*dest;\n-\tconst void\t\t*source;\n-\tstruct net_device\t*outdev;\n-};\n-\n-static unsigned int nf_flow_queue_xmit(struct net *net, struct sk_buff *skb,\n-\t\t\t\t struct nf_flow_xmit *xmit)\n-{\n-\tstruct net_device *dev = xmit->outdev;\n-\tunsigned int hh_len = LL_RESERVED_SPACE(dev);\n-\n-\tif (unlikely(skb_headroom(skb) < hh_len && dev->header_ops)) {\n-\t\tskb = skb_expand_head(skb, hh_len);\n-\t\tif (!skb)\n-\t\t\treturn NF_STOLEN;\n-\t}\n-\n-\tskb->dev = dev;\n-\tdev_hard_header(skb, dev, ntohs(skb->protocol),\n-\t\t\txmit->dest, xmit->source, skb->len);\n-\tdev_queue_xmit(skb);\n-\n-\treturn NF_STOLEN;\n-}\n-\n static struct flow_offload_tuple_rhash *\n nf_flow_offload_lookup(struct nf_flowtable_ctx *ctx,\n \t\t struct nf_flowtable *flow_table, struct sk_buff *skb)\n@@ -553,6 +527,32 @@ static int nf_flow_offload_forward(struct nf_flowtable_ctx *ctx,\n \treturn 1;\n }\n \n+/* Similar to skb_vlan_push. */\n+static int nf_flow_vlan_push(struct sk_buff *skb, __be16 proto, u16 id,\n+\t\t\t u32 needed_headroom)\n+{\n+\tif (skb_vlan_tag_present(skb)) {\n+\t\tstruct vlan_hdr *vhdr;\n+\n+\t\tif (skb_cow_head(skb, needed_headroom + VLAN_HLEN))\n+\t\t\treturn -1;\n+\n+\t\t__skb_push(skb, VLAN_HLEN);\n+\t\tif (skb_mac_header_was_set(skb))\n+\t\t\tskb->mac_header -= VLAN_HLEN;\n+\n+\t\tvhdr = (struct vlan_hdr *)skb->data;\n+\t\tskb->network_header -= VLAN_HLEN;\n+\t\tvhdr->h_vlan_TCI = htons(skb_vlan_tag_get(skb));\n+\t\tvhdr->h_vlan_encapsulated_proto = skb->protocol;\n+\t\tskb->protocol = skb->vlan_proto;\n+\t\tskb_postpush_rcsum(skb, skb->data, VLAN_HLEN);\n+\t}\n+\t__vlan_hwaccel_put_tag(skb, proto, id);\n+\n+\treturn 0;\n+}\n+\n static int nf_flow_pppoe_push(struct sk_buff *skb, u16 id)\n {\n \tint data_len = skb->len + sizeof(__be16);\n@@ -739,17 +739,19 @@ static int nf_flow_tunnel_v6_push(struct net *net, struct sk_buff *skb,\n }\n \n static int nf_flow_encap_push(struct sk_buff *skb,\n-\t\t\t struct flow_offload_tuple *tuple)\n+\t\t\t struct flow_offload_tuple *tuple,\n+\t\t\t struct net_device *outdev)\n {\n+\tu32 needed_headroom = LL_RESERVED_SPACE(outdev);\n \tint i;\n \n-\tfor (i = 0; i < tuple->encap_num; i++) {\n+\tfor (i = tuple->encap_num - 1; i >= 0; i--) {\n \t\tswitch (tuple->encap[i].proto) {\n \t\tcase htons(ETH_P_8021Q):\n \t\tcase htons(ETH_P_8021AD):\n-\t\t\tskb_reset_mac_header(skb);\n-\t\t\tif (skb_vlan_push(skb, tuple->encap[i].proto,\n-\t\t\t\t\t tuple->encap[i].id) < 0)\n+\t\t\tif (nf_flow_vlan_push(skb, tuple->encap[i].proto,\n+\t\t\t\t\t tuple->encap[i].id,\n+\t\t\t\t\t needed_headroom) < 0)\n \t\t\t\treturn -1;\n \t\t\tbreak;\n \t\tcase htons(ETH_P_PPP_SES):\n@@ -762,6 +764,44 @@ static int nf_flow_encap_push(struct sk_buff *skb,\n \treturn 0;\n }\n \n+struct nf_flow_xmit {\n+\tconst void\t\t*dest;\n+\tconst void\t\t*source;\n+\tstruct net_device\t*outdev;\n+\tstruct flow_offload_tuple *tuple;\n+};\n+\n+static void __nf_flow_queue_xmit(struct net *net, struct sk_buff *skb,\n+\t\t\t\t struct nf_flow_xmit *xmit)\n+{\n+\tstruct net_device *dev = xmit->outdev;\n+\tunsigned int hh_len = LL_RESERVED_SPACE(dev);\n+\n+\tif (unlikely(skb_headroom(skb) < hh_len && dev->header_ops)) {\n+\t\tskb = skb_expand_head(skb, hh_len);\n+\t\tif (!skb)\n+\t\t\treturn;\n+\t}\n+\n+\tskb->dev = dev;\n+\tdev_hard_header(skb, dev, ntohs(skb->protocol),\n+\t\t\txmit->dest, xmit->source, skb->len);\n+\tdev_queue_xmit(skb);\n+}\n+\n+static unsigned int nf_flow_queue_xmit(struct net *net, struct sk_buff *skb,\n+\t\t\t\t struct nf_flow_xmit *xmit)\n+{\n+\tif (xmit->tuple->encap_num) {\n+\t\tif (nf_flow_encap_push(skb, xmit->tuple, xmit->outdev) < 0)\n+\t\t\treturn NF_DROP;\n+\t}\n+\n+\t__nf_flow_queue_xmit(net, skb, xmit);\n+\n+\treturn NF_STOLEN;\n+}\n+\n unsigned int\n nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,\n \t\t\tconst struct nf_hook_state *state)\n@@ -806,9 +846,6 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,\n \tif (nf_flow_tunnel_v4_push(state->net, skb, other_tuple, &ip_daddr) < 0)\n \t\treturn NF_DROP;\n \n-\tif (nf_flow_encap_push(skb, other_tuple) < 0)\n-\t\treturn NF_DROP;\n-\n \tswitch (tuplehash->tuple.xmit_type) {\n \tcase FLOW_OFFLOAD_XMIT_NEIGH:\n \t\trt = dst_rtable(tuplehash->tuple.dst_cache);\n@@ -838,6 +875,7 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,\n \t\tWARN_ON_ONCE(1);\n \t\treturn NF_DROP;\n \t}\n+\txmit.tuple = other_tuple;\n \n \treturn nf_flow_queue_xmit(state->net, skb, &xmit);\n }\n@@ -1128,9 +1166,6 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb,\n \t\t\t\t &ip6_daddr, encap_limit) < 0)\n \t\treturn NF_DROP;\n \n-\tif (nf_flow_encap_push(skb, other_tuple) < 0)\n-\t\treturn NF_DROP;\n-\n \tswitch (tuplehash->tuple.xmit_type) {\n \tcase FLOW_OFFLOAD_XMIT_NEIGH:\n \t\trt = dst_rt6_info(tuplehash->tuple.dst_cache);\n@@ -1160,6 +1195,7 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb,\n \t\tWARN_ON_ONCE(1);\n \t\treturn NF_DROP;\n \t}\n+\txmit.tuple = other_tuple;\n \n \treturn nf_flow_queue_xmit(state->net, skb, &xmit);\n }\n", "prefixes": [ "net", "12/14" ] }