net: switchdev: remove lag_mod_cb from switchdev_handle_fdb_event_to_device

When the switchdev_handle_fdb_event_to_device() event replication helper
was created, my original thought was that FDB events on LAG interfaces
should most likely be special-cased, not just replicated towards all
switchdev ports beneath that LAG. So this replication helper currently
does not recurse through switchdev lower interfaces of LAG bridge ports,
but rather calls the lag_mod_cb() if that was provided.

No switchdev driver uses this helper for FDB events on LAG interfaces
yet, so that was an assumption which was yet to be tested. It is
certainly usable for that purpose, as my RFC series shows:

https://patchwork.kernel.org/project/netdevbpf/cover/20220210125201.2859463-1-vladimir.oltean@nxp.com/

however this approach is slightly convoluted because:

- the switchdev driver gets a "dev" that isn't its own net device, but
  rather the LAG net device. It must call switchdev_lower_dev_find(dev)
  in order to get a handle of any of its own net devices (the ones that
  pass check_cb).

- in order for FDB entries on LAG ports to be correctly refcounted per
  the number of switchdev ports beneath that LAG, we haven't escaped the
  need to iterate through the LAG's lower interfaces. Except that is now
  the responsibility of the switchdev driver, because the replication
  helper just stopped half-way.

So, even though yes, FDB events on LAG bridge ports must be
special-cased, in the end it's simpler to let switchdev_handle_fdb_*
just iterate through the LAG port's switchdev lowers, and let the
switchdev driver figure out that those physical ports are under a LAG.

The switchdev_handle_fdb_event_to_device() helper takes a
"foreign_dev_check" callback so it can figure out whether @dev can
autonomously forward to @foreign_dev. DSA fills this method properly:
if the LAG is offloaded by another port in the same tree as @dev, then
it isn't foreign. If it is a software LAG, it is foreign - forwarding
happens in software.

Whether an interface is foreign or not decides whether the replication
helper will go through the LAG's switchdev lowers or not. Since the
lan966x doesn't properly fill this out, FDB events on software LAG
uppers will get called. By changing lan966x_foreign_dev_check(), we can
suppress them.

Whereas DSA will now start receiving FDB events for its offloaded LAG
uppers, so we need to return -EOPNOTSUPP, since we currently don't do
the right thing for them.

Cc: Horatiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c b/drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c
index 85099a5..e3555c9 100644 (file)
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c
@@ -419,6 +419,9 @@ static int lan966x_netdevice_event(struct notifier_block *nb,
        return notifier_from_errno(ret);
 }
 
