Commit 1930b603 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-port-mirroring' 



Florian Fainelli says:

====================
net: dsa: Port mirroring support

This patch series adds support for port mirroring in the two
Broadcom switch drivers. The major part of the functional are actually with
the plumbing between tc and the drivers.

Changes in v5:

- Added Jiri's Reviewed-by tag to first patch
- rebase against latest net-next/master after bcm_sf2 CFP series

Changes in v4:

- rebased against latest net-next/master after Vivien's changes

Changes in v3:

- removed multiline comments from added structures
- simplify error handling in dsa_slave_add_cls_matchall

Changes in v2:

- fixed filter removal logic to disable the ingress or egress mirroring
  when there are no longer ports being monitored in ingress or egress

- removed a stray list_head in dsa_port structure that is not used

Tested using the two iproute2 examples:

      tc qdisc  add dev eth1 handle ffff: ingress
      tc filter add dev eth1 parent ffff:           \
               matchall skip_sw                      \
               action mirred egress mirror           \
               dev eth2
      tc qdisc add dev eth1 handle 1: root prio
      tc filter add dev eth1 parent 1:               \
               matchall skip_sw                       \
               action mirred egress mirror            \
               dev eth2
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4be99934 ec960de6

drivers/net/dsa/b53/b53_common.c

+67 −0
Original line number Diff line number Diff line
@@ -1450,6 +1450,71 @@ static enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds) 
	return DSA_TAG_PROTO_NONE;

}



int b53_mirror_add(struct dsa_switch *ds, int port,

		   struct dsa_mall_mirror_tc_entry *mirror, bool ingress)

{

	struct b53_device *dev = ds->priv;

	u16 reg, loc;



	if (ingress)

		loc = B53_IG_MIR_CTL;

	else

		loc = B53_EG_MIR_CTL;



	b53_read16(dev, B53_MGMT_PAGE, loc, &reg);

	reg &= ~MIRROR_MASK;

	reg |= BIT(port);

	b53_write16(dev, B53_MGMT_PAGE, loc, reg);



	b53_read16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, &reg);

	reg &= ~CAP_PORT_MASK;

	reg |= mirror->to_local_port;

	reg |= MIRROR_EN;

	b53_write16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, reg);



	return 0;

}

EXPORT_SYMBOL(b53_mirror_add);



void b53_mirror_del(struct dsa_switch *ds, int port,

		    struct dsa_mall_mirror_tc_entry *mirror)

{

	struct b53_device *dev = ds->priv;

	bool loc_disable = false, other_loc_disable = false;

	u16 reg, loc;



	if (mirror->ingress)

		loc = B53_IG_MIR_CTL;

	else

		loc = B53_EG_MIR_CTL;



	/* Update the desired ingress/egress register */

	b53_read16(dev, B53_MGMT_PAGE, loc, &reg);

	reg &= ~BIT(port);

	if (!(reg & MIRROR_MASK))

		loc_disable = true;

	b53_write16(dev, B53_MGMT_PAGE, loc, reg);



	/* Now look at the other one to know if we can disable mirroring

	 * entirely

	 */

	if (mirror->ingress)

		b53_read16(dev, B53_MGMT_PAGE, B53_EG_MIR_CTL, &reg);

	else

		b53_read16(dev, B53_MGMT_PAGE, B53_IG_MIR_CTL, &reg);

	if (!(reg & MIRROR_MASK))

		other_loc_disable = true;



	b53_read16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, &reg);

	/* Both no longer have ports, let's disable mirroring */

	if (loc_disable && other_loc_disable) {

		reg &= ~MIRROR_EN;

		reg &= ~mirror->to_local_port;

	}

	b53_write16(dev, B53_MGMT_PAGE, B53_MIR_CAP_CTL, reg);

}

EXPORT_SYMBOL(b53_mirror_del);



