net: switchdev: introduce switchdev_handle_port_obj_{add,del} for foreign interfaces

The switchdev_handle_port_obj_add() helper is good for replicating a
port object on the lower interfaces of @dev, if that object was emitted
on a bridge, or on a bridge port that is a LAG.

However, drivers that use this helper limit themselves to a box from
which they can no longer intercept port objects notified on neighbor
ports ("foreign interfaces").

One such driver is DSA, where software bridging with foreign interfaces
such as standalone NICs or Wi-Fi APs is an important use case. There, a
VLAN installed on a neighbor bridge port roughly corresponds to a
forwarding VLAN installed on the DSA switch's CPU port.

To support this use case while also making use of the benefits of the
switchdev_handle_* replication helper for port objects, introduce a new
variant of these functions that crawls through the neighbor ports of
@dev, in search of potentially compatible switchdev ports that are
interested in the event.

The strategy is identical to switchdev_handle_fdb_event_to_device():
if @dev wasn't a switchdev interface, then go one step upper, and
recursively call this function on the bridge that this port belongs to.
At the next recursion step, __switchdev_handle_port_obj_add() will
iterate through the bridge's lower interfaces. Among those, some will be
switchdev interfaces, and one will be the original @dev that we came
from. To prevent infinite recursion, we must suppress reentry into the
original @dev, and just call the @add_cb for the switchdev_interfaces.

It looks like this:

                br0
               / | \
              /  |  \
             /   |   \
           swp0 swp1 eth0

1. __switchdev_handle_port_obj_add(eth0)
   -> check_cb(eth0) returns false
   -> eth0 has no lower interfaces
   -> eth0's bridge is br0
   -> switchdev_lower_dev_find(br0, check_cb, foreign_dev_check_cb))
      finds br0

2. __switchdev_handle_port_obj_add(br0)
   -> check_cb(br0) returns false
   -> netdev_for_each_lower_dev
      -> check_cb(swp0) returns true, so we don't skip this interface

3. __switchdev_handle_port_obj_add(swp0)
   -> check_cb(swp0) returns true, so we call add_cb(swp0)

(back to netdev_for_each_lower_dev from 2)
      -> check_cb(swp1) returns true, so we don't skip this interface

4. __switchdev_handle_port_obj_add(swp1)
   -> check_cb(swp1) returns true, so we call add_cb(swp1)

(back to netdev_for_each_lower_dev from 2)
      -> check_cb(eth0) returns false, so we skip this interface to
         avoid infinite recursion

Note: eth0 could have been a LAG, and we don't want to suppress the
recursion through its lowers if those exist, so when check_cb() returns
false, we still call switchdev_lower_dev_find() to estimate whether
there's anything worth a recursion beneath that LAG. Using check_cb()
and foreign_dev_check_cb(), switchdev_lower_dev_find() not only figures
out whether the lowers of the LAG are switchdev, but also whether they
actively offload the LAG or not (whether the LAG is "foreign" to the
switchdev interface or not).

The port_obj_info->orig_dev is preserved across recursive calls, so
switchdev drivers still know on which device was this notification
originally emitted.

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

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 92cc763991e99c721ca73ed6291e90df4d43d3b7..c32e1c8f79ec2f3c153aa7346e94d20d6c9fb35d 100644 (file)
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -324,11 +324,26 @@ int switchdev_handle_port_obj_add(struct net_device *dev,
                        int (*add_cb)(struct net_device *dev, const void *ctx,
                                      const struct switchdev_obj *obj,
                                      struct netlink_ext_ack *extack));
+int switchdev_handle_port_obj_add_foreign(struct net_device *dev,
+                       struct switchdev_notifier_port_obj_info *port_obj_info,
+                       bool (*check_cb)(const struct net_device *dev),
+                       bool (*foreign_dev_check_cb)(const struct net_device *dev,
+                                                    const struct net_device *foreign_dev),
+                       int (*add_cb)(struct net_device *dev, const void *ctx,
+                                     const struct switchdev_obj *obj,
+                                     struct netlink_ext_ack *extack));
 int switchdev_handle_port_obj_del(struct net_device *dev,
                        struct switchdev_notifier_port_obj_info *port_obj_info,
                        bool (*check_cb)(const struct net_device *dev),
                        int (*del_cb)(struct net_device *dev, const void *ctx,
                                      const struct switchdev_obj *obj));
