net: mscc: ocelot: move the logic to drop 802.1p traffic to the pvid deletion

Currently, the ocelot_port_set_native_vlan() function starts dropping
untagged and prio-tagged traffic when the native VLAN is removed?

What is the native VLAN? It is the only egress-untagged VLAN that ocelot
supports on a port. If the port is a trunk with 100 VLANs, one of those
VLANs can be transmitted as egress-untagged, and that's the native VLAN.

Is it wrong to drop untagged and prio-tagged traffic if there's no
native VLAN? Yes and no.

In this case, which is more typical, it's ok to apply that drop
configuration:
$ bridge vlan add dev swp0 vid 1 pvid untagged <- this is the native VLAN
$ bridge vlan add dev swp0 vid 100
$ bridge vlan add dev swp0 vid 101
$ bridge vlan del dev swp0 vid 1 <- delete the native VLAN
But only because the pvid and the native VLAN have the same ID.

In this case, it isn't:
$ bridge vlan add dev swp0 vid 1 pvid
$ bridge vlan add dev swp0 vid 100 untagged <- this is the native VLAN
$ bridge vlan del dev swp0 vid 101
$ bridge vlan del dev swp0 vid 100 <- delete the native VLAN

It's wrong, because the switch will drop untagged and prio-tagged
traffic now, despite having a valid pvid of 1.

The confusion seems to stem from the fact that the native VLAN is an
egress setting, while the PVID is an ingress setting. It would be
correct to drop untagged and prio-tagged traffic only if there was no
pvid on the port. So let's do just that.

Background:
https://lore.kernel.org/netdev/CA+h21hrRMrLH-RjBGhEJSTZd6_QPRSd3RkVRQF-wNKkrgKcRSA@mail.gmail.com/#t

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index d49e34430e235566a3ee5a4d05c7a5c026d7b48b..60186fc99280eea0dc4fe72674d1f7adf48a3e20 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -168,19 +168,6 @@ static int ocelot_port_set_native_vlan(struct ocelot *ocelot, int port,
                       REW_PORT_VLAN_CFG_PORT_VID_M,
                       REW_PORT_VLAN_CFG, port);
 
-       if (ocelot_port->vlan_aware && !ocelot_port->native_vlan.valid)
-               /* If port is vlan-aware and tagged, drop untagged and priority
-                * tagged frames.
-                */
-               val = ANA_PORT_DROP_CFG_DROP_UNTAGGED_ENA |
-                     ANA_PORT_DROP_CFG_DROP_PRIO_S_TAGGED_ENA |
-                     ANA_PORT_DROP_CFG_DROP_PRIO_C_TAGGED_ENA;
-       ocelot_rmw_gix(ocelot, val,
-                      ANA_PORT_DROP_CFG_DROP_UNTAGGED_ENA |
-                      ANA_PORT_DROP_CFG_DROP_PRIO_S_TAGGED_ENA |
-                      ANA_PORT_DROP_CFG_DROP_PRIO_C_TAGGED_ENA,
-                      ANA_PORT_DROP_CFG, port);
-
        if (ocelot_port->vlan_aware) {
                if (native_vlan.valid)
                        /* Tag all frames except when VID == DEFAULT_VLAN */
@@ -204,6 +191,7 @@ static void ocelot_port_set_pvid(struct ocelot *ocelot, int port,
                                 struct ocelot_vlan pvid_vlan)
 {
        struct ocelot_port *ocelot_port = ocelot->ports[port];
+       u32 val = 0;
 
        ocelot_port->pvid_vlan = pvid_vlan;
 
@@ -214,6 +202,20 @@ static void ocelot_port_set_pvid(struct ocelot *ocelot, int port,
                       ANA_PORT_VLAN_CFG_VLAN_VID(pvid_vlan.vid),
                       ANA_PORT_VLAN_CFG_VLAN_VID_M,
                       ANA_PORT_VLAN_CFG, port);
+
+       /* If there's no pvid, we should drop not only untagged traffic (which
+        * happens automatically), but also 802.1p traffic which gets
+        * classified to VLAN 0, but that is always in our RX filter, so it
+        * would get accepted were it not for this setting.
+        */
+       if (!pvid_vlan.valid && ocelot_port->vlan_aware)
+               val = ANA_PORT_DROP_CFG_DROP_PRIO_S_TAGGED_ENA |
+                     ANA_PORT_DROP_CFG_DROP_PRIO_C_TAGGED_ENA;
+
+       ocelot_rmw_gix(ocelot, val,
+                      ANA_PORT_DROP_CFG_DROP_PRIO_S_TAGGED_ENA |
+                      ANA_PORT_DROP_CFG_DROP_PRIO_C_TAGGED_ENA,
+                      ANA_PORT_DROP_CFG, port);
 }
 
 int ocelot_port_vlan_filtering(struct ocelot *ocelot, int port,
@@ -303,6 +305,13 @@ int ocelot_vlan_del(struct ocelot *ocelot, int port, u16 vid)
        if (ret)
                return ret;
 
+       /* Ingress */
+       if (ocelot_port->pvid_vlan.vid == vid) {
+               struct ocelot_vlan pvid_vlan = {0};
+
+               ocelot_port_set_pvid(ocelot, port, pvid_vlan);
+       }
+
        /* Egress */
        if (ocelot_port->native_vlan.vid == vid) {
                struct ocelot_vlan native_vlan = {0};