| Message ID | 1545274771-22589-1-git-send-email-Tristram.Ha@microchip.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v1,net] net: dsa: microchip: fix unicast frame leak | expand |
On 12/19/18 6:59 PM, Tristram.Ha@microchip.com wrote: > From: Tristram Ha <Tristram.Ha@microchip.com> > > Port partitioning is done by enabling UNICAST_VLAN_BOUNDARY and changing > the default port membership of 0x7f to other values such that there is > no communication between ports. In KSZ9477 the member for port 1 is > 0x41; port 2, 0x42; port 3, 0x44; port 4, 0x48; port 5, 0x50; and port 7, > 0x60. Port 6 is the host port. > > Setting a zero value can be used to stop port from receiving. > > However, when UNICAST_VLAN_BOUNDARY is disabled and the unicast addresses > are already learned in the dynamic MAC table, setting zero still allows > devices connected to those ports to communicate. This does not apply to > multicast and broadcast addresses though. To prevent these leaks and > make the function of port membership consistent UNICAST_VLAN_BOUNDARY > should never be disabled. > > Note that UNICAST_VLAN_BOUNDARY is enabled by default in KSZ9477. > > Fixes: b987e98e50ab90e5 ("dsa: add DSA switch driver for Microchip KSZ9477") > Signed-off-by: Tristram Ha <Tristram.Ha@microchip.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Thanks Tristram, much clearer!
From: <Tristram.Ha@microchip.com> Date: Wed, 19 Dec 2018 18:59:31 -0800 > From: Tristram Ha <Tristram.Ha@microchip.com> > > Port partitioning is done by enabling UNICAST_VLAN_BOUNDARY and changing > the default port membership of 0x7f to other values such that there is > no communication between ports. In KSZ9477 the member for port 1 is > 0x41; port 2, 0x42; port 3, 0x44; port 4, 0x48; port 5, 0x50; and port 7, > 0x60. Port 6 is the host port. > > Setting a zero value can be used to stop port from receiving. > > However, when UNICAST_VLAN_BOUNDARY is disabled and the unicast addresses > are already learned in the dynamic MAC table, setting zero still allows > devices connected to those ports to communicate. This does not apply to > multicast and broadcast addresses though. To prevent these leaks and > make the function of port membership consistent UNICAST_VLAN_BOUNDARY > should never be disabled. > > Note that UNICAST_VLAN_BOUNDARY is enabled by default in KSZ9477. > > Fixes: b987e98e50ab90e5 ("dsa: add DSA switch driver for Microchip KSZ9477") > Signed-off-by: Tristram Ha <Tristram.Ha@microchip.com> > --- > v1 > - Fix only UNICAST_VLAN_BOUNDARY issue > - Describe what UNICAST_VLAN_BOUNDARY does > > drivers/net/dsa/microchip/ksz9477.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) This file only exists in net-next, so that's where I have applied this. The commit in the Fixes tag is from much earlier than what is in 'net' which seems to suggest that code has been moved around and we need another version of this fix for 'net' and optionally -stable. Thanks.
diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c index 57a146a..89ed059 100644 --- a/drivers/net/dsa/microchip/ksz9477.c +++ b/drivers/net/dsa/microchip/ksz9477.c @@ -500,13 +500,9 @@ static int ksz9477_port_vlan_filtering(struct dsa_switch *ds, int port, if (flag) { ksz_port_cfg(dev, port, REG_PORT_LUE_CTRL, PORT_VLAN_LOOKUP_VID_0, true); - ksz9477_cfg32(dev, REG_SW_QM_CTRL__4, UNICAST_VLAN_BOUNDARY, - true); ksz_cfg(dev, REG_SW_LUE_CTRL_0, SW_VLAN_ENABLE, true); } else { ksz_cfg(dev, REG_SW_LUE_CTRL_0, SW_VLAN_ENABLE, false); - ksz9477_cfg32(dev, REG_SW_QM_CTRL__4, UNICAST_VLAN_BOUNDARY, - false); ksz_port_cfg(dev, port, REG_PORT_LUE_CTRL, PORT_VLAN_LOOKUP_VID_0, false); } @@ -1130,6 +1126,10 @@ static int ksz9477_setup(struct dsa_switch *ds) return ret; } + /* Required for port partitioning. */ + ksz9477_cfg32(dev, REG_SW_QM_CTRL__4, UNICAST_VLAN_BOUNDARY, + true); + /* accept packet up to 2000bytes */ ksz_cfg(dev, REG_SW_MAC_CTRL_1, SW_LEGAL_PACKET_DISABLE, true);