static const struct dsa_switch_ops b53_switch_ops = {

	.get_tag_protocol	= b53_get_tag_protocol,

	.setup			= b53_setup,
@@ -1474,6 +1539,8 @@ static const struct dsa_switch_ops b53_switch_ops = { 
	.port_fdb_dump		= b53_fdb_dump,

	.port_fdb_add		= b53_fdb_add,

	.port_fdb_del		= b53_fdb_del,

	.port_mirror_add	= b53_mirror_add,

	.port_mirror_del	= b53_mirror_del,

};



struct b53_chip_data {

drivers/net/dsa/b53/b53_priv.h

+4 −0
Original line number Diff line number Diff line
@@ -407,5 +407,9 @@ int b53_fdb_del(struct dsa_switch *ds, int port, 
int b53_fdb_dump(struct dsa_switch *ds, int port,

		 struct switchdev_obj_port_fdb *fdb,

		 int (*cb)(struct switchdev_obj *obj));

int b53_mirror_add(struct dsa_switch *ds, int port,

		   struct dsa_mall_mirror_tc_entry *mirror, bool ingress);

void b53_mirror_del(struct dsa_switch *ds, int port,

		    struct dsa_mall_mirror_tc_entry *mirror);



#endif

drivers/net/dsa/b53/b53_regs.h

+32 −0
Original line number Diff line number Diff line
@@ -206,6 +206,38 @@ 
#define   BRCM_HDR_P8_EN		BIT(0) /* Enable tagging on port 8 */

#define   BRCM_HDR_P5_EN		BIT(1) /* Enable tagging on port 5 */



/* Mirror capture control register (16 bit) */

#define B53_MIR_CAP_CTL			0x10

#define  CAP_PORT_MASK			0xf

#define  BLK_NOT_MIR			BIT(14)

#define  MIRROR_EN			BIT(15)



/* Ingress mirror control register (16 bit) */

#define B53_IG_MIR_CTL			0x12

#define  MIRROR_MASK			0x1ff

#define  DIV_EN				BIT(13)

#define  MIRROR_FILTER_MASK		0x3

#define  MIRROR_FILTER_SHIFT		14

#define  MIRROR_ALL			0

#define  MIRROR_DA			1

#define  MIRROR_SA			2



/* Ingress mirror divider register (16 bit) */

#define B53_IG_MIR_DIV			0x14

#define  IN_MIRROR_DIV_MASK		0x3ff



/* Ingress mirror MAC address register (48 bit) */

#define B53_IG_MIR_MAC			0x16



/* Egress mirror control register (16 bit) */

#define B53_EG_MIR_CTL			0x1C



/* Egress mirror divider register (16 bit) */

#define B53_EG_MIR_DIV			0x1E



/* Egress mirror MAC address register (48 bit) */

#define B53_EG_MIR_MAC			0x20



/* Device ID register (8 or 32 bit) */

#define B53_DEVICE_ID			0x30

drivers/net/dsa/bcm_sf2.c

+2 −0
Original line number Diff line number Diff line
@@ -1047,6 +1047,8 @@ static const struct dsa_switch_ops bcm_sf2_ops = { 
	.port_fdb_del		= b53_fdb_del,

	.get_rxnfc		= bcm_sf2_get_rxnfc,

	.set_rxnfc		= bcm_sf2_set_rxnfc,

	.port_mirror_add	= b53_mirror_add,

	.port_mirror_del	= b53_mirror_del,

};



struct bcm_sf2_of_data {

include/net/dsa.h

+33 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include <linux/phy_fixed.h>

#include <linux/ethtool.h>



struct tc_action;



enum dsa_tag_protocol {

	DSA_TAG_PROTO_NONE = 0,

	DSA_TAG_PROTO_DSA,
@@ -139,6 +141,28 @@ struct dsa_switch_tree { 
	const struct dsa_device_ops *tag_ops;

};



/* TC matchall action types, only mirroring for now */

enum dsa_port_mall_action_type {

	DSA_PORT_MALL_MIRROR,

};



/* TC mirroring entry */

struct dsa_mall_mirror_tc_entry {

	u8 to_local_port;

	bool ingress;

};



/* TC matchall entry */

struct dsa_mall_tc_entry {

	struct list_head list;

	unsigned long cookie;

	enum dsa_port_mall_action_type type;

	union {

		struct dsa_mall_mirror_tc_entry mirror;

	};

};





struct dsa_port {

	struct dsa_switch	*ds;

	unsigned int		index;
@@ -385,6 +409,15 @@ struct dsa_switch_ops { 
			     struct ethtool_rxnfc *nfc, u32 *rule_locs);

	int	(*set_rxnfc)(struct dsa_switch *ds, int port,

			     struct ethtool_rxnfc *nfc);



	/*

	 * TC integration

	 */

	int	(*port_mirror_add)(struct dsa_switch *ds, int port,

				   struct dsa_mall_mirror_tc_entry *mirror,

				   bool ingress);

	void	(*port_mirror_del)(struct dsa_switch *ds, int port,

				   struct dsa_mall_mirror_tc_entry *mirror);

};



struct dsa_switch_driver {

CRA Git | Maintained and supported by SUSTech CRA and CCSE