VLAN fixes for Ocelot switch
Subsystems (3)
cover VLAN fixes for Ocelot switch
This series addresses 2 issues with vlan_filtering=1:
- Untagged traffic gets dropped unless commands are run in a very specific order.
- Untagged traffic starts being transmitted as tagged after adding another untagged VID on the port.
Tested on NXP LS1028A-RDB board.
Vladimir Oltean (2):
net: mscc: ocelot: fix vlan_filtering when enslaving to bridge before
link is up
net: mscc: ocelot: refuse to overwrite the port's native vlan
drivers/net/ethernet/mscc/ocelot.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 net: mscc: ocelot: fix vlan_filtering when enslaving to bridge before link is up
Background information: the driver operates the hardware in a mode where a single VLAN can be transmitted as untagged on a particular egress port. That is the "native VLAN on trunk port" use case. Its value is held in port->vid.
Consider the following command sequence (no network manager, all interfaces are down, debugging prints added by me):
$ ip link add dev br0 type bridge vlan_filtering 1 $ ip link set dev swp0 master br0
Kernel code path during last command:
br_add_slave -> ocelot_netdevice_port_event (NETDEV_CHANGEUPPER):
[ 21.401901] ocelot_vlan_port_apply: port 0 vlan aware 0 pvid 0 vid 0
br_add_slave -> nbp_vlan_init -> switchdev_port_attr_set -> ocelot_port_attr_set (SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING):
[ 21.413335] ocelot_vlan_port_apply: port 0 vlan aware 1 pvid 0 vid 0
br_add_slave -> nbp_vlan_init -> nbp_vlan_add -> br_switchdev_port_vlan_add -> switchdev_port_obj_add -> ocelot_port_obj_add -> ocelot_vlan_vid_add
[ 21.667421] ocelot_vlan_port_apply: port 0 vlan aware 1 pvid 1 vid 1
So far so good. The bridge has replaced the driver's default pvid used in standalone mode (0) with its own default_pvid (1). The port's vid (native VLAN) has also changed from 0 to 1.
$ ip link set dev swp0 up
[ 31.722956] 8021q: adding VLAN 0 to HW filter on device swp0 do_setlink -> dev_change_flags -> vlan_vid_add -> ocelot_vlan_rx_add_vid -> ocelot_vlan_vid_add: [ 31.728700] ocelot_vlan_port_apply: port 0 vlan aware 1 pvid 1 vid 0
The 8021q module uses the .ndo_vlan_rx_add_vid API on .ndo_open to make ports be able to transmit and receive 802.1p-tagged traffic by default. This API is supposed to offload a VLAN sub-interface, which for a switch port means to add a VLAN that is not a pvid, and tagged on egress.
But the driver implementation of .ndo_vlan_rx_add_vid is wrong: it adds back vid 0 as "egress untagged". Now back to the initial paragraph:
there is a single untagged VID that the driver keeps track of, and that has just changed from 1 (the pvid) to 0. So this breaks the bridge core's expectation, because it has changed vid 1 from untagged to tagged, when what the user sees is.
$ bridge vlan port vlan ids swp0 1 PVID Egress Untagged
br0 1 PVID Egress Untagged
But curiously, instead of manifesting itself as "untagged and pvid-tagged traffic gets sent as tagged on egress", the bug:
- is hidden when vlan_filtering=0
- manifests as dropped traffic when vlan_filtering=1, due to this setting:
if (port->vlan_aware && !port->vid) /* 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;
which would have made sense if it weren't for this bug. The setting's intention was "this is a trunk port with no native VLAN, so don't accept untagged traffic". So the driver was never expecting to set VLAN 0 as the value of the native VLAN, 0 was just encoding for "invalid".
So the fix is to not send 802.1p traffic as untagged, because that would change the port's native vlan to 0, unbeknownst to the bridge, and trigger unexpected code paths in the driver.
--- drivers/net/ethernet/mscc/ocelot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mscc/ocelot.c +1 -1
@@ -915,7 +915,7 @@ static int ocelot_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,static int ocelot_vlan_rx_add_vid (struct net_device *dev,__be16 proto,u16 vid) { -return ocelot_vlan_vid_add (dev, vid, false, true); +return ocelot_vlan_vid_add (dev, vid, false, false); } static int ocelot_vlan_rx_kill_vid(struct net_device *dev, __be16 proto,
Signature · 1 line
2.17.1
Re: [PATCH net 1/2] net: mscc: ocelot: fix vlan_filtering when enslaving to bridge before link is up
Quoted 69 lines · Vladimir Oltean
Background information: the driver operates the hardware in a mode where a single VLAN can be transmitted as untagged on a particular egress port. That is the "native VLAN on trunk port" use case. Its value is held in
port->vid.Consider the following command sequence (no network manager, all interfaces are down, debugging prints added by me):
$ ip link add dev br0 type bridge vlan_filtering 1 $ ip link set dev swp0 master br0Kernel code path during last command:
br_add_slave->ocelot_netdevice_port_event(NETDEV_CHANGEUPPER):[ 21.401901] ocelot_vlan_port_apply: port 0 vlan aware 0 pvid 0 vid 0
br_add_slave->nbp_vlan_init->switchdev_port_attr_set->ocelot_port_attr_set(SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING):[ 21.413335] ocelot_vlan_port_apply: port 0 vlan aware 1 pvid 0 vid 0
br_add_slave->nbp_vlan_init->nbp_vlan_add->br_switchdev_port_vlan_add->switchdev_port_obj_add->ocelot_port_obj_add->ocelot_vlan_vid_add[ 21.667421] ocelot_vlan_port_apply: port 0 vlan aware 1 pvid 1 vid 1So far so good. The bridge has replaced the driver's default pvid used in standalone mode (0) with its own
default_pvid(1). The port's vid (native VLAN) has also changed from 0 to 1.$ ip link set dev swp0 up[ 31.722956] 8021q: adding VLAN 0 to HW filter on device swp0 do_setlink -> dev_change_flags -> vlan_vid_add -> ocelot_vlan_rx_add_vid -> ocelot_vlan_vid_add: [ 31.728700] ocelot_vlan_port_apply: port 0 vlan aware 1 pvid 1 vid 0The 8021q module uses the .ndo_vlan_rx_add_vid API on .ndo_open to make ports be able to transmit and receive 802.1p-tagged traffic by default. This API is supposed to offload a VLAN sub-interface, which for a switch port means to add a VLAN that is not a pvid, and tagged on egress.
But the driver implementation of .ndo_vlan_rx_add_vid is wrong: it adds back vid 0 as "egress untagged". Now back to the initial paragraph:
there is a single untagged VID that the driver keeps track of, and that has just changed from 1 (the pvid) to 0. So this breaks the bridge core's expectation, because it has changed vid 1 from untagged to tagged, when what the user sees is.$ bridge vlan port vlan ids swp0 1 PVID Egress Untaggedbr0 1 PVID Egress Untagged
But curiously, instead of manifesting itself as "untagged and pvid-tagged traffic gets sent as tagged on egress", the bug:
- is hidden when vlan_filtering=0
- manifests as dropped traffic when vlan_filtering=1, due to this setting:if (port->vlan_aware && !port->vid) /* 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;which would have made sense if it weren't for this bug. The setting's intention was "this is a trunk port with no native VLAN, so don't accept untagged traffic". So the driver was never expecting to set VLAN 0 as the value of the native VLAN, 0 was just encoding for "invalid".
Quoted 8 lines
So the fix is to not send 802.1p traffic as untagged, because that would change the port's native vlan to 0, unbeknownst to the bridge, and trigger unexpected code paths in the driver.
Cc Antoine Tenart <[email protected]>Cc Alexandre Belloni <[email protected]>Fixes 7142529f1688 ("net: mscc: ocelot: add VLAN filtering")Signed-off-by Vladimir Oltean <[email protected]>
Nice explanation, thanks!
Signature · 1 line
Florian
Re: [PATCH net 1/2] net: mscc: ocelot: fix vlan_filtering when enslaving to bridge before link is up
In reply to Vladimir OlteanQuoted 69 lines · Vladimir Oltean
Background information: the driver operates the hardware in a mode where a single VLAN can be transmitted as untagged on a particular egress port. That is the "native VLAN on trunk port" use case. Its value is held in
port->vid.Consider the following command sequence (no network manager, all interfaces are down, debugging prints added by me):
$ ip link add dev br0 type bridge vlan_filtering 1 $ ip link set dev swp0 master br0Kernel code path during last command:
br_add_slave->ocelot_netdevice_port_event(NETDEV_CHANGEUPPER):[ 21.401901] ocelot_vlan_port_apply: port 0 vlan aware 0 pvid 0 vid 0
br_add_slave->nbp_vlan_init->switchdev_port_attr_set->ocelot_port_attr_set(SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING):[ 21.413335] ocelot_vlan_port_apply: port 0 vlan aware 1 pvid 0 vid 0
br_add_slave->nbp_vlan_init->nbp_vlan_add->br_switchdev_port_vlan_add->switchdev_port_obj_add->ocelot_port_obj_add->ocelot_vlan_vid_add[ 21.667421] ocelot_vlan_port_apply: port 0 vlan aware 1 pvid 1 vid 1So far so good. The bridge has replaced the driver's default pvid used in standalone mode (0) with its own
default_pvid(1). The port's vid (native VLAN) has also changed from 0 to 1.$ ip link set dev swp0 up[ 31.722956] 8021q: adding VLAN 0 to HW filter on device swp0 do_setlink -> dev_change_flags -> vlan_vid_add -> ocelot_vlan_rx_add_vid -> ocelot_vlan_vid_add: [ 31.728700] ocelot_vlan_port_apply: port 0 vlan aware 1 pvid 1 vid 0The 8021q module uses the .ndo_vlan_rx_add_vid API on .ndo_open to make ports be able to transmit and receive 802.1p-tagged traffic by default. This API is supposed to offload a VLAN sub-interface, which for a switch port means to add a VLAN that is not a pvid, and tagged on egress.
But the driver implementation of .ndo_vlan_rx_add_vid is wrong: it adds back vid 0 as "egress untagged". Now back to the initial paragraph:
there is a single untagged VID that the driver keeps track of, and that has just changed from 1 (the pvid) to 0. So this breaks the bridge core's expectation, because it has changed vid 1 from untagged to tagged, when what the user sees is.$ bridge vlan port vlan ids swp0 1 PVID Egress Untaggedbr0 1 PVID Egress Untagged
But curiously, instead of manifesting itself as "untagged and pvid-tagged traffic gets sent as tagged on egress", the bug:
- is hidden when vlan_filtering=0
- manifests as dropped traffic when vlan_filtering=1, due to this setting:if (port->vlan_aware && !port->vid) /* 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;which would have made sense if it weren't for this bug. The setting's intention was "this is a trunk port with no native VLAN, so don't accept untagged traffic". So the driver was never expecting to set VLAN 0 as the value of the native VLAN, 0 was just encoding for "invalid".
Quoted 8 lines
So the fix is to not send 802.1p traffic as untagged, because that would change the port's native vlan to 0, unbeknownst to the bridge, and trigger unexpected code paths in the driver.
Cc Antoine Tenart <[email protected]>Cc Alexandre Belloni <[email protected]>Fixes 7142529f1688 ("net: mscc: ocelot: add VLAN filtering")Signed-off-by Vladimir Oltean <[email protected]>
Quoted 20 lines
--- drivers/net/ethernet/mscc/ocelot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ethernet/mscc/ocelot.c +1
-1@@ -915,7 +915,7 @@ static int ocelot_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,static int ocelot_vlan_rx_add_vid (struct net_device *dev,__be16 proto,u16 vid) { -return ocelot_vlan_vid_add (dev, vid, false, true); +return ocelot_vlan_vid_add (dev, vid, false, false); } static int ocelot_vlan_rx_kill_vid(struct net_device *dev, __be16 proto,Signature · 1 line
2.17.1
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [PATCH net 1/2] net: mscc: ocelot: fix vlan_filtering when enslaving to bridge before link is up
In reply to Vladimir OlteanQuoted 69 lines · Vladimir Oltean
Background information: the driver operates the hardware in a mode where a single VLAN can be transmitted as untagged on a particular egress port. That is the "native VLAN on trunk port" use case. Its value is held in
port->vid.Consider the following command sequence (no network manager, all interfaces are down, debugging prints added by me):
$ ip link add dev br0 type bridge vlan_filtering 1 $ ip link set dev swp0 master br0Kernel code path during last command:
br_add_slave->ocelot_netdevice_port_event(NETDEV_CHANGEUPPER):[ 21.401901] ocelot_vlan_port_apply: port 0 vlan aware 0 pvid 0 vid 0
br_add_slave->nbp_vlan_init->switchdev_port_attr_set->ocelot_port_attr_set(SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING):[ 21.413335] ocelot_vlan_port_apply: port 0 vlan aware 1 pvid 0 vid 0
br_add_slave->nbp_vlan_init->nbp_vlan_add->br_switchdev_port_vlan_add->switchdev_port_obj_add->ocelot_port_obj_add->ocelot_vlan_vid_add[ 21.667421] ocelot_vlan_port_apply: port 0 vlan aware 1 pvid 1 vid 1So far so good. The bridge has replaced the driver's default pvid used in standalone mode (0) with its own
default_pvid(1). The port's vid (native VLAN) has also changed from 0 to 1.$ ip link set dev swp0 up[ 31.722956] 8021q: adding VLAN 0 to HW filter on device swp0 do_setlink -> dev_change_flags -> vlan_vid_add -> ocelot_vlan_rx_add_vid -> ocelot_vlan_vid_add: [ 31.728700] ocelot_vlan_port_apply: port 0 vlan aware 1 pvid 1 vid 0The 8021q module uses the .ndo_vlan_rx_add_vid API on .ndo_open to make ports be able to transmit and receive 802.1p-tagged traffic by default. This API is supposed to offload a VLAN sub-interface, which for a switch port means to add a VLAN that is not a pvid, and tagged on egress.
But the driver implementation of .ndo_vlan_rx_add_vid is wrong: it adds back vid 0 as "egress untagged". Now back to the initial paragraph:
there is a single untagged VID that the driver keeps track of, and that has just changed from 1 (the pvid) to 0. So this breaks the bridge core's expectation, because it has changed vid 1 from untagged to tagged, when what the user sees is.$ bridge vlan port vlan ids swp0 1 PVID Egress Untaggedbr0 1 PVID Egress Untagged
But curiously, instead of manifesting itself as "untagged and pvid-tagged traffic gets sent as tagged on egress", the bug:
- is hidden when vlan_filtering=0
- manifests as dropped traffic when vlan_filtering=1, due to this setting:if (port->vlan_aware && !port->vid) /* 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;which would have made sense if it weren't for this bug. The setting's intention was "this is a trunk port with no native VLAN, so don't accept untagged traffic". So the driver was never expecting to set VLAN 0 as the value of the native VLAN, 0 was just encoding for "invalid".
Quoted 8 lines
So the fix is to not send 802.1p traffic as untagged, because that would change the port's native vlan to 0, unbeknownst to the bridge, and trigger unexpected code paths in the driver.
Cc Antoine Tenart <[email protected]>Cc Alexandre Belloni <[email protected]>Fixes 7142529f1688 ("net: mscc: ocelot: add VLAN filtering")Signed-off-by Vladimir Oltean <[email protected]>
Quoted 20 lines
--- drivers/net/ethernet/mscc/ocelot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ethernet/mscc/ocelot.c +1
-1@@ -915,7 +915,7 @@ static int ocelot_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,static int ocelot_vlan_rx_add_vid (struct net_device *dev,__be16 proto,u16 vid) { -return ocelot_vlan_vid_add (dev, vid, false, true); +return ocelot_vlan_vid_add (dev, vid, false, false); } static int ocelot_vlan_rx_kill_vid(struct net_device *dev, __be16 proto,Signature · 1 line
2.17.1
Signature · 1 line
/Horatiu
PATCH 2/2 net: mscc: ocelot: refuse to overwrite the port's native vlan
In reply to Vladimir OlteanThe switch driver keeps a "vid" variable per port, which signifies _the_ VLAN ID that is stripped on that port's egress (aka the native VLAN on a trunk port).
That is the way the hardware is designed (mostly). The port->vid is programmed into REW:PORT:PORT_VLAN_CFG:PORT_VID and the rewriter is told to send all traffic as tagged except the one having port->vid.
There exists a possibility of finer-grained egress untagging decisions:
using the VCAP IS1 engine, one rule can be added to match every VLAN-tagged frame whose VLAN should be untagged, and set POP_CNT=1 as action. However, the IS1 can hold at most 512 entries, and the VLANs are in the order of 6 * 4096.
So the code is fine for now. But this sequence of commands:
$ bridge vlan add dev swp0 vid 1 pvid untagged $ bridge vlan add dev swp0 vid 2 untagged
makes untagged and pvid-tagged traffic be sent out of swp0 as tagged with VID 1, despite user's request.
Prevent that from happening. The user should temporarily remove the existing untagged VLAN (1 in this case), add it back as tagged, and then add the new untagged VLAN (2 in this case).
--- drivers/net/ethernet/mscc/ocelot.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/net/ethernet/mscc/ocelot.c +8 -1
@@ -262,8 +262,15 @@ static int ocelot_vlan_vid_add(struct net_device *dev, u16 vid, bool pvid, port->pvid = vid;/* Untagged egress vlan clasification */ -if (untagged) +if (untagged && port->vid != vid) { +if (port->vid) { +dev_err (ocelot->dev, +"Port already has a native VLAN: %d\n" , + port->vid); +return -EBUSY ; + } port->vid = vid; + }ocelot_vlan_port_apply (ocelot, port);
Signature · 1 line
2.17.1
Re: [PATCH net 2/2] net: mscc: ocelot: refuse to overwrite the port's native vlan
Quoted 22 lines · Vladimir Oltean
The switch driver keeps a "vid" variable per port, which signifies _the_ VLAN ID that is stripped on that port's egress (aka the native VLAN on a trunk port).
That is the way the hardware is designed (mostly). The
port->vidis programmed into REW:PORT:PORT_VLAN_CFG:PORT_VID and the rewriter is told to send all traffic as tagged except the one havingport->vid.There exists a possibility of finer-grained egress untagging decisions:
using the VCAP IS1 engine, one rule can be added to match every VLAN-tagged frame whose VLAN should be untagged, and set POP_CNT=1 as action. However, the IS1 can hold at most 512 entries, and the VLANs are in the order of 6 * 4096.So the code is fine for now. But this sequence of commands:
$ bridge vlan add dev swp0 vid 1 pvid untagged $ bridge vlan add dev swp0 vid 2 untaggedmakes untagged and pvid-tagged traffic be sent out of swp0 as tagged with VID 1, despite user's request.
Quoted 7 lines
Prevent that from happening. The user should temporarily remove the existing untagged VLAN (1 in this case), add it back as tagged, and then add the new untagged VLAN (2 in this case).>
Cc Antoine Tenart <[email protected]>Cc Alexandre Belloni <[email protected]>Fixes 7142529f1688 ("net: mscc: ocelot: add VLAN filtering")Signed-off-by Vladimir Oltean <[email protected]>
[snip]
drivers/net/ethernet/mscc/ocelot.c static int ocelot_vlan_vid_add(struct net_device *dev, u16 vid, bool pvid, · line 269
Quoted 5 lines
drivers/net/ethernet/mscc/ocelot.c +5
-0+if (untagged && port->vid != vid) { +if (port->vid) { +dev_err (ocelot->dev, +"Port already has a native VLAN: %d\n" , + port->vid);
This sounds like a extended netlink ack candidate for improving user experience, but this should do for now.
Signature · 1 line
Florian
Re: [PATCH net 2/2] net: mscc: ocelot: refuse to overwrite the port's native vlan
Quoted 34 lines · Florian Fainelli
Quoted 22 lines · Vladimir Oltean
The switch driver keeps a "vid" variable per port, which signifies _the_ VLAN ID that is stripped on that port's egress (aka the native VLAN on a trunk port).
That is the way the hardware is designed (mostly). The
port->vidis programmed into REW:PORT:PORT_VLAN_CFG:PORT_VID and the rewriter is told to send all traffic as tagged except the one havingport->vid.There exists a possibility of finer-grained egress untagging decisions:
using the VCAP IS1 engine, one rule can be added to match every VLAN-tagged frame whose VLAN should be untagged, and set POP_CNT=1 as action. However, the IS1 can hold at most 512 entries, and the VLANs are in the order of 6 * 4096.So the code is fine for now. But this sequence of commands:
$ bridge vlan add dev swp0 vid 1 pvid untagged $ bridge vlan add dev swp0 vid 2 untaggedmakes untagged and pvid-tagged traffic be sent out of swp0 as tagged with VID 1, despite user's request.
Quoted 7 lines
Prevent that from happening. The user should temporarily remove the existing untagged VLAN (1 in this case), add it back as tagged, and then add the new untagged VLAN (2 in this case).>
Cc Antoine Tenart <[email protected]>Cc Alexandre Belloni <[email protected]>Fixes 7142529f1688 ("net: mscc: ocelot: add VLAN filtering")Signed-off-by Vladimir Oltean <[email protected]>
Quoted 2 lines
Reviewed-by Florian Fainelli <[email protected]>
Thanks, Florian.
Quoted 8 lines
[snip]
drivers/net/ethernet/mscc/ocelot.c static int ocelot_vlan_vid_add(struct net_device *dev, u16 vid, bool pvid, · line 269
Quoted 5 lines
drivers/net/ethernet/mscc/ocelot.c +5
-0+if (untagged && port->vid != vid) { +if (port->vid) { +dev_err (ocelot->dev, +"Port already has a native VLAN: %d\n" , + port->vid);
Quoted 4 lines
This sounds like a extended netlink ack candidate for improving user experience, but this should do for now.
--
Florian
I know what you're saying. I wanted to drag in minimal dependencies for the fix. The driver is going to see major rework anyway soon (will gain a DSA front-end), hence the reason why I copied the DSA people to the fixes. Having extack propagate to more drivers is always welcome, and DSA would be a good start to see that being implemented.
Regards,
-Vladimir
Re: [PATCH net 2/2] net: mscc: ocelot: refuse to overwrite the port's native vlan
In reply to Vladimir OlteanQuoted 22 lines · Vladimir Oltean
The switch driver keeps a "vid" variable per port, which signifies _the_ VLAN ID that is stripped on that port's egress (aka the native VLAN on a trunk port).
That is the way the hardware is designed (mostly). The
port->vidis programmed into REW:PORT:PORT_VLAN_CFG:PORT_VID and the rewriter is told to send all traffic as tagged except the one havingport->vid.There exists a possibility of finer-grained egress untagging decisions:
using the VCAP IS1 engine, one rule can be added to match every VLAN-tagged frame whose VLAN should be untagged, and set POP_CNT=1 as action. However, the IS1 can hold at most 512 entries, and the VLANs are in the order of 6 * 4096.So the code is fine for now. But this sequence of commands:
$ bridge vlan add dev swp0 vid 1 pvid untagged $ bridge vlan add dev swp0 vid 2 untaggedmakes untagged and pvid-tagged traffic be sent out of swp0 as tagged with VID 1, despite user's request.
Quoted 8 lines
Prevent that from happening. The user should temporarily remove the existing untagged VLAN (1 in this case), add it back as tagged, and then add the new untagged VLAN (2 in this case).
Cc Antoine Tenart <[email protected]>Cc Alexandre Belloni <[email protected]>Fixes 7142529f1688 ("net: mscc: ocelot: add VLAN filtering")Signed-off-by Vladimir Oltean <[email protected]>
Quoted 28 lines
--- drivers/net/ethernet/mscc/ocelot.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)drivers/net/ethernet/mscc/ocelot.c +8
-1@@ -262,8 +262,15 @@ static int ocelot_vlan_vid_add(struct net_device *dev, u16 vid, bool pvid, port->pvid = vid;/* Untagged egress vlan clasification */ -if (untagged) +if (untagged && port->vid != vid) { +if (port->vid) { +dev_err (ocelot->dev, +"Port already has a native VLAN: %d\n" , + port->vid); +return -EBUSY ; + } port->vid = vid; + }ocelot_vlan_port_apply (ocelot, port);Signature · 1 line
2.17.1
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
David Miller
maintainerFrom: Vladimir Oltean <[email protected]>
Date: Sat, 26 Oct 2019 21:04:25 +0300
Quoted 7 lines
This series addresses 2 issues with vlan_filtering=1:
- Untagged traffic gets dropped unless commands are run in a very specific order.
- Untagged traffic starts being transmitted as tagged after adding another untagged VID on the port.Tested on NXP LS1028A-RDB board.
Series applied, thanks.