netfilter: flowtable: consolidate net_device field in nft_forward_info struct
Subsystems (8)
Pablo Neira Ayuso
maintainerPATCH v5 1/6 netfilter: flowtable: consolidate net_device field in nft_forward_info struct
info->indev and info->outdev refer to the same device, a single info->dev field is sufficient.
While at it, remove unused router parameter from the flowtable path discovery function.
---
v5: no changes
net/netfilter/nf_flow_table_path.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
net/netfilter/nf_flow_table_path.c +8 -12
@@ -42,8 +42,7 @@ static bool nft_is_valid_ether_device(const struct net_device *dev)return true; } -static int nft_dev_fill_forward_path (const struct nf_flow_route *route, -const struct dst_entry *dst_cache, +static int nft_dev_fill_forward_path (const struct dst_entry *dst_cache,const struct nf_conn *ct,enum ip_conntrack_dir dir,u8 *ha,struct net_device_path_stack *stack)
@@ -76,8 +75,7 @@ static int nft_dev_fill_forward_path(const struct nf_flow_route *route, }struct nft_forward_info { -const struct net_device *indev; -const struct net_device *outdev; +const struct net_device *dev;struct id {__u16 id;__be16 proto;
@@ -109,7 +107,7 @@ static int nft_dev_path_info(const struct net_device_path_stack *stack,case DEV_PATH_VLAN :case DEV_PATH_PPPOE :case DEV_PATH_TUN : - info->indev = path->dev; + info->dev = path->dev;if (is_zero_ether_addr (info->h_source))memcpy (info->h_source, path->dev->dev_addr,ETH_ALEN );
@@ -179,10 +177,9 @@ static int nft_dev_path_info(const struct net_device_path_stack *stack,return -1 ; } } - info->outdev = info->indev;if (nf_flowtable_hw_offload (flowtable) && -nft_is_valid_ether_device (info->indev)) +nft_is_valid_ether_device (info->dev)) info->xmit_type =FLOW_OFFLOAD_XMIT_DIRECT ;return 0 ;
@@ -255,17 +252,16 @@ static int nft_dev_forward_path(const struct nft_pktinfo *pkt,unsigned char ha[ETH_ALEN ];int i; -if (nft_dev_fill_forward_path (route, dst, ct, dir, ha, &stack) <0 || +if (nft_dev_fill_forward_path (dst, ct, dir, ha, &stack) <0 ||nft_dev_path_info (&stack, &info, ha, &ft->data) <0 )return -ENOENT ; -if (!nft_flowtable_find_dev (info.indev, ft)) +if (!nft_flowtable_find_dev (info.dev, ft))return -ENOENT ; -if (info.outdev) - route->tuple[dir].out.ifindex = info.outdev->ifindex; + route->tuple[!dir].in.ifindex = info.dev->ifindex; + route->tuple[dir].out.ifindex = info.dev->ifindex; - route->tuple[!dir].in.ifindex = info.indev->ifindex;for (i =0 ; i < info.num_encaps; i++) { route->tuple[!dir].in.encap[i].id = info.encap[i].id; route->tuple[!dir].in.encap[i].proto = info.encap[i].proto;
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH v5 2/6 netfilter: flowtable: consolidate flowtable device check
Check that device belongs to the flowtable right after the flowtable discovery path. This is a preparation patch to obtain the dst entry from the .fill_forward_path in tunnels.
No functional changes are intended.
---
v5: no changes
net/netfilter/nf_flow_table_path.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
net/netfilter/nf_flow_table_path.c +9 -6
@@ -90,9 +90,12 @@ struct nft_forward_info {enum flow_offload_xmit_type xmit_type; }; +static bool nft_flowtable_find_dev (const struct net_device *dev, +struct nft_flowtable *ft); +static int nft_dev_path_info (const struct net_device_path_stack *stack,struct nft_forward_info *info, -unsigned char *ha,struct nf_flowtable *flowtable) +unsigned char *ha,struct nft_flowtable *ft) {const struct net_device_path *path;int i;
@@ -178,10 +181,13 @@ static int nft_dev_path_info(const struct net_device_path_stack *stack, } } -if (nf_flowtable_hw_offload (flowtable) && +if (nf_flowtable_hw_offload (&ft->data) &&nft_is_valid_ether_device (info->dev)) info->xmit_type =FLOW_OFFLOAD_XMIT_DIRECT ; +if (!nft_flowtable_find_dev (info->dev, ft)) +return -1 ; +return 0 ; }
@@ -253,10 +259,7 @@ static int nft_dev_forward_path(const struct nft_pktinfo *pkt,int i;if (nft_dev_fill_forward_path (dst, ct, dir, ha, &stack) <0 || -nft_dev_path_info (&stack, &info, ha, &ft->data) <0 ) -return -ENOENT ; - -if (!nft_flowtable_find_dev (info.dev, ft)) +nft_dev_path_info (&stack, &info, ha, ft) <0 )return -ENOENT ; route->tuple[!dir].in.ifindex = info.dev->ifindex;
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH v5 3/6 net: dsa: stop at the user device in .fill_forward_path
In reply to Pablo Neira AyusoThe flowtable path discovery stops at the DSA user device when setting up the forward path. Let's just report there is no more devices after the DSA user port through the .fill_forward_path interface.
No functional changes are intended.
---
v5: new in this series. This is a cleanup so flowtable path discovery
does not need to break at the user DSA device, skipping remaining ones; sashiko reports a hypothetical dst leak otherwise.
net/dsa/user.c | 3 +-- net/netfilter/nf_flow_table_path.c | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-)
net/dsa/user.c +1 -2
@@ -2547,14 +2547,13 @@ static int dsa_user_fill_forward_path(struct net_device_path_ctx *ctx, struct net_device_path *path) {struct dsa_port *dp =dsa_user_to_port (ctx->dev); -struct net_device *conduit =dsa_port_to_conduit (dp);struct dsa_port *cpu_dp = dp->cpu_dp; path->dev = ctx->dev; path->type =DEV_PATH_DSA ; path->dsa.proto = cpu_dp->tag_ops->proto; path->dsa.port = dp->index; - ctx->dev = conduit; + ctx->dev =NULL ;return 0 ; }
net/netfilter/nf_flow_table_path.c +2 -5
@@ -114,12 +114,9 @@ static int nft_dev_path_info(const struct net_device_path_stack *stack,if (is_zero_ether_addr (info->h_source))memcpy (info->h_source, path->dev->dev_addr,ETH_ALEN ); -if (path->type ==DEV_PATH_ETHERNET ) +if (path->type ==DEV_PATH_ETHERNET || + path->type ==DEV_PATH_DSA )break ; -if (path->type ==DEV_PATH_DSA ) { - i = stack->num_paths; -break ; - }/* DEV_PATH_VLAN, DEV_PATH_PPPOE and DEV_PATH_TUN */ if (path->type ==DEV_PATH_TUN ) {
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH v5 4/6 net: do not advance stack index from dev_fwd_path()
In reply to Pablo Neira AyusoUpdate stack index from dev_fill_forward_path() instead, once the forward path slot has been populated.
Adjust existing drivers that recycle dev_fill_forward_path() as a way to reach the mtk SoC WDMA info.
---
v5: no changes
net/core/dev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/core/dev.c +4 -4
@@ -742,12 +742,10 @@ EXPORT_SYMBOL_GPL(dev_fill_metadata_dst);static struct net_device_path *dev_fwd_path (struct net_device_path_stack *stack) { -int k = stack->num_paths++; - -if (k >=NET_DEVICE_PATH_STACK_MAX ) +if (stack->num_paths +1 >NET_DEVICE_PATH_STACK_MAX )return NULL ; -return &stack->path[k]; +return &stack->path[stack->num_paths]; } int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr,
@@ -773,6 +771,7 @@ int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr,if (ret <0 )return -1 ; + stack->num_paths++;if (WARN_ON_ONCE (last_dev == ctx.dev))return -1 ; }
@@ -785,6 +784,7 @@ int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr,return -1 ; path->type =DEV_PATH_ETHERNET ; path->dev = ctx.dev; + stack->num_paths++;return ret; }
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH v5 5/6 net: pass dst via net_device_path in dev_fill_forward_path()
In reply to Pablo Neira AyusoAdd dst_entry to tunnel device path, this will allow us to remove a duplicated route lookup.
This is a preparation patch to retrieve the tunnel route directly from the .fill_forward_path. This new dst_entry in the tunnel will be used by a follow up patch.
Since dst_release() works fine on NULL interface, this is still noop until the flowtable starts using this.
Add a new dev_fill_forward_path_release() function to drop the refcount on the tunnel device route and use it in case of error out. Export it so to drop the refcount on the tunnel route at a later stage.
---
v5: call dev_fill_forward_path_release() for safety, but no dst should
be ever seen in this path.
drivers/net/ethernet/airoha/airoha_ppe.c | 10 ++++-- .../net/ethernet/mediatek/mtk_ppe_offload.c | 10 ++++-- include/linux/netdevice.h | 2 ++ net/core/dev.c | 36 ++++++++++++++++--- 4 files changed, 47 insertions(+), 11 deletions(-)
drivers/net/ethernet/airoha/airoha_ppe.c +7 -3
@@ -293,14 +293,18 @@ static int airoha_ppe_get_wdma_info(struct net_device *dev, const u8 *addr,return err; path = &stack.path[stack.num_paths -1 ]; -if (path->type !=DEV_PATH_MTK_WDMA ) -return -EINVAL ; +if (path->type !=DEV_PATH_MTK_WDMA ) { + err = -EINVAL ; + goto err_out; + } info->idx = path->mtk_wdma.wdma_idx; info->bss = path->mtk_wdma.bss; info->wcid = path->mtk_wdma.wcid; +err_out: +dev_fill_forward_path_release (&stack); -return 0 ; +return err; }static int airoha_get_dsa_port (struct net_device **dev)
drivers/net/ethernet/mediatek/mtk_ppe_offload.c +7 -3
@@ -108,16 +108,20 @@ mtk_flow_get_wdma_info(struct net_device *dev, const u8 *addr, struct mtk_wdma_ireturn err; path = &stack.path[stack.num_paths -1 ]; -if (path->type !=DEV_PATH_MTK_WDMA ) -return -1 ; +if (path->type !=DEV_PATH_MTK_WDMA ) { + err = -EINVAL ; + goto err_out; + } info->wdma_idx = path->mtk_wdma.wdma_idx; info->queue = path->mtk_wdma.queue; info->bss = path->mtk_wdma.bss; info->wcid = path->mtk_wdma.wcid; info->amsdu = path->mtk_wdma.amsdu; +err_out: +dev_fill_forward_path_release (&stack); -return 0 ; +return err; }
include/linux/netdevice.h +2 -0
@@ -892,6 +892,7 @@ struct net_device_path {u8 h_dest[ETH_ALEN ]; } encap;struct { +struct dst_entry *dst;union {struct in_addr src_v4;struct in6_addr src_v6;
@@ -3427,6 +3428,7 @@ int dev_get_iflink(const struct net_device *dev);int dev_fill_metadata_dst (struct net_device *dev,struct sk_buff *skb);int dev_fill_forward_path (const struct net_device *dev,const u8 *daddr,struct net_device_path_stack *stack); +void dev_fill_forward_path_release (struct net_device_path_stack *stack);struct net_device *dev_get_by_name (struct net *net,const char *name);struct net_device *dev_get_by_name_rcu (struct net *net,const char *name);struct net_device *__dev_get_by_name (struct net *net,const char *name);
net/core/dev.c +31 -5
@@ -748,6 +748,27 @@ static struct net_device_path *dev_fwd_path(struct net_device_path_stack *stack)return &stack->path[stack->num_paths]; } +void dev_fill_forward_path_release (struct net_device_path_stack *stack) +{ +struct net_device_path *path; +int k; + +if (stack->num_paths ==0 ) +return ; + +for (k = stack->num_paths -1 ; k >=0 ; k--) { + path = &stack->path[k]; +switch (path->type) { +case DEV_PATH_TUN : +dst_release (path->tun.dst); +break ; +default : +break ; + } + } +} +EXPORT_SYMBOL_GPL (dev_fill_forward_path_release); +int dev_fill_forward_path (const struct net_device *dev,const u8 *daddr,struct net_device_path_stack *stack) {
@@ -764,16 +785,16 @@ int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr, last_dev = ctx.dev; path =dev_fwd_path (stack);if (!path) -return -1 ; + goto err_out;memset (path,0 ,sizeof (struct net_device_path )); ret = ctx.dev->netdev_ops->ndo_fill_forward_path (&ctx, path);if (ret <0 ) -return -1 ; + goto err_out; stack->num_paths++;if (WARN_ON_ONCE (last_dev == ctx.dev)) -return -1 ; + goto err_out; }if (!ctx.dev)
@@ -781,12 +802,17 @@ int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr, path =dev_fwd_path (stack);if (!path) -return -1 ; + goto err_out; + path->type =DEV_PATH_ETHERNET ; path->dev = ctx.dev; stack->num_paths++; -return ret; +return 0 ; +err_out: +dev_fill_forward_path_release (stack); + +return -1 ; }EXPORT_SYMBOL_GPL (dev_fill_forward_path);
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH v5 6/6 netfilter: flowtable: release tunnel route on error when building forward path
In reply to Pablo Neira Ayusonft_flow_tunnel_update_route() can lazy fail, leaving an incomplete forward path set ip. The route lookup also happens twice, once from dev_fill_forward_path() and again in this aforementioned function.
Update ipip and ip6ip6 not to release the dst_entry and pass it on via the tunnel forward path information.
In case of failure when setting up the forwarding path, release the tunnel dst that was provided via dev_fill_forward_path().
---
v5: no changes.
net/ipv4/ipip.c | 2 +- net/ipv6/ip6_tunnel.c | 4 +- net/netfilter/nf_flow_table_path.c | 65 ++++++++---------------------- 3 files changed, 21 insertions(+), 50 deletions(-)
net/ipv4/ipip.c +1 -1
@@ -370,10 +370,10 @@ static int ipip_fill_forward_path(struct net_device_path_ctx *ctx, path->tun.src_v4.s_addr = tiph->saddr; path->tun.dst_v4.s_addr = tiph->daddr; path->tun.l3_proto =IPPROTO_IPIP ; + path->tun.dst = &rt->dst; path->dev = ctx->dev; ctx->dev = rt->dst.dev; -ip_rt_put (rt);return 0 ; }
net/ipv6/ip6_tunnel.c +3 -1
@@ -1864,12 +1864,14 @@ static int ip6_tnl_fill_forward_path(struct net_device_path_ctx *ctx, path->tun.src_v6 = t->parms.laddr; path->tun.dst_v6 = t->parms.raddr; path->tun.l3_proto =IPPROTO_IPV6 ; + path->tun.dst = dst; path->dev = ctx->dev; ctx->dev = dst->dev; } err = dst->error; -dst_release (dst); +if (err) +dst_release (dst);return err; }
net/netfilter/nf_flow_table_path.c +17 -48
137 lines not on this page · raw message
Signature · 1 line
2.47.3