| Message ID | 20201111193737.1793-4-pablo@netfilter.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | netfilter: flowtable bridge and vlan enhancements | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 7710 this patch: 7710 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | warning | WARNING: line length of 87 exceeds 80 columns WARNING: line length of 88 exceeds 80 columns WARNING: line length of 89 exceeds 80 columns WARNING: line length of 95 exceeds 80 columns |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 8075 this patch: 8075 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On Wed, 11 Nov 2020 20:37:31 +0100 Pablo Neira Ayuso wrote: > +int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr, > + struct net_device_path_stack *stack) > +{ > + const struct net_device *last_dev; > + struct net_device_path_ctx ctx; > + struct net_device_path *path; > + int ret = 0; > + > + memset(&ctx, 0, sizeof(ctx)); > + ctx.dev = dev; > + ctx.daddr = daddr; > + > + while (ctx.dev && ctx.dev->netdev_ops->ndo_fill_forward_path) { > + last_dev = ctx.dev; > + > + path = &stack->path[stack->num_paths++]; I don't see you checking that this stack doesn't overflow. What am I missing? > + ret = ctx.dev->netdev_ops->ndo_fill_forward_path(&ctx, path); > + if (ret < 0) > + return -1; > + > + if (WARN_ON_ONCE(last_dev == ctx.dev)) > + return -1; > + } > + path = &stack->path[stack->num_paths++]; > + path->type = DEV_PATH_ETHERNET; > + path->dev = ctx.dev; > + > + return ret; > +} > +EXPORT_SYMBOL_GPL(dev_fill_forward_path);
On Fri, Nov 13, 2020 at 05:42:46PM -0800, Jakub Kicinski wrote: > On Wed, 11 Nov 2020 20:37:31 +0100 Pablo Neira Ayuso wrote: > > +int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr, > > + struct net_device_path_stack *stack) > > +{ > > + const struct net_device *last_dev; > > + struct net_device_path_ctx ctx; > > + struct net_device_path *path; > > + int ret = 0; > > + > > + memset(&ctx, 0, sizeof(ctx)); > > + ctx.dev = dev; > > + ctx.daddr = daddr; > > + > > + while (ctx.dev && ctx.dev->netdev_ops->ndo_fill_forward_path) { > > + last_dev = ctx.dev; > > + > > + path = &stack->path[stack->num_paths++]; > > I don't see you checking that this stack doesn't overflow. > > What am I missing? Yes, this check in missing indeed. I'll fix it and will include it in the next patchset version including Nikolay's request. Thank you.
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 7ce648a564f7..752649d8669f 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -833,6 +833,27 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev, struct sk_buff *skb, struct net_device *sb_dev); +enum net_device_path_type { + DEV_PATH_ETHERNET = 0, +}; + +struct net_device_path { + enum net_device_path_type type; + const struct net_device *dev; +}; + +#define NET_DEVICE_PATH_STACK_MAX 5 + +struct net_device_path_stack { + int num_paths; + struct net_device_path path[NET_DEVICE_PATH_STACK_MAX]; +}; + +struct net_device_path_ctx { + const struct net_device *dev; + const u8 *daddr; +}; + enum tc_setup_type { TC_SETUP_QDISC_MQPRIO, TC_SETUP_CLSU32, @@ -1279,6 +1300,8 @@ struct netdev_net_notifier { * struct net_device *(*ndo_get_peer_dev)(struct net_device *dev); * If a device is paired with a peer device, return the peer instance. * The caller must be under RCU read context. + * int (*ndo_fill_forward_path)(struct net_device_path_ctx *ctx, struct net_device_path *path); + * Get the forwarding path to reach the real device from the HW destination address */ struct net_device_ops { int (*ndo_init)(struct net_device *dev); @@ -1487,6 +1510,8 @@ struct net_device_ops { int (*ndo_tunnel_ctl)(struct net_device *dev, struct ip_tunnel_parm *p, int cmd); struct net_device * (*ndo_get_peer_dev)(struct net_device *dev); + int (*ndo_fill_forward_path)(struct net_device_path_ctx *ctx, + struct net_device_path *path); }; /** @@ -2824,6 +2849,8 @@ void dev_remove_offload(struct packet_offload *po); 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); struct net_device *__dev_get_by_flags(struct net *net, unsigned short flags, unsigned short mask); struct net_device *dev_get_by_name(struct net *net, const char *name); diff --git a/net/core/dev.c b/net/core/dev.c index 60d325bda0d7..854bdf41b5c1 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -846,6 +846,37 @@ int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) } EXPORT_SYMBOL_GPL(dev_fill_metadata_dst); +int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr, + struct net_device_path_stack *stack) +{ + const struct net_device *last_dev; + struct net_device_path_ctx ctx; + struct net_device_path *path; + int ret = 0; + + memset(&ctx, 0, sizeof(ctx)); + ctx.dev = dev; + ctx.daddr = daddr; + + while (ctx.dev && ctx.dev->netdev_ops->ndo_fill_forward_path) { + last_dev = ctx.dev; + + path = &stack->path[stack->num_paths++]; + ret = ctx.dev->netdev_ops->ndo_fill_forward_path(&ctx, path); + if (ret < 0) + return -1; + + if (WARN_ON_ONCE(last_dev == ctx.dev)) + return -1; + } + path = &stack->path[stack->num_paths++]; + path->type = DEV_PATH_ETHERNET; + path->dev = ctx.dev; + + return ret; +} +EXPORT_SYMBOL_GPL(dev_fill_forward_path); + /** * __dev_get_by_name - find a device by its name * @net: the applicable net namespace
This patch adds dev_fill_forward_path() which resolves the path to reach the real netdevice from the IP forwarding side. This function takes as input the netdevice and the destination hardware address and it walks down the devices calling .ndo_fill_forward_path() for each device until the real device is found. For instance, assuming the following topology: IP forwarding / \ br0 eth0 / \ eth1 eth2 . . . ethX ab:cd:ef:ab:cd:ef where eth1 and eth2 are bridge ports and eth0 provides WAN connectivity. ethX is the interface in another box which is connected to the eth1 bridge port. For packets going through IP forwarding to br0 whose destination MAC address is ab:cd:ef:ab:cd:ef, dev_fill_forward_path() provides the following path: br0 -> eth1 .ndo_fill_forward_path for br0 looks up at the FDB for the bridge port from the destination MAC address to get the bridge port eth1. This information allows to create a fast path that bypasses the classic bridge and IP forwarding paths, so packets go directly from the bridge port eth1 to eth0 (wan interface) and vice versa. fast path .------------------------. / \ | IP forwarding | | / \ \/ | br0 eth0 . / \ -> eth1 eth2 . . . ethX ab:cd:ef:ab:cd:ef Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- include/linux/netdevice.h | 27 +++++++++++++++++++++++++++ net/core/dev.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+)