+int switchdev_handle_port_obj_del_foreign(struct net_device *dev,
+                       struct switchdev_notifier_port_obj_info *port_obj_info,
+                       bool (*check_cb)(const struct net_device *dev),
+                       bool (*foreign_dev_check_cb)(const struct net_device *dev,
+                                                    const struct net_device *foreign_dev),
+                       int (*del_cb)(struct net_device *dev, const void *ctx,
+                                     const struct switchdev_obj *obj));
 
 int switchdev_handle_port_attr_set(struct net_device *dev,
                        struct switchdev_notifier_port_attr_info *port_attr_info,
@@ -447,6 +462,18 @@ switchdev_handle_port_obj_add(struct net_device *dev,
        return 0;
 }
 
+static inline int switchdev_handle_port_obj_add_foreign(struct net_device *dev,
+                       struct switchdev_notifier_port_obj_info *port_obj_info,
+                       bool (*check_cb)(const struct net_device *dev),
+                       bool (*foreign_dev_check_cb)(const struct net_device *dev,
+                                                    const struct net_device *foreign_dev),
+                       int (*add_cb)(struct net_device *dev, const void *ctx,
+                                     const struct switchdev_obj *obj,
+                                     struct netlink_ext_ack *extack))
+{
+       return 0;
+}
+
 static inline int
 switchdev_handle_port_obj_del(struct net_device *dev,
                        struct switchdev_notifier_port_obj_info *port_obj_info,
@@ -457,6 +484,18 @@ switchdev_handle_port_obj_del(struct net_device *dev,
        return 0;
 }
 
+static inline int
+switchdev_handle_port_obj_del_foreign(struct net_device *dev,
+                       struct switchdev_notifier_port_obj_info *port_obj_info,
+                       bool (*check_cb)(const struct net_device *dev),
+                       bool (*foreign_dev_check_cb)(const struct net_device *dev,
+                                                    const struct net_device *foreign_dev),
+                       int (*del_cb)(struct net_device *dev, const void *ctx,
+                                     const struct switchdev_obj *obj))
+{
+       return 0;
+}
+
 static inline int
 switchdev_handle_port_attr_set(struct net_device *dev,
                        struct switchdev_notifier_port_attr_info *port_attr_info,

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index d53f364870a55d471b57dbeda3447fa2e87e09fc..6a00c390547b87d89a6d20c8da436584883fe834 100644 (file)
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -429,6 +429,27 @@ switchdev_lower_dev_find_rcu(struct net_device *dev,
        return switchdev_priv.lower_dev;
 }
 
+static struct net_device *
+switchdev_lower_dev_find(struct net_device *dev,
+                        bool (*check_cb)(const struct net_device *dev),
+                        bool (*foreign_dev_check_cb)(const struct net_device *dev,
+                                                     const struct net_device *foreign_dev))
+{
+       struct switchdev_nested_priv switchdev_priv = {
+               .check_cb = check_cb,
+               .foreign_dev_check_cb = foreign_dev_check_cb,
+               .dev = dev,
+               .lower_dev = NULL,
+       };
+       struct netdev_nested_priv priv = {
+               .data = &switchdev_priv,
+       };
+
+       netdev_walk_all_lower_dev(dev, switchdev_lower_dev_walk, &priv);
+
+       return switchdev_priv.lower_dev;
+}
+
 static int __switchdev_handle_fdb_event_to_device(struct net_device *dev,
                struct net_device *orig_dev, unsigned long event,
                const struct switchdev_notifier_fdb_info *fdb_info,
@@ -536,13 +557,15 @@ EXPORT_SYMBOL_GPL(switchdev_handle_fdb_event_to_device);
 static int __switchdev_handle_port_obj_add(struct net_device *dev,
                        struct switchdev_notifier_port_obj_info *port_obj_info,
                        bool (*check_cb)(const struct net_device *dev),
+                       bool (*foreign_dev_check_cb)(const struct net_device *dev,
+                                                    const struct net_device *foreign_dev),
                        int (*add_cb)(struct net_device *dev, const void *ctx,
                                      const struct switchdev_obj *obj,
                                      struct netlink_ext_ack *extack))
 {
        struct switchdev_notifier_info *info = &port_obj_info->info;
+       struct net_device *br, *lower_dev;
        struct netlink_ext_ack *extack;
-       struct net_device *lower_dev;
        struct list_head *iter;
        int err = -EOPNOTSUPP;
 
@@ -566,15 +589,42 @@ static int __switchdev_handle_port_obj_add(struct net_device *dev,
                if (netif_is_bridge_master(lower_dev))
                        continue;
 
+               /* When searching for switchdev interfaces that are neighbors
+                * of foreign ones, and @dev is a bridge, do not recurse on the
+                * foreign interface again, it was already visited.
+                */
+               if (foreign_dev_check_cb && !check_cb(lower_dev) &&
+                   !switchdev_lower_dev_find(lower_dev, check_cb, foreign_dev_check_cb))
+                       continue;
+
                err = __switchdev_handle_port_obj_add(lower_dev, port_obj_info,
-                                                     check_cb, add_cb);
+                                                     check_cb, foreign_dev_check_cb,
+                                                     add_cb);
                if (err && err != -EOPNOTSUPP)
                        return err;
        }
 
-       return err;
+       /* Event is neither on a bridge nor a LAG. Check whether it is on an
+        * interface that is in a bridge with us.
+        */
+       if (!foreign_dev_check_cb)
+               return err;
+
+       br = netdev_master_upper_dev_get(dev);
+       if (!br || !netif_is_bridge_master(br))
+               return err;
+
+       if (!switchdev_lower_dev_find(br, check_cb, foreign_dev_check_cb))
+               return err;
+
+       return __switchdev_handle_port_obj_add(br, port_obj_info, check_cb,
+                                              foreign_dev_check_cb, add_cb);
 }
 
+/* Pass through a port object addition, if @dev passes @check_cb, or replicate
+ * it towards all lower interfaces of @dev that pass @check_cb, if @dev is a
+ * bridge or a LAG.
+ */
 int switchdev_handle_port_obj_add(struct net_device *dev,
                        struct switchdev_notifier_port_obj_info *port_obj_info,
                        bool (*check_cb)(const struct net_device *dev),
@@ -585,21 +635,46 @@ int switchdev_handle_port_obj_add(struct net_device *dev,
        int err;
 
        err = __switchdev_handle_port_obj_add(dev, port_obj_info, check_cb,
-                                             add_cb);
+                                             NULL, add_cb);
        if (err == -EOPNOTSUPP)
                err = 0;
        return err;
 }
 EXPORT_SYMBOL_GPL(switchdev_handle_port_obj_add);
 
+/* Same as switchdev_handle_port_obj_add(), except if object is notified on a
+ * @dev that passes @foreign_dev_check_cb, it is replicated towards all devices
+ * that pass @check_cb and are in the same bridge as @dev.
+ */
+int switchdev_handle_port_obj_add_foreign(struct net_device *dev,
+                       struct switchdev_notifier_port_obj_info *port_obj_info,
+                       bool (*check_cb)(const struct net_device *dev),
+                       bool (*foreign_dev_check_cb)(const struct net_device *dev,
+                                                    const struct net_device *foreign_dev),
+                       int (*add_cb)(struct net_device *dev, const void *ctx,
+                                     const struct switchdev_obj *obj,
+                                     struct netlink_ext_ack *extack))
+{
+       int err;
+
+       err = __switchdev_handle_port_obj_add(dev, port_obj_info, check_cb,
+                                             foreign_dev_check_cb, add_cb);
+       if (err == -EOPNOTSUPP)
+               err = 0;
+       return err;
+}
+EXPORT_SYMBOL_GPL(switchdev_handle_port_obj_add_foreign);
+
 static int __switchdev_handle_port_obj_del(struct net_device *dev,
                        struct switchdev_notifier_port_obj_info *port_obj_info,
                        bool (*check_cb)(const struct net_device *dev),
+                       bool (*foreign_dev_check_cb)(const struct net_device *dev,
+                                                    const struct net_device *foreign_dev),
                        int (*del_cb)(struct net_device *dev, const void *ctx,
                                      const struct switchdev_obj *obj))
 {
        struct switchdev_notifier_info *info = &port_obj_info->info;
-       struct net_device *lower_dev;
+       struct net_device *br, *lower_dev;
        struct list_head *iter;
        int err = -EOPNOTSUPP;
 
@@ -621,15 +696,42 @@ static int __switchdev_handle_port_obj_del(struct net_device *dev,
                if (netif_is_bridge_master(lower_dev))
                        continue;
 
+               /* When searching for switchdev interfaces that are neighbors
+                * of foreign ones, and @dev is a bridge, do not recurse on the
+                * foreign interface again, it was already visited.
+                */
+               if (foreign_dev_check_cb && !check_cb(lower_dev) &&
+                   !switchdev_lower_dev_find(lower_dev, check_cb, foreign_dev_check_cb))
+                       continue;
+
                err = __switchdev_handle_port_obj_del(lower_dev, port_obj_info,
-                                                     check_cb, del_cb);
+                                                     check_cb, foreign_dev_check_cb,
+                                                     del_cb);
                if (err && err != -EOPNOTSUPP)
                        return err;
        }
 
-       return err;
+       /* Event is neither on a bridge nor a LAG. Check whether it is on an
+        * interface that is in a bridge with us.
+        */
+       if (!foreign_dev_check_cb)
+               return err;
+
+       br = netdev_master_upper_dev_get(dev);
+       if (!br || !netif_is_bridge_master(br))
+               return err;
+
+       if (!switchdev_lower_dev_find(br, check_cb, foreign_dev_check_cb))
+               return err;
+
+       return __switchdev_handle_port_obj_del(br, port_obj_info, check_cb,
+                                              foreign_dev_check_cb, del_cb);
 }
 
+/* Pass through a port object deletion, if @dev passes @check_cb, or replicate
+ * it towards all lower interfaces of @dev that pass @check_cb, if @dev is a
+ * bridge or a LAG.
+ */
 int switchdev_handle_port_obj_del(struct net_device *dev,
                        struct switchdev_notifier_port_obj_info *port_obj_info,
                        bool (*check_cb)(const struct net_device *dev),
@@ -639,13 +741,35 @@ int switchdev_handle_port_obj_del(struct net_device *dev,
        int err;
 
        err = __switchdev_handle_port_obj_del(dev, port_obj_info, check_cb,
-                                             del_cb);
+                                             NULL, del_cb);
        if (err == -EOPNOTSUPP)
                err = 0;
        return err;
 }
 EXPORT_SYMBOL_GPL(switchdev_handle_port_obj_del);
 
+/* Same as switchdev_handle_port_obj_del(), except if object is notified on a
+ * @dev that passes @foreign_dev_check_cb, it is replicated towards all devices
+ * that pass @check_cb and are in the same bridge as @dev.
+ */
+int switchdev_handle_port_obj_del_foreign(struct net_device *dev,
+                       struct switchdev_notifier_port_obj_info *port_obj_info,
+                       bool (*check_cb)(const struct net_device *dev),
+                       bool (*foreign_dev_check_cb)(const struct net_device *dev,
+                                                    const struct net_device *foreign_dev),
+                       int (*del_cb)(struct net_device *dev, const void *ctx,
+                                     const struct switchdev_obj *obj))
+{
+       int err;
+
+       err = __switchdev_handle_port_obj_del(dev, port_obj_info, check_cb,
+                                             foreign_dev_check_cb, del_cb);
+       if (err == -EOPNOTSUPP)
+               err = 0;
+       return err;
+}
+EXPORT_SYMBOL_GPL(switchdev_handle_port_obj_del_foreign);
+
 static int __switchdev_handle_port_attr_set(struct net_device *dev,
                        struct switchdev_notifier_port_attr_info *port_attr_info,
                        bool (*check_cb)(const struct net_device *dev),