| Message ID | 20201015163038.26992-5-pablo@netfilter.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2,1/9] netfilter: flowtable: add xmit path types | expand |
On Thu, 2020-10-15 at 18:30 +0200, Pablo Neira Ayuso wrote: > Add .ndo_fill_forward_path for bridge devices. > > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> > --- > v2: no changes > > include/linux/netdevice.h | 1 + > net/bridge/br_device.c | 22 ++++++++++++++++++++++ > 2 files changed, 23 insertions(+) > > diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h > index d4263ed5dd79..4cabdbc672d3 100644 > --- a/include/linux/netdevice.h > +++ b/include/linux/netdevice.h > @@ -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 { > diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c > index 6f742fee874a..06046a35868d 100644 > --- a/net/bridge/br_device.c > +++ b/net/bridge/br_device.c > @@ -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; 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 > + > + 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 = {
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index d4263ed5dd79..4cabdbc672d3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -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 { diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 6f742fee874a..06046a35868d 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -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 = {
Add .ndo_fill_forward_path for bridge devices. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- v2: no changes include/linux/netdevice.h | 1 + net/bridge/br_device.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+)