net: bridge: move br_fdb_replay inside br_switchdev.c

br_fdb_replay is only called from switchdev code paths, so it makes
sense to be disabled if switchdev is not enabled in the first place.

As opposed to br_mdb_replay and br_vlan_replay which might be turned off
depending on bridge support for multicast and VLANs, FDB support is
always on. So moving br_mdb_replay and br_vlan_replay inside
br_switchdev.c would mean adding some #ifdef's in br_switchdev.c, so we
keep those where they are.

The reason for the movement is that in future changes there will be some
code reuse between br_switchdev_fdb_notify and br_fdb_replay.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.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 f2b909aedabf7994b31fae63efa842d4a30f9044..6ccda68bd473b464afd000f4f6b521c8a2ef9e6d 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -759,60 +759,6 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
        }
 }
 
-static int br_fdb_replay_one(struct net_bridge *br, struct notifier_block *nb,
-                            const struct net_bridge_fdb_entry *fdb,
-                            unsigned long action, const void *ctx)
-{
-       const struct net_bridge_port *p = READ_ONCE(fdb->dst);
-       struct switchdev_notifier_fdb_info item;
-       int err;
-
-       item.addr = fdb->key.addr.addr;
-       item.vid = fdb->key.vlan_id;
-       item.added_by_user = test_bit(BR_FDB_ADDED_BY_USER, &fdb->flags);
-       item.offloaded = test_bit(BR_FDB_OFFLOADED, &fdb->flags);
-       item.is_local = test_bit(BR_FDB_LOCAL, &fdb->flags);
-       item.info.dev = (!p || item.is_local) ? br->dev : p->dev;
-       item.info.ctx = ctx;
-
-       err = nb->notifier_call(nb, action, &item);
-       return notifier_to_errno(err);
-}
-
-int br_fdb_replay(const struct net_device *br_dev, const void *ctx, bool adding,
-                 struct notifier_block *nb)
-{
-       struct net_bridge_fdb_entry *fdb;
-       struct net_bridge *br;
-       unsigned long action;
-       int err = 0;
-
-       if (!nb)
-               return 0;
-
-       if (!netif_is_bridge_master(br_dev))
-               return -EINVAL;
-
-       br = netdev_priv(br_dev);
-
-       if (adding)
-               action = SWITCHDEV_FDB_ADD_TO_DEVICE;
-       else
-               action = SWITCHDEV_FDB_DEL_TO_DEVICE;
-
-       rcu_read_lock();
-
-       hlist_for_each_entry_rcu(fdb, &br->fdb_list, fdb_node) {
-               err = br_fdb_replay_one(br, nb, fdb, action, ctx);
-               if (err)
-                       break;
-       }
-
-       rcu_read_unlock();
-
-       return err;
-}
-
 /* Dump information about entries, in response to GETNEIGH */
 int br_fdb_dump(struct sk_buff *skb,
                struct netlink_callback *cb,

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 705606fc22372043e0609d922579b9e345791062..3c93276280605cb78c710015ac24c4d0fcda778d 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -792,8 +792,6 @@ int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p,
                              bool swdev_notify);
 void br_fdb_offloaded_set(struct net_bridge *br, struct net_bridge_port *p,
                          const unsigned char *addr, u16 vid, bool offloaded);
-int br_fdb_replay(const struct net_device *br_dev, const void *ctx, bool adding,
-                 struct notifier_block *nb);
 
 /* br_forward.c */
 enum br_pkt_type {

diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c
index 6bf518d78f0292d796fcc4ca21703902c33b618a..8a45b1cfe06fba36f2308929c255f38644531f00 100644 (file)
--- a/net/bridge/br_switchdev.c
+++ b/net/bridge/br_switchdev.c
@@ -270,6 +270,60 @@ static void nbp_switchdev_del(struct net_bridge_port *p)
        }
 }
 
+static int br_fdb_replay_one(struct net_bridge *br, struct notifier_block *nb,
+                            const struct net_bridge_fdb_entry *fdb,
+                            unsigned long action, const void *ctx)
+{
+       const struct net_bridge_port *p = READ_ONCE(fdb->dst);
+       struct switchdev_notifier_fdb_info item;
+       int err;
+
+       item.addr = fdb->key.addr.addr;
+       item.vid = fdb->key.vlan_id;
+       item.added_by_user = test_bit(BR_FDB_ADDED_BY_USER, &fdb->flags);
+       item.offloaded = test_bit(BR_FDB_OFFLOADED, &fdb->flags);
+       item.is_local = test_bit(BR_FDB_LOCAL, &fdb->flags);
+       item.info.dev = (!p || item.is_local) ? br->dev : p->dev;
+       item.info.ctx = ctx;
+
+       err = nb->notifier_call(nb, action, &item);
+       return notifier_to_errno(err);
+}
+
+static int br_fdb_replay(const struct net_device *br_dev, const void *ctx,
+                        bool adding, struct notifier_block *nb)
+{
+       struct net_bridge_fdb_entry *fdb;
+       struct net_bridge *br;
+       unsigned long action;
+       int err = 0;
+
+       if (!nb)
+               return 0;
+
+       if (!netif_is_bridge_master(br_dev))
+               return -EINVAL;
+
+       br = netdev_priv(br_dev);
+
+       if (adding)
+               action = SWITCHDEV_FDB_ADD_TO_DEVICE;
+       else
+               action = SWITCHDEV_FDB_DEL_TO_DEVICE;
+
+       rcu_read_lock();
+
+       hlist_for_each_entry_rcu(fdb, &br->fdb_list, fdb_node) {
+               err = br_fdb_replay_one(br, nb, fdb, action, ctx);
+               if (err)
+                       break;
+       }
+
+       rcu_read_unlock();
+
+       return err;
+}
+
 static int nbp_switchdev_sync_objs(struct net_bridge_port *p, const void *ctx,
                                   struct notifier_block *atomic_nb,
                                   struct notifier_block *blocking_nb,