+/* We don't offload uppers such as LAG as bridge ports, so every device except
+ * the bridge itself is foreign.
+ */
 static bool lan966x_foreign_dev_check(const struct net_device *dev,
                                      const struct net_device *foreign_dev)
 {
@@ -426,10 +429,10 @@ static bool lan966x_foreign_dev_check(const struct net_device *dev,
        struct lan966x *lan966x = port->lan966x;
 
        if (netif_is_bridge_master(foreign_dev))
-               if (lan966x->bridge != foreign_dev)
-                       return true;
+               if (lan966x->bridge == foreign_dev)
+                       return false;
 
-       return false;
+       return true;
 }
 
 static int lan966x_switchdev_event(struct notifier_block *nb,
@@ -449,8 +452,7 @@ static int lan966x_switchdev_event(struct notifier_block *nb,
                err = switchdev_handle_fdb_event_to_device(dev, event, ptr,
                                                           lan966x_netdevice_check,
                                                           lan966x_foreign_dev_check,
-                                                          lan966x_handle_fdb,
-                                                          NULL);
+                                                          lan966x_handle_fdb);
                return notifier_from_errno(err);
        }
 

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index c32e1c8..3e424d4 100644 (file)
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -313,10 +313,7 @@ int switchdev_handle_fdb_event_to_device(struct net_device *dev, unsigned long e
                                             const struct net_device *foreign_dev),
                int (*mod_cb)(struct net_device *dev, struct net_device *orig_dev,
                              unsigned long event, const void *ctx,
-                             const struct switchdev_notifier_fdb_info *fdb_info),
-               int (*lag_mod_cb)(struct net_device *dev, struct net_device *orig_dev,
-                                 unsigned long event, const void *ctx,
-                                 const struct switchdev_notifier_fdb_info *fdb_info));
+                             const struct switchdev_notifier_fdb_info *fdb_info));
 
 int switchdev_handle_port_obj_add(struct net_device *dev,
                        struct switchdev_notifier_port_obj_info *port_obj_info,
@@ -443,10 +440,7 @@ switchdev_handle_fdb_event_to_device(struct net_device *dev, unsigned long event
                                             const struct net_device *foreign_dev),
                int (*mod_cb)(struct net_device *dev, struct net_device *orig_dev,
                              unsigned long event, const void *ctx,
-                             const struct switchdev_notifier_fdb_info *fdb_info),
-               int (*lag_mod_cb)(struct net_device *dev, struct net_device *orig_dev,
-                                 unsigned long event, const void *ctx,
-                                 const struct switchdev_notifier_fdb_info *fdb_info))
+                             const struct switchdev_notifier_fdb_info *fdb_info))
 {
        return 0;
 }

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index e31c771..4ea6e0f 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -2461,6 +2461,9 @@ static int dsa_slave_fdb_event(struct net_device *dev,
        bool host_addr = fdb_info->is_local;
        struct dsa_switch *ds = dp->ds;
 
+       if (dp->lag)
+               return -EOPNOTSUPP;
+
        if (ctx && ctx != dp)
                return 0;
 
@@ -2526,8 +2529,7 @@ static int dsa_slave_switchdev_event(struct notifier_block *unused,
                err = switchdev_handle_fdb_event_to_device(dev, event, ptr,
                                                           dsa_slave_dev_check,
                                                           dsa_foreign_dev_check,
-                                                          dsa_slave_fdb_event,
-                                                          NULL);
+                                                          dsa_slave_fdb_event);
                return notifier_from_errno(err);
        default:
                return NOTIFY_DONE;

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 28d2ccf..474f763 100644 (file)
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -458,63 +458,40 @@ static int __switchdev_handle_fdb_event_to_device(struct net_device *dev,
                                             const struct net_device *foreign_dev),
                int (*mod_cb)(struct net_device *dev, struct net_device *orig_dev,
                              unsigned long event, const void *ctx,
-                             const struct switchdev_notifier_fdb_info *fdb_info),
-               int (*lag_mod_cb)(struct net_device *dev, struct net_device *orig_dev,
-                                 unsigned long event, const void *ctx,
-                                 const struct switchdev_notifier_fdb_info *fdb_info))
+                             const struct switchdev_notifier_fdb_info *fdb_info))
 {
        const struct switchdev_notifier_info *info = &fdb_info->info;
-       struct net_device *br, *lower_dev;
+       struct net_device *br, *lower_dev, *switchdev;
        struct list_head *iter;
        int err = -EOPNOTSUPP;
 
        if (check_cb(dev))
                return mod_cb(dev, orig_dev, event, info->ctx, fdb_info);
 
-       if (netif_is_lag_master(dev)) {
-               if (!switchdev_lower_dev_find_rcu(dev, check_cb, foreign_dev_check_cb))
-                       goto maybe_bridged_with_us;
-
-               /* This is a LAG interface that we offload */
-               if (!lag_mod_cb)
-                       return -EOPNOTSUPP;
-
-               return lag_mod_cb(dev, orig_dev, event, info->ctx, fdb_info);
-       }
-
        /* Recurse through lower interfaces in case the FDB entry is pointing
-        * towards a bridge device.
+        * towards a bridge or a LAG device.
         */
-       if (netif_is_bridge_master(dev)) {
-               if (!switchdev_lower_dev_find_rcu(dev, check_cb, foreign_dev_check_cb))
-                       return 0;
-
-               /* This is a bridge interface that we offload */
-               netdev_for_each_lower_dev(dev, lower_dev, iter) {
-                       /* Do not propagate FDB entries across bridges */
-                       if (netif_is_bridge_master(lower_dev))
-                               continue;
-
-                       /* Bridge ports might be either us, or LAG interfaces
-                        * that we offload.
-                        */
-                       if (!check_cb(lower_dev) &&
-                           !switchdev_lower_dev_find_rcu(lower_dev, check_cb,
-                                                         foreign_dev_check_cb))
-                               continue;
-
-                       err = __switchdev_handle_fdb_event_to_device(lower_dev, orig_dev,
-                                                                    event, fdb_info, check_cb,
-                                                                    foreign_dev_check_cb,
-                                                                    mod_cb, lag_mod_cb);
-                       if (err && err != -EOPNOTSUPP)
-                               return err;
-               }
+       netdev_for_each_lower_dev(dev, lower_dev, iter) {
+               /* Do not propagate FDB entries across bridges */
+               if (netif_is_bridge_master(lower_dev))
+                       continue;
 
-               return 0;
+               /* Bridge ports might be either us, or LAG interfaces
+                * that we offload.
+                */
+               if (!check_cb(lower_dev) &&
+                   !switchdev_lower_dev_find_rcu(lower_dev, check_cb,
+                                                 foreign_dev_check_cb))
+                       continue;
+
+               err = __switchdev_handle_fdb_event_to_device(lower_dev, orig_dev,
+                                                            event, fdb_info, check_cb,
+                                                            foreign_dev_check_cb,
+                                                            mod_cb);
+               if (err && err != -EOPNOTSUPP)
+                       return err;
        }
 
-maybe_bridged_with_us:
        /* Event is neither on a bridge nor a LAG. Check whether it is on an
         * interface that is in a bridge with us.
         */
@@ -522,12 +499,16 @@ maybe_bridged_with_us:
        if (!br || !netif_is_bridge_master(br))
                return 0;
 
-       if (!switchdev_lower_dev_find_rcu(br, check_cb, foreign_dev_check_cb))
+       switchdev = switchdev_lower_dev_find_rcu(br, check_cb, foreign_dev_check_cb);
+       if (!switchdev)
                return 0;
 
+       if (!foreign_dev_check_cb(switchdev, dev))
+               return err;
+
        return __switchdev_handle_fdb_event_to_device(br, orig_dev, event, fdb_info,
                                                      check_cb, foreign_dev_check_cb,
-                                                     mod_cb, lag_mod_cb);
+                                                     mod_cb);
 }
 
 int switchdev_handle_fdb_event_to_device(struct net_device *dev, unsigned long event,
@@ -537,16 +518,13 @@ int switchdev_handle_fdb_event_to_device(struct net_device *dev, unsigned long e
                                             const struct net_device *foreign_dev),
                int (*mod_cb)(struct net_device *dev, struct net_device *orig_dev,
                              unsigned long event, const void *ctx,
-                             const struct switchdev_notifier_fdb_info *fdb_info),
-               int (*lag_mod_cb)(struct net_device *dev, struct net_device *orig_dev,
-                                 unsigned long event, const void *ctx,
-                                 const struct switchdev_notifier_fdb_info *fdb_info))
+                             const struct switchdev_notifier_fdb_info *fdb_info))
 {
        int err;
 
        err = __switchdev_handle_fdb_event_to_device(dev, dev, event, fdb_info,
                                                     check_cb, foreign_dev_check_cb,
-                                                    mod_cb, lag_mod_cb);
+                                                    mod_cb);
        if (err == -EOPNOTSUPP)
                err = 0;