| Message ID | 20220427162343.18092-2-arun.ramadoss@microchip.com (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: dsa: ksz: generic port mirror function for ksz9477 based switch | expand |
On Wed, Apr 27, 2022 at 09:53:41PM +0530, Arun Ramadoss wrote: > 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. > https://patchwork.kernel.org/project/netdevbpf/patch/20210422094257.1641396-8-prasanna.vengateshan@microchip.com/ > > Signed-off-by: Prasanna Vengateshan <prasanna.vengateshan@microchip.com> > Signed-off-by: Arun Ramadoss <arun.ramadoss@microchip.com> > --- This probably needs: Fixes: b987e98e50ab ("dsa: add DSA switch driver for Microchip KSZ9477") with the mention that it probably won't be backported too far due to the dependency on 0148bb50b8fd ("net: dsa: pass extack to dsa_switch_ops :: port_mirror_add()"). But this doesn't change what you should do. You should send it towards the "net" tree (probably right now), wait until the "net" pull request for this gets sent out, then "net" gets merged back into "net-next", then you can continue your work with the other patches. > drivers/net/dsa/microchip/ksz9477.c | 38 ++++++++++++++++++++++++++--- > 1 file changed, 34 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c > index 4f617fee9a4e..90ce789107eb 100644 > --- a/drivers/net/dsa/microchip/ksz9477.c > +++ b/drivers/net/dsa/microchip/ksz9477.c > @@ -990,14 +990,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); > @@ -1011,16 +1029,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 rule exist */ Either "there are no other mirroring rules", or "no other mirroring rule exists". > + if (!in_use) > ksz_port_cfg(dev, mirror->to_local_port, P_MIRROR_CTRL, > PORT_MIRROR_SNIFFER, false); > } > -- > 2.33.0 >
diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c index 4f617fee9a4e..90ce789107eb 100644 --- a/drivers/net/dsa/microchip/ksz9477.c +++ b/drivers/net/dsa/microchip/ksz9477.c @@ -990,14 +990,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); @@ -1011,16 +1029,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 rule exist */ + if (!in_use) ksz_port_cfg(dev, mirror->to_local_port, P_MIRROR_CTRL, PORT_MIRROR_SNIFFER, false); }