[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250315200147.18016-3-ericwouds@gmail.com>
Date: Sat, 15 Mar 2025 21:01:46 +0100
From: Eric Woudstra <ericwouds@...il.com>
To: Jiri Pirko <jiri@...nulli.us>,
Ivan Vecera <ivecera@...hat.com>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Simon Horman <horms@...nel.org>,
Roopa Prabhu <roopa@...dia.com>,
Nikolay Aleksandrov <razor@...ckwall.org>,
Pablo Neira Ayuso <pablo@...filter.org>,
Jozsef Kadlecsik <kadlec@...filter.org>,
Matthias Brugger <matthias.bgg@...il.com>,
AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>
Cc: netdev@...r.kernel.org,
bridge@...ts.linux.dev,
netfilter-devel@...r.kernel.org,
linux-mediatek@...ts.infradead.org,
Eric Woudstra <ericwouds@...il.com>
Subject: [PATCH v10 nf-next 2/3] netfilter: nft_flow_offload: No ingress_vlan forward info for dsa user port
The bitfield info->ingress_vlans and corresponding vlan encap are used for
a switchdev user port. However, they should not be set for a dsa user port.
Reviewed-by: Nikolay Aleksandrov <razor@...ckwall.org>
Signed-off-by: Eric Woudstra <ericwouds@...il.com>
---
net/netfilter/nft_flow_offload.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offload.c
index 05786d856530..a2c7b64261b3 100644
--- a/net/netfilter/nft_flow_offload.c
+++ b/net/netfilter/nft_flow_offload.c
@@ -116,6 +116,11 @@ static void nft_dev_path_info(const struct net_device_path_stack *stack,
break;
if (path->type == DEV_PATH_DSA) {
i = stack->num_paths;
+ if (!info->num_encaps ||
+ !(info->ingress_vlans & BIT(info->num_encaps - 1)))
+ break;
+ info->num_encaps--;
+ info->ingress_vlans &= ~BIT(info->num_encaps - 1);
break;
}
if (path->type == DEV_PATH_MTK_WDMA) {
--
2.47.1
Powered by blists - more mailing lists