net: dsa: convert check for 802.1Q upper when bridged into PRECHANGEUPPER

DSA tries to prevent having a VLAN added by a bridge and by an 802.1Q
upper at the same time. It does that by checking the VID in
.ndo_vlan_rx_add_vid(), since that's something that the 8021q module
calls, via vlan_vid_add(). When a VLAN matches in both subsystems, this
check returns -EBUSY.

However the vlan_vid_add() function isn't specific to the 8021q module
in any way at all. It is simply the kernel's way to tell an interface to
add a VLAN to its RX filter and not drop that VLAN. So there's no reason
to return -EBUSY when somebody tries to call vlan_vid_add() for a VLAN
that was installed by the bridge. The proper behavior is to accept that
configuration.

So what's wrong is how DSA checks that it has an 8021q upper. It should
look at the actual uppers for that, not just assume that the 8021q
module was somewhere in the call stack of .ndo_vlan_rx_add_vid().

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 8ad5bf4..43763b2 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1240,26 +1240,9 @@ static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto,
                /* This API only allows programming tagged, non-PVID VIDs */
                .flags = 0,
        };
-       struct bridge_vlan_info info;
        struct switchdev_trans trans;
        int ret;
 
-       /* Check for a possible bridge VLAN entry now since there is no
-        * need to emulate the switchdev prepare + commit phase.
-        */
-       if (dp->bridge_dev) {
-               if (dsa_port_skip_vlan_configuration(dp))
-                       return 0;
-
-               /* br_vlan_get_info() returns -EINVAL or -ENOENT if the
-                * device, respectively the VID is not found, returning
-                * 0 means success, which is a failure for us here.
-                */
-               ret = br_vlan_get_info(dp->bridge_dev, vid, &info);
-               if (ret == 0)
-                       return -EBUSY;
-       }
-
        /* User port... */
        trans.ph_prepare = true;
        ret = dsa_port_vlan_add(dp, &vlan, &trans);
@@ -1295,24 +1278,6 @@ static int dsa_slave_vlan_rx_kill_vid(struct net_device *dev, __be16 proto,
                /* This API only allows programming tagged, non-PVID VIDs */
                .flags = 0,
        };
-       struct bridge_vlan_info info;
-       int ret;
-
-       /* Check for a possible bridge VLAN entry now since there is no
-        * need to emulate the switchdev prepare + commit phase.
-        */
-       if (dp->bridge_dev) {
-               if (dsa_port_skip_vlan_configuration(dp))
-                       return 0;
-
-               /* br_vlan_get_info() returns -EINVAL or -ENOENT if the
-                * device, respectively the VID is not found, returning
-                * 0 means success, which is a failure for us here.
-                */
-               ret = br_vlan_get_info(dp->bridge_dev, vid, &info);
-               if (ret == 0)
-                       return -EBUSY;
-       }
 
        /* Do not deprogram the CPU port as it may be shared with other user
         * ports which can be members of this VLAN as well.
@@ -1927,16 +1892,53 @@ dsa_prevent_bridging_8021q_upper(struct net_device *dev,
        return NOTIFY_DONE;
 }
 
+static int
+dsa_slave_check_8021q_upper(struct net_device *dev,
+                           struct netdev_notifier_changeupper_info *info)
+{
+       struct dsa_port *dp = dsa_slave_to_port(dev);
+       struct net_device *br = dp->bridge_dev;
+       struct bridge_vlan_info br_info;
+       struct netlink_ext_ack *extack;
+       int err = NOTIFY_DONE;
+       u16 vid;
+
+       if (!br)
+               return NOTIFY_DONE;
+
+       extack = netdev_notifier_info_to_extack(&info->info);
+       vid = vlan_dev_vlan_id(info->upper_dev);
+
+       /* br_vlan_get_info() returns -EINVAL or -ENOENT if the
+        * device, respectively the VID is not found, returning
+        * 0 means success, which is a failure for us here.
+        */
+       err = br_vlan_get_info(br, vid, &br_info);
+       if (err == 0) {
+               NL_SET_ERR_MSG_MOD(extack,
+                                  "This VLAN is already configured by the bridge");
+               return notifier_from_errno(-EBUSY);
+       }
+
+       return NOTIFY_DONE;
+}
+
 static int dsa_slave_netdevice_event(struct notifier_block *nb,
                                     unsigned long event, void *ptr)
 {
        struct net_device *dev = netdev_notifier_info_to_dev(ptr);
 
        switch (event) {
-       case NETDEV_PRECHANGEUPPER:
+       case NETDEV_PRECHANGEUPPER: {
+               struct netdev_notifier_changeupper_info *info = ptr;
+
                if (!dsa_slave_dev_check(dev))
                        return dsa_prevent_bridging_8021q_upper(dev, ptr);
+
+               if (is_vlan_dev(info->upper_dev))
+                       return dsa_slave_check_8021q_upper(dev, ptr);
                break;
+       }
        case NETDEV_CHANGEUPPER:
                if (!dsa_slave_dev_check(dev))
                        return NOTIFY_DONE;