netfilter: flowtable: fix excessive hw offload attempts after failure
Subsystems (4)
PATCH v2 1/4 netfilter: flowtable: fix excessive hw offload attempts after failure
If a flow cannot be offloaded, the code currently repeatedly tries again as quickly as possible, which can significantly increase system load. Fix this by limiting flow timeout update and hardware offload retry to once per second.
--- net/netfilter/nf_flow_table_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/netfilter/nf_flow_table_core.c +3 -1
@@ -335,8 +335,10 @@ void flow_offload_refresh(struct nf_flowtable *flow_table,u32 timeout; timeout = nf_flowtable_time_stamp +flow_offload_get_timeout (flow); -if (READ_ONCE (flow->timeout) != timeout) +if (timeout -READ_ONCE (flow->timeout) >HZ )WRITE_ONCE (flow->timeout, timeout); +else +return ;if (likely (!nf_flowtable_hw_offload (flow_table)))return ;
Signature · 1 line
2.35.1
PATCH v2 2/4 netfilter: nft_flow_offload: skip dst neigh lookup for ppp devices
The dst entry does not contain a valid hardware address, so skip the lookup in order to avoid running into errors here.
The proper hardware address is filled in from nft_dev_path_info
--- net/netfilter/nft_flow_offload.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
net/netfilter/nft_flow_offload.c +13 -9
@@ -36,6 +36,15 @@ static void nft_default_forward_path(struct nf_flow_route *route, route->tuple[dir].xmit_type =nft_xmit_type (dst_cache); } +static bool nft_is_valid_ether_device (const struct net_device *dev) +{ +if (!dev || (dev->flags &IFF_LOOPBACK ) || dev->type !=ARPHRD_ETHER || + dev->addr_len !=ETH_ALEN || !is_valid_ether_addr (dev->dev_addr)) +return false; + +return true; +} + static int nft_dev_fill_forward_path(const struct nf_flow_route *route, const struct dst_entry *dst_cache, const struct nf_conn *ct,
@@ -47,6 +56,9 @@ static int nft_dev_fill_forward_path(const struct nf_flow_route *route,struct neighbour *n;u8 nud_state; +if (!nft_is_valid_ether_device (dev)) + goto out; + n =dst_neigh_lookup (dst_cache, daddr);if (!n)return -1 ;
@@ -60,6 +72,7 @@ static int nft_dev_fill_forward_path(const struct nf_flow_route *route,if (!(nud_state &NUD_VALID ))return -1 ; +out:return dev_fill_forward_path (dev, ha, stack); }
@@ -78,15 +91,6 @@ struct nft_forward_info {enum flow_offload_xmit_type xmit_type; }; -static bool nft_is_valid_ether_device (const struct net_device *dev) -{ -if (!dev || (dev->flags &IFF_LOOPBACK ) || dev->type !=ARPHRD_ETHER || - dev->addr_len !=ETH_ALEN || !is_valid_ether_addr (dev->dev_addr)) -return false; - -return true; -} -static void nft_dev_path_info (const struct net_device_path_stack *stack,struct nft_forward_info *info,unsigned char *ha,struct nf_flowtable *flowtable)
Signature · 1 line
2.35.1
PATCH v2 3/4 net: fix dev_fill_forward_path with pppoe + bridge
In reply to Felix FietkauWhen calling dev_fill_forward_path on a pppoe device, the provided destination address is invalid. In order for the bridge fdb lookup to succeed, the pppoe code needs to update ctx->daddr to the correct value.
Fix this by storing the address inside struct net_device_path_ctx
--- drivers/net/ppp/pppoe.c | 1 + include/linux/netdevice.h | 2 +- net/core/dev.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
drivers/net/ppp/pppoe.c +1 -0
@@ -988,6 +988,7 @@ static int pppoe_fill_forward_path(struct net_device_path_ctx *ctx, path->encap.proto =htons (ETH_P_PPP_SES ); path->encap.id =be16_to_cpu (po->num);memcpy (path->encap.h_dest, po->pppoe_pa.remote,ETH_ALEN ); +memcpy (ctx->daddr, po->pppoe_pa.remote,ETH_ALEN ); path->dev = ctx->dev; ctx->dev = dev;
include/linux/netdevice.h +1 -1
@@ -900,7 +900,7 @@ struct net_device_path_stack {struct net_device_path_ctx {const struct net_device *dev; -const u8 *daddr; +u8 daddr[ETH_ALEN ];int num_vlans;struct {
net/core/dev.c +1 -1
@@ -681,11 +681,11 @@ int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr,const struct net_device *last_dev;struct net_device_path_ctx ctx = { .dev = dev, - .daddr = daddr, };struct net_device_path *path;int ret =0 ; +memcpy (ctx.daddr, daddr,sizeof (ctx.daddr)); stack->num_paths =0 ;while (ctx.dev && ctx.dev->netdev_ops->ndo_fill_forward_path) { last_dev = ctx.dev;
Signature · 1 line
2.35.1
PATCH v2 4/4 netfilter: nft_flow_offload: fix offload with pppoe + vlan
In reply to Felix FietkauWhen running a combination of PPPoE on top of a VLAN, we need to set info->outdev to the PPPoE device, otherwise PPPoE encap is skipped during software offload.
--- net/netfilter/nft_flow_offload.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nft_flow_offload.c +2 -1
@@ -123,7 +123,8 @@ static void nft_dev_path_info(const struct net_device_path_stack *stack, info->indev =NULL ;break ; } - info->outdev = path->dev; +if (!info->outdev) + info->outdev = path->dev; info->encap[info->num_encaps].id = path->encap.id; info->encap[info->num_encaps].proto = path->encap.proto; info->num_encaps++;
Signature · 1 line
2.35.1
Pablo Neira Ayuso
maintainerSeries applied to nf.git