Re: [net-next 2/2] net: netcp: ethss: k2g: add promiscuous mode support
Andrew, Thanks for reviewing this! On 04/02/2018 12:47 PM, Andrew Lunn wrote: > On Mon, Apr 02, 2018 at 12:17:19PM -0400, Murali Karicheri wrote: >> +static int gbe_set_rx_mode(void *intf_priv, bool promisc) >> +{ >> +struct gbe_intf *gbe_intf = intf_priv; >> +struct gbe_priv *gbe_dev = gbe_intf->gbe_dev; >> +struct cpsw_ale *ale = gbe_dev->ale; >> +unsigned long timeout; >> +int i, ret = -ETIMEDOUT; >> + >> +/* Disable(1)/Enable(0) Learn for all ports (host is port 0 and >> + * slaves are port 1 and up >> + */ >> +for (i = 0; i <= gbe_dev->num_slaves; i++) { >> +cpsw_ale_control_set(ale, i, >> + ALE_PORT_NOLEARN, !!promisc); >> +cpsw_ale_control_set(ale, i, >> + ALE_PORT_NO_SA_UPDATE, !!promisc); >> +} > > Hi Murali > > Does this mean that in promisc mode, switching of frames between ports > in hardware is disabled? You are relying on the software bridge to > perform such bridging between ports? The K2G switch has only one slave port. The other port is the host port. So there is no switching applicable here. At the egress drivers provide frame with PS_FLAG to indicate which port the frame is forwarded to and at the Ingress direction, it forward the received frame to the Host port which is the only other port in a K2G switch (2u). To Implement promiscuous mode, this requires ALE to be enabled and take advantage of ALE feature to flood all received unicast frames to host port. In the non-promiscuous mode, it disables that feature. So only frames with destination MAC address match is forwarded. For other K2 devices that has more than one port available, what you say is applicable. However we have not implemented the switch mode of these devices with multiple ports and don't have plan to do the same anytime in the future as this device is already matured and adding this feature at this point doesn't make much sense now. The driver on these devices currently bypass ALE and implement plain Ethernet interfaces (n port) for Ethernet connectivity. > > You might want to look at skb->offload_fwd_mark. By setting this, you > can tell the software bridge the hardware has already bridged the > frame. You might then be able to have promisc enabled, and the > hardware still doing the forwarding. Yes, if we decide to support switch mode for K2 devices, I will certainly look at this and add support as you have suggested. > >Andrew > -- Murali Karicheri Linux Kernel, Keystone
Re: [net-next 2/2] net: netcp: ethss: k2g: add promiscuous mode support
On Mon, Apr 02, 2018 at 12:17:19PM -0400, Murali Karicheri wrote: > +static int gbe_set_rx_mode(void *intf_priv, bool promisc) > +{ > + struct gbe_intf *gbe_intf = intf_priv; > + struct gbe_priv *gbe_dev = gbe_intf->gbe_dev; > + struct cpsw_ale *ale = gbe_dev->ale; > + unsigned long timeout; > + int i, ret = -ETIMEDOUT; > + > + /* Disable(1)/Enable(0) Learn for all ports (host is port 0 and > + * slaves are port 1 and up > + */ > + for (i = 0; i <= gbe_dev->num_slaves; i++) { > + cpsw_ale_control_set(ale, i, > + ALE_PORT_NOLEARN, !!promisc); > + cpsw_ale_control_set(ale, i, > + ALE_PORT_NO_SA_UPDATE, !!promisc); > + } Hi Murali Does this mean that in promisc mode, switching of frames between ports in hardware is disabled? You are relying on the software bridge to perform such bridging between ports? You might want to look at skb->offload_fwd_mark. By setting this, you can tell the software bridge the hardware has already bridged the frame. You might then be able to have promisc enabled, and the hardware still doing the forwarding. Andrew
[net-next 2/2] net: netcp: ethss: k2g: add promiscuous mode support
From: WingMan KwokThis patch adds support for promiscuous mode in k2g's network driver. When upper layer instructs to transition from non-promiscuous mode to promiscuous mode or vice versa K2G network driver needs to configure ALE accordingly so that in case of non-promiscuous mode, ALE will not flood all unicast packets to host port, while in promiscuous mode, it will pass all received unicast packets to host port. Signed-off-by: WingMan Kwok Signed-off-by: Murali Karicheri --- drivers/net/ethernet/ti/netcp_ethss.c | 56 +++ 1 file changed, 56 insertions(+) diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c index f7af999..1ac2cd6 100644 --- a/drivers/net/ethernet/ti/netcp_ethss.c +++ b/drivers/net/ethernet/ti/netcp_ethss.c @@ -2771,6 +2771,61 @@ static inline int gbe_hwtstamp_set(struct gbe_intf *gbe_intf, struct ifreq *req) } #endif /* CONFIG_TI_CPTS */ +static int gbe_set_rx_mode(void *intf_priv, bool promisc) +{ + struct gbe_intf *gbe_intf = intf_priv; + struct gbe_priv *gbe_dev = gbe_intf->gbe_dev; + struct cpsw_ale *ale = gbe_dev->ale; + unsigned long timeout; + int i, ret = -ETIMEDOUT; + + /* Disable(1)/Enable(0) Learn for all ports (host is port 0 and +* slaves are port 1 and up +*/ + for (i = 0; i <= gbe_dev->num_slaves; i++) { + cpsw_ale_control_set(ale, i, +ALE_PORT_NOLEARN, !!promisc); + cpsw_ale_control_set(ale, i, +ALE_PORT_NO_SA_UPDATE, !!promisc); + } + + if (!promisc) { + /* Don't Flood All Unicast Packets to Host port */ + cpsw_ale_control_set(ale, 0, ALE_P0_UNI_FLOOD, 0); + dev_vdbg(gbe_dev->dev, "promiscuous mode disabled\n"); + return 0; + } + + timeout = jiffies + HZ; + + /* Clear All Untouched entries */ + cpsw_ale_control_set(ale, 0, ALE_AGEOUT, 1); + do { + cpu_relax(); + if (cpsw_ale_control_get(ale, 0, ALE_AGEOUT)) { + ret = 0; + break; + } + + } while (time_after(timeout, jiffies)); + + /* Make sure it is not a false timeout */ + if (ret && !cpsw_ale_control_get(ale, 0, ALE_AGEOUT)) + return ret; + + cpsw_ale_control_set(ale, 0, ALE_AGEOUT, 1); + + /* Clear all mcast from ALE */ + cpsw_ale_flush_multicast(ale, +GBE_PORT_MASK(gbe_dev->ale_ports), +-1); + + /* Flood All Unicast Packets to Host port */ + cpsw_ale_control_set(ale, 0, ALE_P0_UNI_FLOOD, 1); + dev_vdbg(gbe_dev->dev, "promiscuous mode enabled\n"); + return ret; +} + static int gbe_ioctl(void *intf_priv, struct ifreq *req, int cmd) { struct gbe_intf *gbe_intf = intf_priv; @@ -3523,6 +3578,7 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev, gbe_dev->max_num_slaves = 8; } else if (of_device_is_compatible(node, "ti,netcp-gbe-2")) { gbe_dev->max_num_slaves = 1; + gbe_module.set_rx_mode = gbe_set_rx_mode; } else if (of_device_is_compatible(node, "ti,netcp-xgbe")) { gbe_dev->max_num_slaves = 2; } else { -- 1.9.1