netfilter: flowtable bridge and vlan enhancements
Subsystems (4)
Pablo Neira Ayuso
maintainerv2 cover netfilter: flowtable bridge and vlan enhancements
Hi,
[ This is v2 fixing up the sparse warnings. ]
The following patchset adds infrastructure to augment the Netfilter flowtable fastpath [1] to support for local network topologies that combine IP forwarding, bridge and vlan devices.
A typical scenario that can benefit from this infrastructure is composed of several VMs connected to bridge ports where the bridge master device 'br0' has an IP address. A DHCP server is also assumed to be running to provide connectivity to the VMs. The VMs reach the Internet through 'br0' as default gateway, which makes the packet enter the IP forwarding path. Then, netfilter is used to NAT the packets before they leave to through the wan device.
Something like this:
fast path
.------------------------.
/ \
| IP forwarding |
| / \ .
| br0 eth0
. / \
-- veth1 veth2
.
.
.
ethX
ab:cd:ef:ab:cd:ef
VMThe idea is to accelerate forwarding by building a fast path that takes packets from the ingress path of the bridge port and place them in the egress path of the wan device (and vice versa). Hence, skipping the classic bridge and IP stack paths.
Patch #1 adds the transmit path type field to the flow tuple. Two transmit
paths are supported so far: the neighbour and the xfrm transmit paths. This patch comes in preparation to add a new direct ethernet transmit path (see patch #7).
Patch #2 adds dev_fill_forward_path() and .ndo_fill_forward_path() to
netdev_ops. This new function describes the list of netdevice hops
to reach a given destination MAC address in the local network topology,
e.g.
IP forwarding
/ \
br0 eth0
/ \
veth1 veth2
.
.
.
ethX
ab:cd:ef:ab:cd:ef
where veth1 and veth2 are bridge ports and eth0 provides Internet
connectivity. ethX is the interface in the VM which is connected to
the veth1 bridge port. Then, for packets going to br0 whose
destination MAC address is ab:cd:ef:ab:cd:ef, dev_fill_forward_path()
provides the following path: br0 -> veth1.Patch #3 adds .ndo_fill_forward_path for vlan devices, which provides the next
device hop via vlan->real_dev. This also annotates the vlan id and protocol. This is useful to know what vlan headers are expected from the ingress device. This also provides information regarding the vlan headers to be pushed before transmission via the egress device.
Patch #4 adds .ndo_fill_forward_path for bridge devices, which allows to make
lookups to the FDB to locate the next device hop (bridge port) in the forwarding path.
Patch #5 updates the flowtable to use the dev_fill_forward_path()
infrastructure to obtain the ingress device in the forwarding path.
Patch #6 updates the flowtable to use the dev_fill_forward_path()
infrastructure to obtain the egress device in the forwarding path.
Patch #7 adds the direct ethernet transmit path, which pushes the
ethernet header to the packet and send it through dev_queue_xmit().
Patch #8 uses the direct ethernet transmit path (added in the previous
patch) to transmit packets to bridge ports - in case dev_fill_forward_path() describes a topology that includes a bridge.
Patch #9 updates the flowtable to include the vlan information in the flow tuple
for lookups from the ingress path as well as the vlan headers to be pushed into the packet before transmission to the egress device. 802.1q and 802.1ad (q-in-q) are supported. The vlan information is also described by dev_fill_forward_path().
Please, apply.
[1] https://www.kernel.org/doc/html/latest/networking/nf_flowtable.html
Pablo Neira Ayuso (9):
netfilter: flowtable: add xmit path types
net: resolve forwarding path from virtual netdevice and HW destination address
net: 8021q: resolve forwarding path for vlan devices
bridge: resolve forwarding path for bridge devices
netfilter: flowtable: use dev_fill_forward_path() to obtain ingress device
netfilter: flowtable: use dev_fill_forward_path() to obtain egress device
netfilter: flowtable: add direct xmit path
netfilter: flowtable: bridge port support
netfilter: flowtable: add vlan support
include/linux/netdevice.h | 35 ++++ include/net/netfilter/nf_flow_table.h | 41 ++++- net/8021q/vlan_dev.c | 15 ++ net/bridge/br_device.c | 22 +++ net/core/dev.c | 31 ++++ net/netfilter/nf_flow_table_core.c | 27 ++- net/netfilter/nf_flow_table_ip.c | 247 ++++++++++++++++++++++---- net/netfilter/nft_flow_offload.c | 107 ++++++++++- 8 files changed, 484 insertions(+), 41 deletions(-)
--
2.20.1
Pablo Neira Ayuso
maintainerPATCH v2 1/9 netfilter: flowtable: add xmit path types
Add the xmit_type field that defines the two supported xmit paths in the flowtable data plane, which are the neighbour and the xfrm xmit paths. This patch prepares for new flowtable xmit path types to come.
---
v2: no changes.
include/net/netfilter/nf_flow_table.h | 6 ++++ net/netfilter/nf_flow_table_core.c | 4 +++ net/netfilter/nf_flow_table_ip.c | 50 ++++++++++++++++++--------- 3 files changed, 44 insertions(+), 16 deletions(-)
include/net/netfilter/nf_flow_table.h +6 -0
@@ -89,6 +89,11 @@ enum flow_offload_tuple_dir {FLOW_OFFLOAD_DIR_MAX =IP_CT_DIR_MAX }; +enum flow_offload_xmit_type { +FLOW_OFFLOAD_XMIT_NEIGH =0 , +FLOW_OFFLOAD_XMIT_XFRM , +}; + struct flow_offload_tuple { union { struct in_addr src_v4;
@@ -108,6 +113,7 @@ struct flow_offload_tuple {u8 l3proto;u8 l4proto;u8 dir; + enum flow_offload_xmit_type xmit_type:8;u16 mtu;
net/netfilter/nf_flow_table_core.c +4 -0
@@ -95,6 +95,10 @@ static int flow_offload_fill_route(struct flow_offload *flow, } flow_tuple->iifidx = other_dst->dev->ifindex; + +if (dst_xfrm (dst)) + flow_tuple->xmit_type =FLOW_OFFLOAD_XMIT_XFRM ; + flow_tuple->dst_cache = dst;return 0 ;
net/netfilter/nf_flow_table_ip.c +34 -16
83 lines not on this page · raw message
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH v2 2/9 net: resolve forwarding path from virtual netdevice and HW destination address
In reply to Pablo Neira AyusoThis patch adds dev_fill_forward_path() which resolves the path to reach the real netdevice from the IP forwarding step. This function takes as input the netdevice and the destination hardware address and it walks down over 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
.
.
.
ethXab: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 in the IP forwarding step going 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 to bypass the classic bridge and the IP forwarding path, so packets go directly from the bridge port eth1 to eth0 (wan interface) and vice versa.
fast path
.------------------------.
/ \
| IP forwarding |
| / \ .
| br0 eth0
. / \
-> eth1 eth2
.
.
.
ethXab:cd:ef:ab:cd:ef
---
v2: no changes
include/linux/netdevice.h | 27 +++++++++++++++++++++++++++ net/core/dev.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+)
include/linux/netdevice.h +27 -0
@@ -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); };/**
@@ -2798,6 +2823,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);
net/core/dev.c +31 -0
@@ -845,6 +845,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
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH v2 3/9 net: 8021q: resolve forwarding path for vlan devices
In reply to Pablo Neira AyusoAdd .ndo_fill_forward_path for vlan devices.
For instance, assuming the following topology:
IP forwarding
/ \
eth0.100 eth0
|
eth0
.
.
.
ethX
ab:cd:ef:ab:cd:efFor packets in the IP forwarding going to eth0.100 whose destination MAC address is ab:cd:ef:ab:cd:ef, dev_fill_forward_path() provides the following path:
eth0.100 -> eth0
---
v2: fix sparse warning.
include/linux/netdevice.h | 7 +++++++ net/8021q/vlan_dev.c | 15 +++++++++++++++ 2 files changed, 22 insertions(+)
include/linux/netdevice.h +7 -0
@@ -835,11 +835,18 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,enum net_device_path_type {DEV_PATH_ETHERNET =0 , +DEV_PATH_VLAN , };struct net_device_path {enum net_device_path_type type;const struct net_device *dev; +union { +struct { +u16 id; +__be16 proto; + } vlan; + }; };#define NET_DEVICE_PATH_STACK_MAX 5
net/8021q/vlan_dev.c +15 -0
@@ -767,6 +767,20 @@ static int vlan_dev_get_iflink(const struct net_device *dev)return real_dev->ifindex; } +static int vlan_dev_fill_forward_path (struct net_device_path_ctx *ctx, +struct net_device_path *path) +{ +struct vlan_dev_priv *vlan =vlan_dev_priv (ctx->dev); + + path->type =DEV_PATH_VLAN ; + path->vlan.id = vlan->vlan_id; + path->vlan.proto = vlan->vlan_proto; + path->dev = ctx->dev; + ctx->dev = vlan->real_dev; + +return 0 ; +} +static const struct ethtool_ops vlan_ethtool_ops = { .get_link_ksettings = vlan_ethtool_get_link_ksettings, .get_drvinfo = vlan_ethtool_get_drvinfo,
@@ -805,6 +819,7 @@ static const struct net_device_ops vlan_netdev_ops = {#endif .ndo_fix_features = vlan_dev_fix_features, .ndo_get_iflink = vlan_dev_get_iflink, + .ndo_fill_forward_path = vlan_dev_fill_forward_path, };static void vlan_dev_free (struct net_device *dev)
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH v2 4/9 bridge: resolve forwarding path for bridge devices
In reply to Pablo Neira AyusoAdd .ndo_fill_forward_path for bridge devices.
---
v2: no changes
include/linux/netdevice.h | 1 + net/bridge/br_device.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+)
include/linux/netdevice.h +1 -0
@@ -836,6 +836,7 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,enum net_device_path_type {DEV_PATH_ETHERNET =0 ,DEV_PATH_VLAN , +DEV_PATH_BRIDGE , };struct net_device_path {
net/bridge/br_device.c +22 -0
@@ -391,6 +391,27 @@ static int br_del_slave(struct net_device *dev, struct net_device *slave_dev)return br_del_if (br, slave_dev); } +static int br_fill_forward_path (struct net_device_path_ctx *ctx, +struct net_device_path *path) +{ +struct net_bridge_fdb_entry *f; +struct net_bridge *br; + +if (netif_is_bridge_port (ctx->dev)) +return -1 ; + + br =netdev_priv (ctx->dev); + f =br_fdb_find_rcu (br, ctx->daddr,0 ); +if (!f || !f->dst) +return -1 ; + + path->type =DEV_PATH_BRIDGE ; + path->dev = f->dst->br->dev; + ctx->dev = f->dst->dev; + +return 0 ; +} +static const struct ethtool_ops br_ethtool_ops = { .get_drvinfo = br_getinfo, .get_link = ethtool_op_get_link,
@@ -425,6 +446,7 @@ static const struct net_device_ops br_netdev_ops = { .ndo_bridge_setlink = br_setlink, .ndo_bridge_dellink = br_dellink, .ndo_features_check = passthru_features_check, + .ndo_fill_forward_path = br_fill_forward_path, };static struct device_type br_type = {
Signature · 1 line
2.20.1
Nikolay Aleksandrov
maintainerRe: [PATCH net-next,v2 4/9] bridge: resolve forwarding path for bridge devices
Quoted 37 lines · Pablo Neira Ayuso
Add .ndo_fill_forward_path for bridge devices.
Signed-off-by Pablo Neira Ayuso <[email protected]>---
v2: no changesinclude/linux/netdevice.h | 1 + net/bridge/br_device.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+)include/linux/netdevice.h +1
-0@@ -836,6 +836,7 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,enum net_device_path_type {DEV_PATH_ETHERNET =0 ,DEV_PATH_VLAN , +DEV_PATH_BRIDGE , };struct net_device_path {net/bridge/br_device.c +7
-0@@ -391,6 +391,27 @@ static int br_del_slave(struct net_device *dev, struct net_device *slave_dev)return br_del_if (br, slave_dev); } +static int br_fill_forward_path (struct net_device_path_ctx *ctx, +struct net_device_path *path) +{ +struct net_bridge_fdb_entry *f; +struct net_bridge *br; + +if (netif_is_bridge_port (ctx->dev))
net/bridge/br_device.c static int br_del_slave(struct net_device *dev, struct net_device *slave_dev) · line 410
Quoted 10 lines
net/bridge/br_device.c +10
-0+return -1 ; + + br =netdev_priv (ctx->dev); + f =br_fdb_find_rcu (br, ctx->daddr,0 ); +if (!f || !f->dst) +return -1 ; + + path->type =DEV_PATH_BRIDGE ; + path->dev = f->dst->br->dev; + ctx->dev = f->dst->dev;
Please use READ_ONCE() for f->dst since it can become NULL if the entry is changed to point to the bridge device itself after the check above. I've had a patch in my queue that changes the bridge to use WRITE_ONCE() to annotate it as a lockless read.
Thanks,
Nik
Quoted 15 lines
net/bridge/br_device.c +5
-0+ +return 0 ; +} +static const struct ethtool_ops br_ethtool_ops = { .get_drvinfo = br_getinfo, .get_link = ethtool_op_get_link,@@ -425,6 +446,7 @@ static const struct net_device_ops br_netdev_ops = { .ndo_bridge_setlink = br_setlink, .ndo_bridge_dellink = br_dellink, .ndo_features_check = passthru_features_check, + .ndo_fill_forward_path = br_fill_forward_path, };static struct device_type br_type = {
Pablo Neira Ayuso
maintainerPATCH v2 5/9 netfilter: flowtable: use dev_fill_forward_path() to obtain ingress device
In reply to Pablo Neira AyusoThe ingress device in the tuple is obtained from route in the reply direction. Use dev_fill_forward_path() instead to provide the real ingress device for this flow.
---
v2: no changes
include/net/netfilter/nf_flow_table.h | 6 ++- net/netfilter/nf_flow_table_core.c | 3 +- net/netfilter/nft_flow_offload.c | 75 ++++++++++++++++++++++++++- 3 files changed, 80 insertions(+), 4 deletions(-)
include/net/netfilter/nf_flow_table.h +5 -1
@@ -112,9 +112,10 @@ struct flow_offload_tuple {u8 l3proto;u8 l4proto; + +/* All members above are keys for lookups, see flow_offload_hash(). */ u8 dir; enum flow_offload_xmit_type xmit_type:8; -u16 mtu;struct dst_entry *dst_cache;
@@ -160,6 +161,9 @@ static inline __s32 nf_flow_timeout_delta(unsigned int timeout)struct nf_flow_route {struct { +struct { +u32 ifindex; + } in;struct dst_entry *dst; } tuple[FLOW_OFFLOAD_DIR_MAX ]; };
net/netfilter/nf_flow_table_core.c +1 -2
@@ -79,7 +79,6 @@ static int flow_offload_fill_route(struct flow_offload *flow, enum flow_offload_tuple_dir dir) {struct flow_offload_tuple *flow_tuple = &flow->tuplehash[dir].tuple; -struct dst_entry *other_dst = route->tuple[!dir].dst;struct dst_entry *dst = route->tuple[dir].dst;if (!dst_hold_safe (route->tuple[dir].dst))
@@ -94,7 +93,7 @@ static int flow_offload_fill_route(struct flow_offload *flow,break ; } - flow_tuple->iifidx = other_dst->dev->ifindex; + flow_tuple->iifidx = route->tuple[dir].in.ifindex;if (dst_xfrm (dst)) flow_tuple->xmit_type =FLOW_OFFLOAD_XMIT_XFRM ;
net/netfilter/nft_flow_offload.c +74 -1
94 lines not on this page · raw message
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH v2 6/9 netfilter: flowtable: use dev_fill_forward_path() to obtain egress device
In reply to Pablo Neira AyusoThe egress device in the tuple is obtained from route. Use dev_fill_forward_path() instead to provide the real ingress device for this flow whenever this is available.
---
v2: no changes.
include/net/netfilter/nf_flow_table.h | 4 ++++ net/netfilter/nf_flow_table_core.c | 1 + net/netfilter/nf_flow_table_ip.c | 25 +++++++++++++++++++++++-- net/netfilter/nft_flow_offload.c | 1 + 4 files changed, 29 insertions(+), 2 deletions(-)
include/net/netfilter/nf_flow_table.h +4 -0
@@ -117,6 +117,7 @@ struct flow_offload_tuple {u8 dir; enum flow_offload_xmit_type xmit_type:8;u16 mtu; +u32 oifidx;struct dst_entry *dst_cache; };
@@ -164,6 +165,9 @@ struct nf_flow_route {struct {u32 ifindex; } in; +struct { +u32 ifindex; + } out;struct dst_entry *dst; } tuple[FLOW_OFFLOAD_DIR_MAX ]; };
net/netfilter/nf_flow_table_core.c +1 -0
@@ -94,6 +94,7 @@ static int flow_offload_fill_route(struct flow_offload *flow, } flow_tuple->iifidx = route->tuple[dir].in.ifindex; + flow_tuple->oifidx = route->tuple[dir].out.ifindex;if (dst_xfrm (dst)) flow_tuple->xmit_type =FLOW_OFFLOAD_XMIT_XFRM ;
net/netfilter/nf_flow_table_ip.c +23 -2
@@ -228,6 +228,15 @@ static int nf_flow_offload_dst_check(struct dst_entry *dst)return 0 ; } +static struct net_device *nf_flow_outdev_lookup (struct net *net,int oifidx, +struct net_device *dev) +{ +if (oifidx == dev->ifindex) +return dev; + +return dev_get_by_index_rcu (net, oifidx); +} +static unsigned int nf_flow_xmit_xfrm (struct sk_buff *skb,const struct nf_hook_state *state,struct dst_entry *dst)
@@ -267,7 +276,6 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb, dir = tuplehash->tuple.dir; flow = container_of(tuplehash, struct flow_offload, tuplehash[dir]); rt = (struct rtable *)flow->tuplehash[dir].tuple.dst_cache; - outdev = rt->dst.dev;if (unlikely (nf_flow_exceeds_mtu (skb, flow->tuplehash[dir].tuple.mtu)))return NF_ACCEPT ;
@@ -286,6 +294,13 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,return NF_ACCEPT ; } + outdev =nf_flow_outdev_lookup (state->net, tuplehash->tuple.oifidx, + rt->dst.dev); +if (!outdev) { +flow_offload_teardown (flow); +return NF_ACCEPT ; + } +if (nf_flow_nat_ip (flow, skb, thoff, dir) <0 )return NF_DROP ;
@@ -517,7 +532,6 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb, dir = tuplehash->tuple.dir; flow = container_of(tuplehash, struct flow_offload, tuplehash[dir]); rt = (struct rt6_info *)flow->tuplehash[dir].tuple.dst_cache; - outdev = rt->dst.dev;if (unlikely (nf_flow_exceeds_mtu (skb, flow->tuplehash[dir].tuple.mtu)))return NF_ACCEPT ;
@@ -533,6 +547,13 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb,return NF_ACCEPT ; } + outdev =nf_flow_outdev_lookup (state->net, tuplehash->tuple.oifidx, + rt->dst.dev); +if (!outdev) { +flow_offload_teardown (flow); +return NF_ACCEPT ; + } +if (skb_try_make_writable (skb,sizeof (*ip6h)))return NF_DROP ;
net/netfilter/nft_flow_offload.c +1 -0
@@ -84,6 +84,7 @@ static int nft_dev_forward_path(struct nf_flow_route *route, } route->tuple[!dir].in.ifindex = info.iifindex; + route->tuple[dir].out.ifindex = info.iifindex;return 0 ; }
Signature · 1 line
2.20.1
Re: [PATCH net-next,v2 6/9] netfilter: flowtable: use dev_fill_forward_path() to obtain egress device
Quoted 2 lines · Pablo Neira Ayuso
The egress device in the tuple is obtained from route. Use
dev_fill_forward_path()instead to provide the real ingress device for
^^^^^^^
Should this be "egress"?
Quoted 123 lines
this flow whenever this is available.
Signed-off-by Pablo Neira Ayuso <[email protected]>---
v2: no changes.include/net/netfilter/nf_flow_table.h | 4 ++++ net/netfilter/nf_flow_table_core.c | 1 + net/netfilter/nf_flow_table_ip.c | 25 +++++++++++++++++++++++-- net/netfilter/nft_flow_offload.c | 1 + 4 files changed, 29 insertions(+), 2 deletions(-)include/net/netfilter/nf_flow_table.h +4
-0@@ -117,6 +117,7 @@ struct flow_offload_tuple {u8 dir; enum flow_offload_xmit_type xmit_type:8;u16 mtu; +u32 oifidx;struct dst_entry *dst_cache; };@@ -164,6 +165,9 @@ struct nf_flow_route {struct {u32 ifindex; } in; +struct { +u32 ifindex; + } out;struct dst_entry *dst; } tuple[FLOW_OFFLOAD_DIR_MAX ]; };net/netfilter/nf_flow_table_core.c +1
-0@@ -94,6 +94,7 @@ static int flow_offload_fill_route(struct flow_offload *flow, } flow_tuple->iifidx = route->tuple[dir].in.ifindex; + flow_tuple->oifidx = route->tuple[dir].out.ifindex;if (dst_xfrm (dst)) flow_tuple->xmit_type =FLOW_OFFLOAD_XMIT_XFRM ;net/netfilter/nf_flow_table_ip.c +23
-2@@ -228,6 +228,15 @@ static int nf_flow_offload_dst_check(struct dst_entry *dst)return 0 ; } +static struct net_device *nf_flow_outdev_lookup (struct net *net,int oifidx, +struct net_device *dev) +{ +if (oifidx == dev->ifindex) +return dev; + +return dev_get_by_index_rcu (net, oifidx); +} +static unsigned int nf_flow_xmit_xfrm (struct sk_buff *skb,const struct nf_hook_state *state,struct dst_entry *dst)@@ -267,7 +276,6 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb, dir = tuplehash->tuple.dir; flow = container_of(tuplehash, struct flow_offload, tuplehash[dir]); rt = (struct rtable *)flow->tuplehash[dir].tuple.dst_cache; - outdev = rt->dst.dev;if (unlikely (nf_flow_exceeds_mtu (skb, flow->tuplehash[dir].tuple.mtu)))return NF_ACCEPT ;@@ -286,6 +294,13 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,return NF_ACCEPT ; } + outdev =nf_flow_outdev_lookup (state->net, tuplehash->tuple.oifidx, + rt->dst.dev); +if (!outdev) { +flow_offload_teardown (flow); +return NF_ACCEPT ; + } +if (nf_flow_nat_ip (flow, skb, thoff, dir) <0 )return NF_DROP ;@@ -517,7 +532,6 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb, dir = tuplehash->tuple.dir; flow = container_of(tuplehash, struct flow_offload, tuplehash[dir]); rt = (struct rt6_info *)flow->tuplehash[dir].tuple.dst_cache; - outdev = rt->dst.dev;if (unlikely (nf_flow_exceeds_mtu (skb, flow->tuplehash[dir].tuple.mtu)))return NF_ACCEPT ;@@ -533,6 +547,13 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb,return NF_ACCEPT ; } + outdev =nf_flow_outdev_lookup (state->net, tuplehash->tuple.oifidx, + rt->dst.dev); +if (!outdev) { +flow_offload_teardown (flow); +return NF_ACCEPT ; + } +if (skb_try_make_writable (skb,sizeof (*ip6h)))return NF_DROP ;net/netfilter/nft_flow_offload.c +1
-1@@ -84,6 +84,7 @@ static int nft_dev_forward_path(struct nf_flow_route *route, } route->tuple[!dir].in.ifindex = info.iifindex; + route->tuple[dir].out.ifindex = info.iifindex;return 0 ; } --
Quoted 1 line
2.20.1
J.
Pablo Neira Ayuso
maintainerPATCH v2 7/9 netfilter: flowtable: add direct xmit path
In reply to Pablo Neira AyusoAdd FLOW_OFFLOAD_XMIT_DIRECT to turn on the direct dev_queue_xmit() path to transmit ethernet frames. Cache the source and destination hardware address for flow to use dev_queue_xmit() to transfer packets.
---
v2: no changes.
include/net/netfilter/nf_flow_table.h | 5 +++++ net/netfilter/nf_flow_table_core.c | 2 ++ net/netfilter/nf_flow_table_ip.c | 24 ++++++++++++++++++++++++ net/netfilter/nft_flow_offload.c | 16 +++++++++++----- 4 files changed, 42 insertions(+), 5 deletions(-)
include/net/netfilter/nf_flow_table.h +5 -0
@@ -92,6 +92,7 @@ enum flow_offload_tuple_dir {enum flow_offload_xmit_type {FLOW_OFFLOAD_XMIT_NEIGH =0 ,FLOW_OFFLOAD_XMIT_XFRM , +FLOW_OFFLOAD_XMIT_DIRECT , };struct flow_offload_tuple {
@@ -119,6 +120,8 @@ struct flow_offload_tuple {u16 mtu;u32 oifidx; +u8 h_source[ETH_ALEN ]; +u8 h_dest[ETH_ALEN ];struct dst_entry *dst_cache; };
@@ -167,6 +170,8 @@ struct nf_flow_route { } in;struct {u32 ifindex; +u8 h_source[ETH_ALEN ]; +u8 h_dest[ETH_ALEN ]; } out;struct dst_entry *dst; } tuple[FLOW_OFFLOAD_DIR_MAX ];
net/netfilter/nf_flow_table_core.c +2 -0
@@ -94,6 +94,8 @@ static int flow_offload_fill_route(struct flow_offload *flow, } flow_tuple->iifidx = route->tuple[dir].in.ifindex; +memcpy (flow_tuple->h_dest, route->tuple[dir].out.h_dest,ETH_ALEN ); +memcpy (flow_tuple->h_source, route->tuple[dir].out.h_source,ETH_ALEN ); flow_tuple->oifidx = route->tuple[dir].out.ifindex;if (dst_xfrm (dst))
net/netfilter/nf_flow_table_ip.c +24 -0
@@ -247,6 +247,24 @@ static unsigned int nf_flow_xmit_xfrm(struct sk_buff *skb,return NF_STOLEN ; } +static unsigned int nf_flow_queue_xmit (struct sk_buff *skb, +struct net_device *outdev, +const struct flow_offload_tuple *tuple) +{ +struct ethhdr *eth; + + skb->dev = outdev; +skb_push (skb, skb->mac_len); +skb_reset_mac_header (skb); + + eth =eth_hdr (skb); +memcpy (eth->h_source, tuple->h_source,ETH_ALEN ); +memcpy (eth->h_dest, tuple->h_dest,ETH_ALEN ); +dev_queue_xmit (skb); + +return NF_STOLEN ; +} +unsigned int nf_flow_offload_ip_hook (void *priv,struct sk_buff *skb,const struct nf_hook_state *state)
@@ -325,6 +343,9 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,IPCB (skb)->flags =IPSKB_FORWARDED ; ret =nf_flow_xmit_xfrm (skb, state, &rt->dst);break ; +case FLOW_OFFLOAD_XMIT_DIRECT : + ret =nf_flow_queue_xmit (skb, outdev, &tuplehash->tuple); +break ;default :WARN_ON_ONCE (1 ); ret =NF_DROP ;
@@ -581,6 +602,9 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb,IP6CB (skb)->flags =IP6SKB_FORWARDED ; ret =nf_flow_xmit_xfrm (skb, state, &rt->dst);break ; +case FLOW_OFFLOAD_XMIT_DIRECT : + ret =nf_flow_queue_xmit (skb, outdev, &tuplehash->tuple); +break ;default :WARN_ON_ONCE (1 ); ret =NF_DROP ;
net/netfilter/nft_flow_offload.c +11 -5
@@ -21,12 +21,11 @@ struct nft_flow_offload {static int nft_dev_fill_forward_path (const struct nf_flow_route *route,const struct nf_conn *ct, -enum ip_conntrack_dir dir, +enum ip_conntrack_dir dir,u8 *dst,struct net_device_path_stack *stack) {const struct dst_entry *dst_cache = route->tuple[dir].dst;const void *daddr = &ct->tuplehash[!dir].tuple.src.u3; -unsigned char ha[ETH_ALEN ];struct net_device *dev;struct neighbour *n;struct rtable *rt;
@@ -41,18 +40,20 @@ static int nft_dev_fill_forward_path(const struct nf_flow_route *route,read_lock_bh (&n->lock); nud_state = n->nud_state; -ether_addr_copy (ha, n->ha); +ether_addr_copy (dst, n->ha);read_unlock_bh (&n->lock);neigh_release (n);if (!(nud_state &NUD_VALID ))return -1 ; -return dev_fill_forward_path (dev, ha, stack); +return dev_fill_forward_path (dev, dst, stack); }struct nft_forward_info {u32 iifindex; +u8 h_source[ETH_ALEN ]; +u8 h_dest[ETH_ALEN ]; }; static int nft_dev_forward_path(struct nf_flow_route *route,
@@ -62,11 +63,12 @@ static int nft_dev_forward_path(struct nf_flow_route *route,struct net_device_path_stack stack = {};struct nft_forward_info info = {};struct net_device_path *path; +unsigned char dst[ETH_ALEN ];int i, ret;memset (&stack,0 ,sizeof (stack)); - ret =nft_dev_fill_forward_path (route, ct, dir, &stack); + ret =nft_dev_fill_forward_path (route, ct, dir, dst, &stack);if (ret <0 )return -1 ;
@@ -74,6 +76,8 @@ static int nft_dev_forward_path(struct nf_flow_route *route, path = &stack.path[i];switch (path->type) {case DEV_PATH_ETHERNET : +memcpy (info.h_dest, path->dev->dev_addr,ETH_ALEN ); +memcpy (info.h_source, dst,ETH_ALEN ); info.iifindex = path->dev->ifindex;break ;case DEV_PATH_VLAN :
@@ -84,6 +88,8 @@ static int nft_dev_forward_path(struct nf_flow_route *route, } route->tuple[!dir].in.ifindex = info.iifindex; +memcpy (route->tuple[dir].out.h_dest, info.h_source,ETH_ALEN ); +memcpy (route->tuple[dir].out.h_source, info.h_dest,ETH_ALEN ); route->tuple[dir].out.ifindex = info.iifindex;return 0 ;
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH v2 8/9 netfilter: flowtable: bridge port support
In reply to Pablo Neira AyusoUpdate hardware destination address to the master bridge device to emulate the forwarding behaviour.
---
v2: no changes.
include/net/netfilter/nf_flow_table.h | 1 + net/netfilter/nf_flow_table_core.c | 4 ++++ net/netfilter/nft_flow_offload.c | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-)
include/net/netfilter/nf_flow_table.h +1 -0
@@ -172,6 +172,7 @@ struct nf_flow_route {u32 ifindex;u8 h_source[ETH_ALEN ];u8 h_dest[ETH_ALEN ]; +enum flow_offload_xmit_type xmit_type; } out;struct dst_entry *dst; } tuple[FLOW_OFFLOAD_DIR_MAX ];
net/netfilter/nf_flow_table_core.c +4 -0
@@ -100,6 +100,10 @@ static int flow_offload_fill_route(struct flow_offload *flow,if (dst_xfrm (dst)) flow_tuple->xmit_type =FLOW_OFFLOAD_XMIT_XFRM ; +else + flow_tuple->xmit_type = route->tuple[dir].out.xmit_type; + + flow_tuple->dst_cache = dst; flow_tuple->dst_cache = dst;
net/netfilter/nft_flow_offload.c +5 -1
@@ -54,6 +54,7 @@ struct nft_forward_info {u32 iifindex;u8 h_source[ETH_ALEN ];u8 h_dest[ETH_ALEN ]; +enum flow_offload_xmit_type xmit_type; }; static int nft_dev_forward_path(struct nf_flow_route *route,
@@ -83,7 +84,9 @@ static int nft_dev_forward_path(struct nf_flow_route *route,case DEV_PATH_VLAN :return -1 ;case DEV_PATH_BRIDGE : -return -1 ; +memcpy (info.h_dest, path->dev->dev_addr,ETH_ALEN ); + info.xmit_type =FLOW_OFFLOAD_XMIT_DIRECT ; +break ; } }
@@ -91,6 +94,7 @@ static int nft_dev_forward_path(struct nf_flow_route *route,memcpy (route->tuple[dir].out.h_dest, info.h_source,ETH_ALEN );memcpy (route->tuple[dir].out.h_source, info.h_dest,ETH_ALEN ); route->tuple[dir].out.ifindex = info.iifindex; + route->tuple[dir].out.xmit_type = info.xmit_type;return 0 ; }
Signature · 1 line
2.20.1
Re: [PATCH net-next,v2 8/9] netfilter: flowtable: bridge port support
Quoted 29 lines · Pablo Neira Ayuso
Update hardware destination address to the master bridge device to emulate the forwarding behaviour.
Signed-off-by Pablo Neira Ayuso <[email protected]>---
v2: no changes.include/net/netfilter/nf_flow_table.h | 1 + net/netfilter/nf_flow_table_core.c | 4 ++++ net/netfilter/nft_flow_offload.c | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-)include/net/netfilter/nf_flow_table.h +1
-0@@ -172,6 +172,7 @@ struct nf_flow_route {u32 ifindex;u8 h_source[ETH_ALEN ];u8 h_dest[ETH_ALEN ]; +enum flow_offload_xmit_type xmit_type; } out;struct dst_entry *dst; } tuple[FLOW_OFFLOAD_DIR_MAX ];net/netfilter/nf_flow_table_core.c +0
-0
net/netfilter/nf_flow_table_core.c static int flow_offload_fill_route(struct flow_offload *flow, · line 108
Quoted 9 lines
net/netfilter/nf_flow_table_core.c +4
-0@@ -100,6 +100,10 @@ static int flow_offload_fill_route(struct flow_offload *flow,if (dst_xfrm (dst)) flow_tuple->xmit_type =FLOW_OFFLOAD_XMIT_XFRM ; +else + flow_tuple->xmit_type = route->tuple[dir].out.xmit_type; + + flow_tuple->dst_cache = dst; flow_tuple->dst_cache = dst;
Accidentally duplicated assignment?
Quoted 32 lines
net/netfilter/nft_flow_offload.c +5
-2@@ -54,6 +54,7 @@ struct nft_forward_info {u32 iifindex;u8 h_source[ETH_ALEN ];u8 h_dest[ETH_ALEN ]; +enum flow_offload_xmit_type xmit_type; }; static int nft_dev_forward_path(struct nf_flow_route *route,@@ -83,7 +84,9 @@ static int nft_dev_forward_path(struct nf_flow_route *route,case DEV_PATH_VLAN :return -1 ;case DEV_PATH_BRIDGE : -return -1 ; +memcpy (info.h_dest, path->dev->dev_addr,ETH_ALEN ); + info.xmit_type =FLOW_OFFLOAD_XMIT_DIRECT ; +break ; } }@@ -91,6 +94,7 @@ static int nft_dev_forward_path(struct nf_flow_route *route,memcpy (route->tuple[dir].out.h_dest, info.h_source,ETH_ALEN );memcpy (route->tuple[dir].out.h_source, info.h_dest,ETH_ALEN ); route->tuple[dir].out.ifindex = info.iifindex; + route->tuple[dir].out.xmit_type = info.xmit_type;return 0 ; } --
Quoted 1 line
2.20.1
J.
Pablo Neira Ayuso
maintainerPATCH v2 9/9 netfilter: flowtable: add vlan support
In reply to Pablo Neira AyusoAdd the vlan id and proto to the flow tuple to uniquely identify flows from the receive path. Store the vlan id and proto to set it accordingly from the transmit path. This patch includes support for two VLAN headers (Q-in-Q).
---
v2: fix sparse warnings.
include/net/netfilter/nf_flow_table.h | 21 +++- net/netfilter/nf_flow_table_core.c | 13 +++ net/netfilter/nf_flow_table_ip.c | 148 ++++++++++++++++++++++---- net/netfilter/nft_flow_offload.c | 23 +++- 4 files changed, 184 insertions(+), 21 deletions(-)
include/net/netfilter/nf_flow_table.h +20 -1
@@ -95,6 +95,8 @@ enum flow_offload_xmit_type { FLOW_OFFLOAD_XMIT_DIRECT, }; +#define NF_FLOW_TABLE_VLAN_MAX 2 + struct flow_offload_tuple { union { struct in_addr src_v4;
@@ -113,13 +115,24 @@ struct flow_offload_tuple {u8 l3proto;u8 l4proto; +struct { +u16 id; +__be16 proto; + } in_vlan[NF_FLOW_TABLE_VLAN_MAX ];/* All members above are keys for lookups, see flow_offload_hash(). */ u8 dir; - enum flow_offload_xmit_type xmit_type:8; + enum flow_offload_xmit_type xmit_type:6, + in_vlan_num:2;u16 mtu;u32 oifidx; +struct { +u16 id; +__be16 proto; + } out_vlan[NF_FLOW_TABLE_VLAN_MAX ]; +u8 out_vlan_num; +u8 h_source[ETH_ALEN ];u8 h_dest[ETH_ALEN ];struct dst_entry *dst_cache;
@@ -167,11 +180,17 @@ struct nf_flow_route {struct {struct {u32 ifindex; +u16 vid[NF_FLOW_TABLE_VLAN_MAX ]; +__be16 vproto[NF_FLOW_TABLE_VLAN_MAX ]; +u8 num_vlans; } in;struct {u32 ifindex;u8 h_source[ETH_ALEN ];u8 h_dest[ETH_ALEN ]; +u16 vid[NF_FLOW_TABLE_VLAN_MAX ]; +__be16 vproto[NF_FLOW_TABLE_VLAN_MAX ]; +u8 num_vlans;enum flow_offload_xmit_type xmit_type; } out;struct dst_entry *dst;
net/netfilter/nf_flow_table_core.c +13 -0
@@ -80,6 +80,7 @@ static int flow_offload_fill_route(struct flow_offload *flow, {struct flow_offload_tuple *flow_tuple = &flow->tuplehash[dir].tuple;struct dst_entry *dst = route->tuple[dir].dst; +int i;if (!dst_hold_safe (route->tuple[dir].dst))return -1 ;
@@ -98,6 +99,18 @@ static int flow_offload_fill_route(struct flow_offload *flow,memcpy (flow_tuple->h_source, route->tuple[dir].out.h_source,ETH_ALEN ); flow_tuple->oifidx = route->tuple[dir].out.ifindex; +for (i =0 ; i < route->tuple[dir].in.num_vlans; i++) { + flow_tuple->in_vlan[i].id = route->tuple[dir].in.vid[i]; + flow_tuple->in_vlan[i].proto = route->tuple[dir].in.vproto[i]; + } + flow_tuple->in_vlan_num = route->tuple[dir].in.num_vlans; + +for (i =0 ; i < route->tuple[dir].out.num_vlans; i++) { + flow_tuple->out_vlan[i].id = route->tuple[dir].out.vid[i]; + flow_tuple->out_vlan[i].proto = route->tuple[dir].out.vproto[i]; + } + flow_tuple->out_vlan_num = route->tuple[dir].out.num_vlans; +if (dst_xfrm (dst)) flow_tuple->xmit_type =FLOW_OFFLOAD_XMIT_XFRM ;else
net/netfilter/nf_flow_table_ip.c +129 -19
267 lines not on this page · raw message
net/netfilter/nft_flow_offload.c +22 -1
@@ -51,6 +51,9 @@ static int nft_dev_fill_forward_path(const struct nf_flow_route *route, }struct nft_forward_info { +__u16 vid[NF_FLOW_TABLE_VLAN_MAX ]; +__be16 vproto[NF_FLOW_TABLE_VLAN_MAX ]; +u8 num_vlans;u32 iifindex;u8 h_source[ETH_ALEN ];u8 h_dest[ETH_ALEN ];
@@ -82,7 +85,13 @@ static int nft_dev_forward_path(struct nf_flow_route *route, info.iifindex = path->dev->ifindex;break ;case DEV_PATH_VLAN : -return -1 ; +if (info.num_vlans >=NF_FLOW_TABLE_VLAN_MAX ) +return -1 ; + + info.vid[info.num_vlans] = path->vlan.id; + info.vproto[info.num_vlans] = path->vlan.proto; + info.num_vlans++; +break ;case DEV_PATH_BRIDGE :memcpy (info.h_dest, path->dev->dev_addr,ETH_ALEN ); info.xmit_type =FLOW_OFFLOAD_XMIT_DIRECT ;
@@ -96,6 +105,18 @@ static int nft_dev_forward_path(struct nf_flow_route *route, route->tuple[dir].out.ifindex = info.iifindex; route->tuple[dir].out.xmit_type = info.xmit_type; +for (i =0 ; i < info.num_vlans; i++) { + route->tuple[!dir].in.vid[i] = info.vid[i]; + route->tuple[!dir].in.vproto[i] = info.vproto[i]; + } + route->tuple[!dir].in.num_vlans = info.num_vlans; + +for (i =0 ; i < info.num_vlans; i++) { + route->tuple[dir].out.vid[i] = info.vid[i]; + route->tuple[dir].out.vproto[i] = info.vproto[i]; + } + route->tuple[dir].out.num_vlans = info.num_vlans; +return 0 ; }
Signature · 1 line
2.20.1
Jakub Kicinski
maintainerQuoted 11 lines · On Thu, 15 Oct 2020 18:30:29 +0200 Pablo Neira Ayuso wrote:
The following patchset adds infrastructure to augment the Netfilter flowtable fastpath [1] to support for local network topologies that combine IP forwarding, bridge and vlan devices.
A typical scenario that can benefit from this infrastructure is composed of several VMs connected to bridge ports where the bridge master device 'br0' has an IP address. A DHCP server is also assumed to be running to provide connectivity to the VMs. The VMs reach the Internet through 'br0' as default gateway, which makes the packet enter the IP forwarding path. Then, netfilter is used to NAT the packets before they leave to through the wan device.
Hi Pablo, I should have looked at this closer yesterday, but I think it warrants a little more review than we can afford right now.
Let's take it after the merge window, sorry!
Pablo Neira Ayuso
maintainerQuoted 13 lines · Jakub Kicinski
Quoted 11 lines · On Thu, 15 Oct 2020 18:30:29 +0200 Pablo Neira Ayuso wrote:
The following patchset adds infrastructure to augment the Netfilter flowtable fastpath [1] to support for local network topologies that combine IP forwarding, bridge and vlan devices.
A typical scenario that can benefit from this infrastructure is composed of several VMs connected to bridge ports where the bridge master device 'br0' has an IP address. A DHCP server is also assumed to be running to provide connectivity to the VMs. The VMs reach the Internet through 'br0' as default gateway, which makes the packet enter the IP forwarding path. Then, netfilter is used to NAT the packets before they leave to through the wan device.
Quoted 4 lines
Hi Pablo, I should have looked at this closer yesterday, but I think it warrants a little more review than we can afford right now.
Let's take it after the merge window, sorry!
I understand, I admit it was a bit late patchset.
I have to say that I'm dissapointed. I cannot avoid shaking the feeling that there is always a reason to push back for Netfilter stuff.
Probably it's not fair to mention this in this case.
It's just a personal perception, so I might be really wrong about it.