net: bridge: Add support for notifying devices about FDB add/del

Currently the bridge doesn't notify the underlying devices about new
FDBs learned. The FDB sync is placed on the switchdev notifier chain
because devices may potentially learn FDB that are not directly related
to their ports, for example:

1. Mixed SW/HW bridge - FDBs that point to the ASICs external devices
                        should be offloaded as CPU traps in order to
			perform forwarding in slow path.
2. EVPN - Externally learned FDBs for the vtep device.

Notification is sent only about static FDB add/del. This is done due
to fact that currently this is the only scenario supported by switch
drivers.

Signed-off-by: Arkadi Sharshevsky <[email protected]>
Reviewed-by: Ido Schimmel <[email protected]>
Signed-off-by: Jiri Pirko <[email protected]>
Reviewed-by: Nikolay Aleksandrov <[email protected]>
Reviewed-by: Ivan Vecera <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index edcc273d7597677cb04a34612da9f1554a2b6200..0111a77c36e8841ea01f3f95a705b238d38a2615 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -1867,7 +1867,7 @@ static void mlxsw_sp_fdb_call_notifiers(bool learning_sync, bool adding,
        if (learning_sync) {
                info.addr = mac;
                info.vid = vid;
-               notifier_type = adding ? SWITCHDEV_FDB_ADD : SWITCHDEV_FDB_DEL;
+               notifier_type = adding ? SWITCHDEV_FDB_ADD_TO_BRIDGE : SWITCHDEV_FDB_DEL_TO_BRIDGE;
                call_switchdev_notifiers(notifier_type, dev, &info.info);
        }
 }

diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c b/drivers/net/ethernet/rocker/rocker_ofdpa.c
index 2ae85245478087d2d640617bd79bfbfabd5f0763..f659dad818e2759e4a4c3c13aa7d23aeda154264 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker_ofdpa.c
+++ b/drivers/net/ethernet/rocker/rocker_ofdpa.c
@@ -1939,10 +1939,10 @@ static void ofdpa_port_fdb_learn_work(struct work_struct *work)
 
        rtnl_lock();
        if (learned && removing)
-               call_switchdev_notifiers(SWITCHDEV_FDB_DEL,
+               call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_BRIDGE,
                                         lw->ofdpa_port->dev, &info.info);
        else if (learned && !removing)
-               call_switchdev_notifiers(SWITCHDEV_FDB_ADD,
+               call_switchdev_notifiers(SWITCHDEV_FDB_ADD_TO_BRIDGE,
                                         lw->ofdpa_port->dev, &info.info);
        rtnl_unlock();
 

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 63a754d4ff9b88717d08ab737473add92a7d7d88..8165ed93c58b280a8277ac6a68ed03631fd83f26 100644 (file)
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -155,8 +155,10 @@ struct switchdev_ops {
 };
 
 enum switchdev_notifier_type {
-       SWITCHDEV_FDB_ADD = 1,
-       SWITCHDEV_FDB_DEL,
+       SWITCHDEV_FDB_ADD_TO_BRIDGE = 1,
+       SWITCHDEV_FDB_DEL_TO_BRIDGE,
+       SWITCHDEV_FDB_ADD_TO_DEVICE,
+       SWITCHDEV_FDB_DEL_TO_DEVICE,
 };
 
 struct switchdev_notifier_info {

diff --git a/net/bridge/br.c b/net/bridge/br.c
index e962fff8c0d99be3f1d870ca229cab88ef8bd874..96d209caf6db6775e85e68b349141d92a353fa96 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -138,14 +138,14 @@ static int br_switchdev_event(struct notifier_block *unused,
        br = p->br;
 
        switch (event) {
-       case SWITCHDEV_FDB_ADD:
+       case SWITCHDEV_FDB_ADD_TO_BRIDGE:
                fdb_info = ptr;
                err = br_fdb_external_learn_add(br, p, fdb_info->addr,
                                                fdb_info->vid);
                if (err)
                        err = notifier_from_errno(err);
                break;
-       case SWITCHDEV_FDB_DEL:
+       case SWITCHDEV_FDB_DEL_TO_BRIDGE:
                fdb_info = ptr;
                err = br_fdb_external_learn_del(br, p, fdb_info->addr,
                                                fdb_info->vid);

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 5c780cdee93a0561271625de8ca21807ee21705b..26a1dae2d434274daca29d41a68e95a662dd027a 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -690,6 +690,8 @@ static void fdb_notify(struct net_bridge *br,
        struct sk_buff *skb;
        int err = -ENOBUFS;
 
+       br_switchdev_fdb_notify(fdb, type);
+
        skb = nlmsg_new(fdb_nlmsg_size(), GFP_ATOMIC);
        if (skb == NULL)
                goto errout;

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index a122684b6a41fc95ba9700b83dd123fef9c506f9..98410ea032cbf31c1abbd543975dbcb4e89567ce 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -1085,6 +1085,8 @@ bool nbp_switchdev_allowed_egress(const struct net_bridge_port *p,
 int br_switchdev_set_port_flag(struct net_bridge_port *p,
                               unsigned long flags,
                               unsigned long mask);
+void br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb,
+                            int type);
 #else
 static inline int nbp_switchdev_mark_set(struct net_bridge_port *p)
 {
@@ -1108,6 +1110,11 @@ static inline int br_switchdev_set_port_flag(struct net_bridge_port *p,
 {
        return 0;
 }
+
+static inline void
+br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb, int type)
+{
+}
 #endif /* CONFIG_NET_SWITCHDEV */
 
 #endif

diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c
index b975959ac15a25b88bda77f206340c597a15ef10..181a44d0f1da6364a8965b54cf13aa6a5e44ef22 100644 (file)
--- a/net/bridge/br_switchdev.c
+++ b/net/bridge/br_switchdev.c
@@ -98,3 +98,36 @@ int br_switchdev_set_port_flag(struct net_bridge_port *p,
 
        return 0;
 }
+
+static void
+br_switchdev_fdb_call_notifiers(bool adding, const unsigned char *mac,
+                               u16 vid, struct net_device *dev)
+{
+       struct switchdev_notifier_fdb_info info;
+       unsigned long notifier_type;
+
+       info.addr = mac;
+       info.vid = vid;
+       notifier_type = adding ? SWITCHDEV_FDB_ADD_TO_DEVICE : SWITCHDEV_FDB_DEL_TO_DEVICE;
+       call_switchdev_notifiers(notifier_type, dev, &info.info);
+}
+
+void
+br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb, int type)
+{
+       if (!fdb->added_by_user)
+               return;
+
+       switch (type) {
+       case RTM_DELNEIGH:
+               br_switchdev_fdb_call_notifiers(false, fdb->addr.addr,
+                                               fdb->vlan_id,
+                                               fdb->dst->dev);
+               break;
+       case RTM_NEWNEIGH:
+               br_switchdev_fdb_call_notifiers(true, fdb->addr.addr,
+                                               fdb->vlan_id,
+                                               fdb->dst->dev);
+               break;
+       }
+}