net: dsa: provide an option for drivers to always receive bridge VLANs

DSA assumes that a bridge which has vlan filtering disabled is not
vlan aware, and ignores all vlan configuration. However, the kernel
software bridge code allows configuration in this state.

This causes the kernel's idea of the bridge vlan state and the
hardware state to disagree, so "bridge vlan show" indicates a correct
configuration but the hardware lacks all configuration. Even worse,
enabling vlan filtering on a DSA bridge immediately blocks all traffic
which, given the output of "bridge vlan show", is very confusing.

Provide an option that drivers can set to indicate they want to receive
vlan configuration even when vlan filtering is disabled. At the very
least, this is safe for Marvell DSA bridges, which do not look up
ingress traffic in the VTU if the port is in 8021Q disabled state. It is
also safe for the Ocelot switch family. Whether this change is suitable
for all DSA bridges is not known.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
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/include/net/dsa.h b/include/net/dsa.h
index 312c2f067e65c7f2fb80ca0d8895fe47d12425e4..50389772c5979c480e6bfe0b2d883e6a1b60ad9d 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -282,6 +282,13 @@ struct dsa_switch {
         */
        bool                    vlan_filtering_is_global;
 
+       /* Pass .port_vlan_add and .port_vlan_del to drivers even for bridges
+        * that have vlan_filtering=0. All drivers should ideally set this (and
+        * then the option would get removed), but it is unknown whether this
+        * would break things or not.
+        */
+       bool                    configure_vlan_while_not_filtering;
+
        /* In case vlan_filtering_is_global is set, the VLAN awareness state
         * should be retrieved from here and not from the per-port settings.
         */

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index a1a0ae2420127913097b0872af6cf3a4dcd9f3ff..adecf73bd6080f9af95f96d5050d04a4f2ced61e 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -138,6 +138,7 @@ int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br);
 void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br);
 int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering,
                            struct switchdev_trans *trans);
+bool dsa_port_skip_vlan_configuration(struct dsa_port *dp);
 int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock,
                         struct switchdev_trans *trans);
 int dsa_port_mtu_change(struct dsa_port *dp, int new_mtu,

diff --git a/net/dsa/port.c b/net/dsa/port.c
index ebc8d6cbd1d457dd6082987f15df3a1ce3b390bc..e23ece229c7ed6c3184a304d5b7d873b7309c55d 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -257,6 +257,20 @@ int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering,
        return 0;
 }
 
+/* This enforces legacy behavior for switch drivers which assume they can't
+ * receive VLAN configuration when enslaved to a bridge with vlan_filtering=0
+ */
+bool dsa_port_skip_vlan_configuration(struct dsa_port *dp)
+{
+       struct dsa_switch *ds = dp->ds;
+
+       if (!dp->bridge_dev)
+               return false;
+
+       return (!ds->configure_vlan_while_not_filtering &&
+               !br_vlan_enabled(dp->bridge_dev));
+}
+
 int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock,
                         struct switchdev_trans *trans)
 {

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 61b0de52040aa3da120b490c0e161d2dc209942f..886490fb203d31e1312b0cd3deab9a2923ba6a68 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -314,7 +314,7 @@ static int dsa_slave_vlan_add(struct net_device *dev,
        if (obj->orig_dev != dev)
                return -EOPNOTSUPP;
 
-       if (dp->bridge_dev && !br_vlan_enabled(dp->bridge_dev))
+       if (dsa_port_skip_vlan_configuration(dp))
                return 0;
 
        vlan = *SWITCHDEV_OBJ_PORT_VLAN(obj);
@@ -381,7 +381,7 @@ static int dsa_slave_vlan_del(struct net_device *dev,
        if (obj->orig_dev != dev)
                return -EOPNOTSUPP;
 
-       if (dp->bridge_dev && !br_vlan_enabled(dp->bridge_dev))
+       if (dsa_port_skip_vlan_configuration(dp))
                return 0;
 
        /* Do not deprogram the CPU port as it may be shared with other user
@@ -1240,7 +1240,7 @@ static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto,
         * need to emulate the switchdev prepare + commit phase.
         */
        if (dp->bridge_dev) {
-               if (!br_vlan_enabled(dp->bridge_dev))
+               if (dsa_port_skip_vlan_configuration(dp))
                        return 0;
 
                /* br_vlan_get_info() returns -EINVAL or -ENOENT if the
@@ -1274,7 +1274,7 @@ static int dsa_slave_vlan_rx_kill_vid(struct net_device *dev, __be16 proto,
         * need to emulate the switchdev prepare + commit phase.
         */
        if (dp->bridge_dev) {
-               if (!br_vlan_enabled(dp->bridge_dev))
+               if (dsa_port_skip_vlan_configuration(dp))
                        return 0;
 
                /* br_vlan_get_info() returns -EINVAL or -ENOENT if the