net: dsa: mv88e6xxx: Add support for port mirroring
Subsystems (4)
v2 cover net: dsa: mv88e6xxx: Add support for port mirroring
This patch serie add support for port mirroring in the mv88e6xx switch driver. The first patch changes the set_egress_port function to allow different egress ports for egress and ingress traffic. The second patch adds the actual code for port mirroring support.
Tested on a 88E6176 with:
tc qdisc add dev wan0 clsact
tc filter add dev wan0 ingress matchall skip_sw \
action mirred egress mirror dev lan2
tc filter add dev wan0 egress matchall skip_sw \
action mirred egress mirror dev lan3
Changes in v2
- Support mirroring egress and ingress traffic to different ports
- Check for invalid configurations when multiple ports are mirrored
Iwan R Timmer (2):
net: dsa: mv88e6xxx: Split monitor port configuration
net: dsa: mv88e6xxx: Add support for port mirroring
drivers/net/dsa/mv88e6xxx/chip.c | 79 ++++++++++++++++++++++++++++- drivers/net/dsa/mv88e6xxx/chip.h | 9 +++- drivers/net/dsa/mv88e6xxx/global1.c | 34 ++++++++----- drivers/net/dsa/mv88e6xxx/global1.h | 6 ++- drivers/net/dsa/mv88e6xxx/port.c | 29 +++++++++++ drivers/net/dsa/mv88e6xxx/port.h | 2 + 6 files changed, 142 insertions(+), 17 deletions(-)
Signature · 1 line
2.23.0
PATCH v2 1/2 net: dsa: mv88e6xxx: Split monitor port configuration
Separate the configuration of the egress and ingress monitor port. This allows the port mirror functionality to do ingress and egress port mirroring to separate ports.
--- drivers/net/dsa/mv88e6xxx/chip.c | 9 ++++++++- drivers/net/dsa/mv88e6xxx/chip.h | 3 ++- drivers/net/dsa/mv88e6xxx/global1.c | 23 +++++++++++------------ drivers/net/dsa/mv88e6xxx/global1.h | 6 ++++-- 4 files changed, 25 insertions(+), 16 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +8 -1
@@ -2378,7 +2378,14 @@ static int mv88e6xxx_setup_upstream_port(struct mv88e6xxx_chip *chip, int port)if (chip->info->ops->set_egress_port) { err = chip->info->ops->set_egress_port (chip, - upstream_port); + true, + upstream_port); +if (err) +return err; + + err = chip->info->ops->set_egress_port (chip, + false, + upstream_port);if (err)return err; }
drivers/net/dsa/mv88e6xxx/chip.h +2 -1
@@ -464,7 +464,8 @@ struct mv88e6xxx_ops {int (*stats_get_stats)(struct mv88e6xxx_chip *chip,int port,uint64_t *data);int (*set_cpu_port)(struct mv88e6xxx_chip *chip,int port); -int (*set_egress_port)(struct mv88e6xxx_chip *chip,int port); +int (*set_egress_port)(struct mv88e6xxx_chip *chip,bool ingress, +int port);#define MV88E6XXX_CASCADE_PORT_NONE 0xe#define MV88E6XXX_CASCADE_PORT_MULTIPLE 0xf
drivers/net/dsa/mv88e6xxx/global1.c +11 -12
@@ -263,7 +263,8 @@ int mv88e6250_g1_ieee_pri_map(struct mv88e6xxx_chip *chip)/* Offset 0x1a: Monitor Control */ /* Offset 0x1a: Monitor & MGMT Control on some devices */ -int mv88e6095_g1_set_egress_port (struct mv88e6xxx_chip *chip,int port) +int mv88e6095_g1_set_egress_port (struct mv88e6xxx_chip *chip,bool ingress, +int port) {u16 reg;int err;
@@ -272,11 +273,12 @@ int mv88e6095_g1_set_egress_port(struct mv88e6xxx_chip *chip, int port)if (err)return err; - reg &= ~(MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK | -MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK ); + reg &= ~(ingress ?MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK : +MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK ); - reg |= port <<__bf_shf (MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK ) | - port <<__bf_shf (MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK ); + reg |= port << (ingress ? +__bf_shf (MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK ) : +__bf_shf (MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK ));return mv88e6xxx_g1_write (chip,MV88E6185_G1_MONITOR_CTL , reg); }
@@ -310,17 +312,14 @@ static int mv88e6390_g1_monitor_write(struct mv88e6xxx_chip *chip,return mv88e6xxx_g1_write (chip,MV88E6390_G1_MONITOR_MGMT_CTL , reg); } -int mv88e6390_g1_set_egress_port (struct mv88e6xxx_chip *chip,int port) +int mv88e6390_g1_set_egress_port (struct mv88e6xxx_chip *chip,bool ingress, +int port) {u16 ptr;int err; - ptr =MV88E6390_G1_MONITOR_MGMT_CTL_PTR_INGRESS_DEST ; - err =mv88e6390_g1_monitor_write (chip, ptr, port); -if (err) -return err; - - ptr =MV88E6390_G1_MONITOR_MGMT_CTL_PTR_EGRESS_DEST ; + ptr = ingress ?MV88E6390_G1_MONITOR_MGMT_CTL_PTR_INGRESS_DEST : +MV88E6390_G1_MONITOR_MGMT_CTL_PTR_EGRESS_DEST ; err =mv88e6390_g1_monitor_write (chip, ptr, port);if (err)return err;
drivers/net/dsa/mv88e6xxx/global1.h +4 -2
@@ -287,8 +287,10 @@ int mv88e6095_g1_stats_set_histogram(struct mv88e6xxx_chip *chip);int mv88e6390_g1_stats_set_histogram (struct mv88e6xxx_chip *chip);void mv88e6xxx_g1_stats_read (struct mv88e6xxx_chip *chip,int stat,u32 *val);int mv88e6xxx_g1_stats_clear (struct mv88e6xxx_chip *chip); -int mv88e6095_g1_set_egress_port (struct mv88e6xxx_chip *chip,int port); -int mv88e6390_g1_set_egress_port (struct mv88e6xxx_chip *chip,int port); +int mv88e6095_g1_set_egress_port (struct mv88e6xxx_chip *chip,bool ingress, +int port); +int mv88e6390_g1_set_egress_port (struct mv88e6xxx_chip *chip,bool ingress, +int port);int mv88e6095_g1_set_cpu_port (struct mv88e6xxx_chip *chip,int port);int mv88e6390_g1_set_cpu_port (struct mv88e6xxx_chip *chip,int port);int mv88e6390_g1_mgmt_rsvd2cpu (struct mv88e6xxx_chip *chip);
Signature · 1 line
2.23.0
Andrew Lunn
maintainerRe: [PATCH net-next v2 1/2] net: dsa: mv88e6xxx: Split monitor port configuration
Quoted 19 lines · Iwan R Timmer
Separate the configuration of the egress and ingress monitor port. This allows the port mirror functionality to do ingress and egress port mirroring to separate ports.
Signed-off-by Iwan R Timmer <[email protected]>--- drivers/net/dsa/mv88e6xxx/chip.c | 9 ++++++++- drivers/net/dsa/mv88e6xxx/chip.h | 3 ++- drivers/net/dsa/mv88e6xxx/global1.c | 23 +++++++++++------------ drivers/net/dsa/mv88e6xxx/global1.h | 6 ++++-- 4 files changed, 25 insertions(+), 16 deletions(-)drivers/net/dsa/mv88e6xxx/chip.c +0
-0@@ -2378,7 +2378,14 @@ static int mv88e6xxx_setup_upstream_port(struct mv88e6xxx_chip *chip, int port)if (chip->info->ops->set_egress_port) {
drivers/net/dsa/mv88e6xxx/chip.c static int mv88e6xxx_setup_upstream_port(struct mv88e6xxx_chip *chip, int port) · line 2388
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/chip.c +8
-1err = chip->info->ops->set_egress_port (chip, - upstream_port); + true, + upstream_port); +if (err) +return err; + + err = chip->info->ops->set_egress_port (chip, + false, + upstream_port);
Hi Iwam
I never find true/false very simple to understand. Please could you add an enum. We already have
enum mv88e6xxx_egress_mode {
MV88E6XXX_EGRESS_MODE_UNMODIFIED,
MV88E6XXX_EGRESS_MODE_UNTAGGED,
MV88E6XXX_EGRESS_MODE_TAGGED,
MV88E6XXX_EGRESS_MODE_ETHERTYPE,
};
so maybe
enum mv88e6xxx_egress_direction {
MV88E6XXX_EGRESS_DIR_INGRESS,
MV88E6XXX_EGRESS_DIR_EGRESS,
};
Otherwise the spirit of the patch is O.K.
Andrew
PATCH v2 2/2 net: dsa: mv88e6xxx: Add support for port mirroring
In reply to Iwan R TimmerAdd support for configuring port mirroring through the cls_matchall classifier. We do a full ingress and/or egress capture towards a capture port. It allows setting a different capture port for ingress and egress traffic.
It keeps track of the mirrored ports and the destination ports to prevent changes to the capture port while other ports are being mirrored.
--- drivers/net/dsa/mv88e6xxx/chip.c | 70 +++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 6 +++ drivers/net/dsa/mv88e6xxx/global1.c | 11 ++++- drivers/net/dsa/mv88e6xxx/port.c | 29 ++++++++++++ drivers/net/dsa/mv88e6xxx/port.h | 2 + 5 files changed, 117 insertions(+), 1 deletion(-)
drivers/net/dsa/mv88e6xxx/chip.c +70 -0
@@ -4921,6 +4921,74 @@ static int mv88e6xxx_port_mdb_del(struct dsa_switch *ds, int port,return err; } +static int mv88e6xxx_port_mirror_add (struct dsa_switch *ds,int port, +struct dsa_mall_mirror_tc_entry *mirror, +bool ingress) +{ +struct mv88e6xxx_chip *chip = ds->priv; +bool other_mirrors = false; +int i; +int err; + +if (!chip->info->ops->set_egress_port) +return -EOPNOTSUPP ; + +mutex_lock (&chip->reg_lock); +if ((ingress ? chip->ingress_dest_port : chip->egress_dest_port) != + mirror->to_local_port) { +for (i =0 ; i <mv88e6xxx_num_ports (chip); i++) + other_mirrors |= ingress ? + chip->ports[i].mirror_ingress : + chip->ports[i].mirror_egress; + +/* Can't change egress port when other mirror is active */ +if (other_mirrors) { + err = -EBUSY ; + goto out; + } + + err = chip->info->ops->set_egress_port (chip, + ingress, + mirror->to_local_port); +if (err) + goto out; + } + + err =mv88e6xxx_port_set_mirror (chip, port, ingress, true); +out: +mutex_unlock (&chip->reg_lock); + +return err; +} + +static void mv88e6xxx_port_mirror_del (struct dsa_switch *ds,int port, +struct dsa_mall_mirror_tc_entry *mirror) +{ +struct mv88e6xxx_chip *chip = ds->priv; +bool other_mirrors = false; +int i; + +mutex_lock (&chip->reg_lock); +if (mv88e6xxx_port_set_mirror (chip, port, mirror->ingress, false)) +dev_err (ds->dev,"p%d: failed to disable mirroring\n" , port); + +for (i =0 ; i <mv88e6xxx_num_ports (chip); i++) + other_mirrors |= mirror->ingress ? + chip->ports[i].mirror_ingress : + chip->ports[i].mirror_egress; + +/* Reset egress port when no other mirror is active */ +if (!other_mirrors) { +if (chip->info->ops->set_egress_port (chip, + mirror->ingress, +dsa_upstream_port (ds, + port))); +dev_err (ds->dev,"failed to set egress port\n" ); + } + +mutex_unlock (&chip->reg_lock); +} +static int mv88e6xxx_port_egress_floods (struct dsa_switch *ds,int port,bool unicast,bool multicast) {
@@ -4975,6 +5043,8 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { .port_mdb_prepare = mv88e6xxx_port_mdb_prepare, .port_mdb_add = mv88e6xxx_port_mdb_add, .port_mdb_del = mv88e6xxx_port_mdb_del, + .port_mirror_add = mv88e6xxx_port_mirror_add, + .port_mirror_del = mv88e6xxx_port_mirror_del, .crosschip_bridge_join = mv88e6xxx_crosschip_bridge_join, .crosschip_bridge_leave = mv88e6xxx_crosschip_bridge_leave, .port_hwtstamp_set = mv88e6xxx_port_hwtstamp_set,
drivers/net/dsa/mv88e6xxx/chip.h +6 -0
@@ -228,6 +228,8 @@ struct mv88e6xxx_port {u64 vtu_miss_violation;u8 cmode;unsigned int serdes_irq; +bool mirror_ingress; +bool mirror_egress; };struct mv88e6xxx_chip {
@@ -310,6 +312,10 @@ struct mv88e6xxx_chip {u16 evcap_config;u16 enable_count; +/* Current ingress and egress monitor ports */ +int egress_dest_port; +int ingress_dest_port; +/* Per-port timestamping resources. */ struct mv88e6xxx_port_hwtstamp port_hwtstamp[DSA_MAX_PORTS ];
drivers/net/dsa/mv88e6xxx/global1.c +10 -1
@@ -280,7 +280,16 @@ int mv88e6095_g1_set_egress_port(struct mv88e6xxx_chip *chip, int port, __bf_shf(MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK) : __bf_shf(MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK)); -return mv88e6xxx_g1_write (chip,MV88E6185_G1_MONITOR_CTL , reg); + err =mv88e6xxx_g1_write (chip,MV88E6185_G1_MONITOR_CTL , reg); +if (err) +return err; + +if (ingress) + chip->ingress_dest_port = port; +else + chip->egress_dest_port = port; + +return 0 ; }/* Older generations also call this the ARP destination. It has been
drivers/net/dsa/mv88e6xxx/port.c +29 -0
@@ -1181,6 +1181,35 @@ int mv88e6095_port_set_upstream_port(struct mv88e6xxx_chip *chip, int port,return mv88e6xxx_port_write (chip, port,MV88E6XXX_PORT_CTL2 , reg); } +int mv88e6xxx_port_set_mirror (struct mv88e6xxx_chip *chip,int port, +bool ingress,bool mirror) +{ +u16 reg; +u16 bit; +int err; + + err =mv88e6xxx_port_read (chip, port,MV88E6XXX_PORT_CTL2 , ®); +if (err) +return err; + + bit = ingress ?MV88E6XXX_PORT_CTL2_INGRESS_MONITOR : +MV88E6XXX_PORT_CTL2_EGRESS_MONITOR ; + reg &= ~bit; + +if (mirror) + reg |= bit; + + err =mv88e6xxx_port_write (chip, port,MV88E6XXX_PORT_CTL2 , reg); +if (!err) { +if (ingress) + chip->ports[port].mirror_ingress = mirror; +else + chip->ports[port].mirror_egress = mirror; + } + +return err; +} +int mv88e6xxx_port_set_8021q_mode (struct mv88e6xxx_chip *chip,int port,u16 mode) {
drivers/net/dsa/mv88e6xxx/port.h +2 -0
@@ -368,6 +368,8 @@ int mv88e6352_port_link_state(struct mv88e6xxx_chip *chip, int port,int mv88e6xxx_port_set_map_da (struct mv88e6xxx_chip *chip,int port);int mv88e6095_port_set_upstream_port (struct mv88e6xxx_chip *chip,int port,int upstream_port); +int mv88e6xxx_port_set_mirror (struct mv88e6xxx_chip *chip,int port, +bool ingress,bool mirror);int mv88e6xxx_port_disable_learn_limit (struct mv88e6xxx_chip *chip,int port);int mv88e6xxx_port_disable_pri_override (struct mv88e6xxx_chip *chip,int port);
Signature · 1 line
2.23.0
Andrew Lunn
maintainerQuoted 23 lines · Iwan R Timmer
Add support for configuring port mirroring through the
cls_matchallclassifier. We do a full ingress and/or egress capture towards a capture port. It allows setting a different capture port for ingress and egress traffic.It keeps track of the mirrored ports and the destination ports to prevent changes to the capture port while other ports are being mirrored.
Signed-off-by Iwan R Timmer <[email protected]>--- drivers/net/dsa/mv88e6xxx/chip.c | 70 +++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 6 +++ drivers/net/dsa/mv88e6xxx/global1.c | 11 ++++- drivers/net/dsa/mv88e6xxx/port.c | 29 ++++++++++++ drivers/net/dsa/mv88e6xxx/port.h | 2 + 5 files changed, 117 insertions(+), 1 deletion(-)drivers/net/dsa/mv88e6xxx/chip.c +0
-0
drivers/net/dsa/mv88e6xxx/chip.c static int mv88e6xxx_port_mdb_del(struct dsa_switch *ds, int port, · line 4926
Quoted 6 lines
drivers/net/dsa/mv88e6xxx/chip.c +3
-0@@ -4921,6 +4921,74 @@ static int mv88e6xxx_port_mdb_del(struct dsa_switch *ds, int port,return err; } +static int mv88e6xxx_port_mirror_add (struct dsa_switch *ds,int port, +struct dsa_mall_mirror_tc_entry *mirror, +bool ingress)
This bool is defined by the API to the DSA core, so we cannot do much to make it easier to understand.
drivers/net/dsa/mv88e6xxx/chip.c static int mv88e6xxx_port_mdb_del(struct dsa_switch *ds, int port, · line 4957
Quoted 1 line
drivers/net/dsa/mv88e6xxx/chip.c +1
-0+ err =mv88e6xxx_port_set_mirror (chip, port, ingress, true);
but here we could use enums for both ingress and this second true. Maybe the enum i suggested for the previous patch could be more generic and just represent ingress/egress?
drivers/net/dsa/mv88e6xxx/chip.c struct mv88e6xxx_port { · line 233
Quoted 7 lines
drivers/net/dsa/mv88e6xxx/chip.c +2
-0@@ -228,6 +228,8 @@ struct mv88e6xxx_port {u64 vtu_miss_violation;u8 cmode;unsigned int serdes_irq; +bool mirror_ingress; +bool mirror_egress; };
In terms of structure packing, it might be better to put these two bools after cmode.
Andrew