net: bridge: switchdev: send FDB notifications for host addresses

Treat addresses added to the bridge itself in the same way as regular
ports and send out a notification so that drivers may sync it down to
the hardware FDB.

Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index dc3ecf2d5637f9d47303de2375f1a36a36daec4b..bad7e84d76af498a22cd5d5a49320cd225b63ce1 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -607,7 +607,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
                        /* fastpath: update of existing entry */
                        if (unlikely(source != READ_ONCE(fdb->dst) &&
                                     !test_bit(BR_FDB_STICKY, &fdb->flags))) {
-                               br_switchdev_fdb_notify(fdb, RTM_DELNEIGH);
+                               br_switchdev_fdb_notify(br, fdb, RTM_DELNEIGH);
                                WRITE_ONCE(fdb->dst, source);
                                fdb_modified = true;
                                /* Take over HW learned entry */
@@ -800,7 +800,7 @@ static void fdb_notify(struct net_bridge *br,
        int err = -ENOBUFS;
 
        if (swdev_notify)
-               br_switchdev_fdb_notify(fdb, type);
+               br_switchdev_fdb_notify(br, fdb, type);
 
        skb = nlmsg_new(fdb_nlmsg_size(), GFP_ATOMIC);
        if (skb == NULL)

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index a684d0cfc58c7670bd726ec54cbf55a1c86c3bdb..2b48b204205e68dd2b092d61578b7b6ccb228487 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -1654,8 +1654,8 @@ int br_switchdev_set_port_flag(struct net_bridge_port *p,
                               unsigned long flags,
                               unsigned long mask,
                               struct netlink_ext_ack *extack);
-void br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb,
-                            int type);
+void br_switchdev_fdb_notify(struct net_bridge *br,
+                            const struct net_bridge_fdb_entry *fdb, int type);
 int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid, u16 flags,
                               struct netlink_ext_ack *extack);
 int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid);
@@ -1702,7 +1702,8 @@ static inline int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid)
 }
 
 static inline void
-br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb, int type)
+br_switchdev_fdb_notify(struct net_bridge *br,
+                       const struct net_bridge_fdb_entry *fdb, int type)
 {
 }
 

diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c
index 192293fe37fd8ef8708e0c88462afc129aade26d..d3adee0f91f948b36401a805c4836ada0da809db 100644 (file)
--- a/net/bridge/br_switchdev.c
+++ b/net/bridge/br_switchdev.c
@@ -108,9 +108,11 @@ int br_switchdev_set_port_flag(struct net_bridge_port *p,
 }
 
 void
-br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb, int type)
+br_switchdev_fdb_notify(struct net_bridge *br,
+                       const struct net_bridge_fdb_entry *fdb, int type)
 {
        const struct net_bridge_port *dst = READ_ONCE(fdb->dst);
+       struct net_device *dev = dst ? dst->dev : br->dev;
        struct switchdev_notifier_fdb_info info = {
                .addr = fdb->key.addr.addr,
                .vid = fdb->key.vlan_id,
@@ -119,17 +121,14 @@ br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb, int type)
                .offloaded = test_bit(BR_FDB_OFFLOADED, &fdb->flags),
        };
 
-       if (!dst)
-               return;
-
        switch (type) {
        case RTM_DELNEIGH:
                call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_DEVICE,
-                                        dst->dev, &info.info, NULL);
+                                        dev, &info.info, NULL);
                break;
        case RTM_NEWNEIGH:
                call_switchdev_notifiers(SWITCHDEV_FDB_ADD_TO_DEVICE,
-                                        dst->dev, &info.info, NULL);
+                                        dev, &info.info, NULL);
                break;
        }
 }