Re: [PATCH] net: ethernet: ti: cpsw: fix packet leaking in dual_mac mode
On 05/17/2018 02:10 PM, Greg Kroah-Hartman wrote: On Thu, May 17, 2018 at 11:18:16PM +0530, Naresh Kamboju wrote: On 2 May 2018 at 20:38, David Miller wrote: From: Grygorii Strashko Date: Tue, 1 May 2018 12:41:22 -0500 Signed-off-by: Grygorii Strashko Applied and queued up for -stable, thank you. 4.4 stable-rc build failed for arm32. MACHINE=am57xx-evm Build error log: drivers/net/ethernet/ti/cpsw.c: In function 'cpsw_add_dual_emac_def_ale_entries': drivers/net/ethernet/ti/cpsw.c:1112:23: error: 'cpsw' undeclared (first use in this function) cpsw_ale_control_set(cpsw->ale, slave_port, ^~~~ drivers/net/ethernet/ti/cpsw.c:1112:23: note: each undeclared identifier is reported only once for each function it appears in scripts/Makefile.build:269: recipe for target 'drivers/net/ethernet/ti/cpsw.o' failed make[6]: *** [drivers/net/ethernet/ti/cpsw.o] Error 1 scripts/Makefile.build:476: recipe for target 'drivers/net/ethernet/ti' failed make[5]: *** [drivers/net/ethernet/ti] Error 2 Now dropped, it's nice to see I got 3 reports about this :) Sry, my bad. I've tested till 4.4 if it can be applied without conflicts, but not tested build. -- regards, -grygorii
Re: [PATCH] net: ethernet: ti: cpsw: fix packet leaking in dual_mac mode
On Thu, May 17, 2018 at 11:18:16PM +0530, Naresh Kamboju wrote: > On 2 May 2018 at 20:38, David Miller wrote: > > From: Grygorii Strashko > > Date: Tue, 1 May 2018 12:41:22 -0500 > > >> Signed-off-by: Grygorii Strashko > > > > Applied and queued up for -stable, thank you. > > 4.4 stable-rc build failed for arm32. > MACHINE=am57xx-evm > > Build error log: > > drivers/net/ethernet/ti/cpsw.c: > In function 'cpsw_add_dual_emac_def_ale_entries': > drivers/net/ethernet/ti/cpsw.c:1112:23: > error: 'cpsw' undeclared (first use in this function) >cpsw_ale_control_set(cpsw->ale, slave_port, > ^~~~ > drivers/net/ethernet/ti/cpsw.c:1112:23: note: > each undeclared identifier is reported only once for each function it appears > in > scripts/Makefile.build:269: recipe for target 'drivers/net/ethernet/ti/cpsw.o' > failed > make[6]: *** [drivers/net/ethernet/ti/cpsw.o] Error 1 > scripts/Makefile.build:476: recipe for target 'drivers/net/ethernet/ti' failed > make[5]: *** [drivers/net/ethernet/ti] Error 2 > Now dropped, it's nice to see I got 3 reports about this :) greg k-h
Re: [PATCH] net: ethernet: ti: cpsw: fix packet leaking in dual_mac mode
On 2 May 2018 at 20:38, David Miller wrote: > From: Grygorii Strashko > Date: Tue, 1 May 2018 12:41:22 -0500 >> Signed-off-by: Grygorii Strashko > > Applied and queued up for -stable, thank you. 4.4 stable-rc build failed for arm32. MACHINE=am57xx-evm Build error log: drivers/net/ethernet/ti/cpsw.c: In function 'cpsw_add_dual_emac_def_ale_entries': drivers/net/ethernet/ti/cpsw.c:1112:23: error: 'cpsw' undeclared (first use in this function) cpsw_ale_control_set(cpsw->ale, slave_port, ^~~~ drivers/net/ethernet/ti/cpsw.c:1112:23: note: each undeclared identifier is reported only once for each function it appears in scripts/Makefile.build:269: recipe for target 'drivers/net/ethernet/ti/cpsw.o' failed make[6]: *** [drivers/net/ethernet/ti/cpsw.o] Error 1 scripts/Makefile.build:476: recipe for target 'drivers/net/ethernet/ti' failed make[5]: *** [drivers/net/ethernet/ti] Error 2 Complete log link: https://ci.linaro.org/job/openembedded-lkft-linux-stable-rc-4.4/DISTRO=rpb,MACHINE=am57xx-evm,label=docker-lkft/205/console
Re: [PATCH] net: ethernet: ti: cpsw: fix packet leaking in dual_mac mode
From: Grygorii Strashko Date: Tue, 1 May 2018 12:41:22 -0500 > In dual_mac mode packets arrived on one port should not be forwarded by > switch hw to another port. Only Linux Host can forward packets between > ports. The below test case (reported in [1]) shows that packet arrived on > one port can be leaked to anoter (reproducible with dual port evms): > - connect port 1 (eth0) to linux Host 0 and run tcpdump or Wireshark > - connect port 2 (eth1) to linux Host 1 with vlan 1 configured > - ping from Host 1 through vlan 1 interface. > ARP packets will be seen on Host 0. > > Issue happens because dual_mac mode is implemnted using two vlans: 1 (Port > 1+Port 0) and 2 (Port 2+Port 0), so there are vlan records created for for > each vlan. By default, the ALE will find valid vlan record in its table > when vlan 1 tagged packet arrived on Port 2 and so forwards packet to all > ports which are vlan 1 members (like Port. > > To avoid such behaviorr the ALE VLAN ID Ingress Check need to be enabled > for each external CPSW port (ALE_PORTCTLn.VID_INGRESS_CHECK) so ALE will > drop ingress packets if Rx port is not VLAN member. > > Signed-off-by: Grygorii Strashko Applied and queued up for -stable, thank you.
[PATCH] net: ethernet: ti: cpsw: fix packet leaking in dual_mac mode
In dual_mac mode packets arrived on one port should not be forwarded by switch hw to another port. Only Linux Host can forward packets between ports. The below test case (reported in [1]) shows that packet arrived on one port can be leaked to anoter (reproducible with dual port evms): - connect port 1 (eth0) to linux Host 0 and run tcpdump or Wireshark - connect port 2 (eth1) to linux Host 1 with vlan 1 configured - ping from Host 1 through vlan 1 interface. ARP packets will be seen on Host 0. Issue happens because dual_mac mode is implemnted using two vlans: 1 (Port 1+Port 0) and 2 (Port 2+Port 0), so there are vlan records created for for each vlan. By default, the ALE will find valid vlan record in its table when vlan 1 tagged packet arrived on Port 2 and so forwards packet to all ports which are vlan 1 members (like Port. To avoid such behaviorr the ALE VLAN ID Ingress Check need to be enabled for each external CPSW port (ALE_PORTCTLn.VID_INGRESS_CHECK) so ALE will drop ingress packets if Rx port is not VLAN member. Signed-off-by: Grygorii Strashko --- drivers/net/ethernet/ti/cpsw.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 5047f4b..46500a2 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1340,6 +1340,8 @@ static inline void cpsw_add_dual_emac_def_ale_entries( cpsw_ale_add_ucast(cpsw->ale, priv->mac_addr, HOST_PORT_NUM, ALE_VLAN | ALE_SECURE, slave->port_vlan); + cpsw_ale_control_set(cpsw->ale, slave_port, +ALE_PORT_DROP_UNKNOWN_VLAN, 1); } static void soft_reset_slave(struct cpsw_slave *slave) -- 2.10.5
