net: dsa: ksz9477: port mirror sniffing limited to one port
PATCH 1/1 net: dsa: ksz9477: port mirror sniffing limited to one port
This patch limits the sniffing to only one port during the mirror add. And during the mirror_del it checks for all the ports using the sniff, if and only if no other ports are referring, sniffing is disabled. The code is updated based on the review comments of LAN937x port mirror patch.
--- drivers/net/dsa/microchip/ksz9477.c | 38 ++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 4 deletions(-)
drivers/net/dsa/microchip/ksz9477.c +34 -4
@@ -896,14 +896,32 @@ static int ksz9477_port_mirror_add(struct dsa_switch *ds, int port, bool ingress, struct netlink_ext_ack *extack) { struct ksz_device *dev = ds->priv; +u8 data; +int p; + +/* Limit to one sniffer port +* Check if any of the port is already set for sniffing +* If yes, instruct the user to remove the previous entry & exit +*/ +for (p =0 ; p < dev->port_cnt; p++) { +/* Skip the current sniffing port */ +if (p == mirror->to_local_port) +continue ; + +ksz_pread8 (dev, p,P_MIRROR_CTRL , &data); + +if (data &PORT_MIRROR_SNIFFER ) { +NL_SET_ERR_MSG_MOD (extack, +"Sniffer port is already configured, delete existing rules & retry" ); +return -EBUSY ; + } + }if (ingress)ksz_port_cfg (dev, port,P_MIRROR_CTRL ,PORT_MIRROR_RX , true);else ksz_port_cfg (dev, port,P_MIRROR_CTRL ,PORT_MIRROR_TX , true); -ksz_port_cfg (dev, port,P_MIRROR_CTRL ,PORT_MIRROR_SNIFFER , false); -/* configure mirror port */ ksz_port_cfg (dev, mirror->to_local_port,P_MIRROR_CTRL ,PORT_MIRROR_SNIFFER , true);
@@ -917,16 +935,28 @@ static void ksz9477_port_mirror_del(struct dsa_switch *ds, int port, struct dsa_mall_mirror_tc_entry *mirror) {struct ksz_device *dev = ds->priv; +bool in_use = false;u8 data; +int p;if (mirror->ingress)ksz_port_cfg (dev, port,P_MIRROR_CTRL ,PORT_MIRROR_RX , false);else ksz_port_cfg (dev, port,P_MIRROR_CTRL ,PORT_MIRROR_TX , false); -ksz_pread8 (dev, port,P_MIRROR_CTRL , &data); -if (!(data & (PORT_MIRROR_RX |PORT_MIRROR_TX ))) +/* Check if any of the port is still referring to sniffer port */ +for (p =0 ; p < dev->port_cnt; p++) { +ksz_pread8 (dev, p,P_MIRROR_CTRL , &data); + +if ((data & (PORT_MIRROR_RX |PORT_MIRROR_TX ))) { + in_use = true; +break ; + } + } + +/* delete sniffing if there are no other mirroring rules */ +if (!in_use)ksz_port_cfg (dev, mirror->to_local_port,P_MIRROR_CTRL ,PORT_MIRROR_SNIFFER , false); }
base-commit: 50c6afabfd2ae91a4ff0e2feb14fe702b0688ec5
Signature · 1 line
2.33.0
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 6 lines · On Thu, 28 Apr 2022 12:37:09 +0530 you wrote:
This patch limits the sniffing to only one port during the mirror add. And during the
mirror_delit checks for all the ports using the sniff, if and only if no other ports are referring, sniffing is disabled. The code is updated based on the review comments of LAN937x port mirror patch.
Quoted 6 lines
Fixes b987e98e50ab ("dsa: add DSA switch driver for Microchip KSZ9477")Signed-off-by Prasanna Vengateshan <[email protected]>Signed-off-by Arun Ramadoss <[email protected]>[...]
Here is the summary with links:
- [net] net: dsa: ksz9477: port mirror sniffing limited to one port
https://git.kernel.org/netdev/net/c/fee34dd19938
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html