Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8231bee6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-SPAN-Support-routes-pointing-at-bridges' 



Ido Schimmel says:

====================
mlxsw: SPAN: Support routes pointing at bridges

Petr says:

When mirroring to a gretap or ip6gretap netdevice, the route that
directs the encapsulated packets can reference a bridge. In that case,
in the software model, the packet is switched.

Thus when offloading mirroring like that, take into consideration FDB,
STP, PVID configured at the bridge, and whether that VLAN ID should be
tagged on egress.

Patch #1 introduces functions to get bridge PVID, VLAN flags and to look
up an FDB entry.

Patches #2 and #3 refactor some existing code and introduce a new
accessor function.

With patches #4 and #5 mlxsw calls mlxsw_sp_span_respin() on switchdev
events as well. There is no impact yet, because bridge as an underlay
device is still not allowed.

That is implemented in patch #6, which uses the new interfaces to figure
out on which one port the mirroring should be configured, and whether
the mirrored packets should be VLAN-tagged and how.

Changes from v2 to v3:

- Rename the suite of bridge accessor function to br_vlan_get_pvid(),
  br_vlan_get_info() and br_fdb_find_port(). The _get bit is to avoid
  clashing with an existing static function.

Changes from v1 to v2:

- Change the suite of bridge accessor functions to br_vlan_pvid_rtnl(),
  br_vlan_info_rtnl(), br_fdb_find_port_rtnl().
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6df93462 946a11e7

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+25 −25
Original line number Diff line number Diff line
@@ -441,29 +441,29 @@ static void mlxsw_sp_txhdr_construct(struct sk_buff *skb, 
	mlxsw_tx_hdr_type_set(txhdr, MLXSW_TXHDR_TYPE_CONTROL);

}



int mlxsw_sp_port_vid_stp_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid,

			      u8 state)

enum mlxsw_reg_spms_state mlxsw_sp_stp_spms_state(u8 state)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	enum mlxsw_reg_spms_state spms_state;

	char *spms_pl;

	int err;



	switch (state) {

	case BR_STATE_FORWARDING:

		spms_state = MLXSW_REG_SPMS_STATE_FORWARDING;

		break;

		return MLXSW_REG_SPMS_STATE_FORWARDING;

	case BR_STATE_LEARNING:

		spms_state = MLXSW_REG_SPMS_STATE_LEARNING;

		break;

		return MLXSW_REG_SPMS_STATE_LEARNING;

	case BR_STATE_LISTENING: /* fall-through */

	case BR_STATE_DISABLED: /* fall-through */

	case BR_STATE_BLOCKING:

		spms_state = MLXSW_REG_SPMS_STATE_DISCARDING;

		break;

		return MLXSW_REG_SPMS_STATE_DISCARDING;

	default:

		BUG();

	}

}



int mlxsw_sp_port_vid_stp_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid,

			      u8 state)

{

	enum mlxsw_reg_spms_state spms_state = mlxsw_sp_stp_spms_state(state);

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	char *spms_pl;

	int err;



	spms_pl = kmalloc(MLXSW_REG_SPMS_LEN, GFP_KERNEL);

	if (!spms_pl)
@@ -3666,6 +3666,15 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
		goto err_lag_init;

	}



	/* Initialize SPAN before router and switchdev, so that those components

	 * can call mlxsw_sp_span_respin().

	 */

	err = mlxsw_sp_span_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to init span system\n");

		goto err_span_init;

	}



	err = mlxsw_sp_switchdev_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to initialize switchdev\n");
@@ -3684,15 +3693,6 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
		goto err_afa_init;

	}



	err = mlxsw_sp_span_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to init span system\n");

		goto err_span_init;

	}



	/* Initialize router after SPAN is initialized, so that the FIB and

	 * neighbor event handlers can issue SPAN respin.

	 */

	err = mlxsw_sp_router_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to initialize router\n");
@@ -3739,14 +3739,14 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
err_netdev_notifier:

	mlxsw_sp_router_fini(mlxsw_sp);

err_router_init:

	mlxsw_sp_span_fini(mlxsw_sp);

err_span_init:

	mlxsw_sp_afa_fini(mlxsw_sp);

err_afa_init:

	mlxsw_sp_counter_pool_fini(mlxsw_sp);

err_counter_pool_init:

	mlxsw_sp_switchdev_fini(mlxsw_sp);

err_switchdev_init:

	mlxsw_sp_span_fini(mlxsw_sp);

err_span_init:

	mlxsw_sp_lag_fini(mlxsw_sp);

err_lag_init:

	mlxsw_sp_buffers_fini(mlxsw_sp);
@@ -3768,10 +3768,10 @@ static void mlxsw_sp_fini(struct mlxsw_core *mlxsw_core) 
	mlxsw_sp_acl_fini(mlxsw_sp);

	unregister_netdevice_notifier(&mlxsw_sp->netdevice_nb);

	mlxsw_sp_router_fini(mlxsw_sp);

	mlxsw_sp_span_fini(mlxsw_sp);

	mlxsw_sp_afa_fini(mlxsw_sp);

	mlxsw_sp_counter_pool_fini(mlxsw_sp);

	mlxsw_sp_switchdev_fini(mlxsw_sp);

	mlxsw_sp_span_fini(mlxsw_sp);

	mlxsw_sp_lag_fini(mlxsw_sp);

	mlxsw_sp_buffers_fini(mlxsw_sp);

	mlxsw_sp_traps_fini(mlxsw_sp);

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+1 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ int __mlxsw_sp_port_headroom_set(struct mlxsw_sp_port *mlxsw_sp_port, int mtu, 
int mlxsw_sp_port_ets_maxrate_set(struct mlxsw_sp_port *mlxsw_sp_port,

				  enum mlxsw_reg_qeec_hr hr, u8 index,

				  u8 next_index, u32 maxrate);

enum mlxsw_reg_spms_state mlxsw_sp_stp_spms_state(u8 stp_state);

int mlxsw_sp_port_vid_stp_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 vid,

			      u8 state);

int mlxsw_sp_port_vp_mode_set(struct mlxsw_sp_port *mlxsw_sp_port, bool enable);

drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c

+89 −6
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
 * POSSIBILITY OF SUCH DAMAGE.

 */



#include <linux/if_bridge.h>

#include <linux/list.h>

#include <net/arp.h>

#include <net/gre.h>
@@ -39,8 +40,9 @@ 
#include <net/ip6_tunnel.h>



#include "spectrum.h"

#include "spectrum_span.h"

#include "spectrum_ipip.h"

#include "spectrum_span.h"

#include "spectrum_switchdev.h"



int mlxsw_sp_span_init(struct mlxsw_sp *mlxsw_sp)

{
@@ -167,6 +169,72 @@ mlxsw_sp_span_entry_unoffloadable(struct mlxsw_sp_span_parms *sparmsp) 
	return 0;

}



static struct net_device *

mlxsw_sp_span_entry_bridge_8021q(const struct net_device *br_dev,

				 unsigned char *dmac,

				 u16 *p_vid)

{

	struct bridge_vlan_info vinfo;

	struct net_device *edev;

	u16 pvid;



	if (WARN_ON(br_vlan_get_pvid(br_dev, &pvid)))

		return NULL;

	if (!pvid)

		return NULL;



	edev = br_fdb_find_port(br_dev, dmac, pvid);

	if (!edev)

		return NULL;



	if (br_vlan_get_info(edev, pvid, &vinfo))

		return NULL;

	if (!(vinfo.flags & BRIDGE_VLAN_INFO_UNTAGGED))

		*p_vid = pvid;

	return edev;

}



static struct net_device *

mlxsw_sp_span_entry_bridge_8021d(const struct net_device *br_dev,

				 unsigned char *dmac)

{

	return br_fdb_find_port(br_dev, dmac, 0);

}



static struct net_device *

mlxsw_sp_span_entry_bridge(const struct net_device *br_dev,

			   unsigned char dmac[ETH_ALEN],

			   u16 *p_vid)

{

	struct mlxsw_sp_bridge_port *bridge_port;

	enum mlxsw_reg_spms_state spms_state;

	struct mlxsw_sp_port *port;

	struct net_device *dev;

	u8 stp_state;



	if (br_vlan_enabled(br_dev))

		dev = mlxsw_sp_span_entry_bridge_8021q(br_dev, dmac, p_vid);

	else

		dev = mlxsw_sp_span_entry_bridge_8021d(br_dev, dmac);

	if (!dev)

		return NULL;



	port = mlxsw_sp_port_dev_lower_find(dev);

	if (!port)

		return NULL;



	bridge_port = mlxsw_sp_bridge_port_find(port->mlxsw_sp->bridge, dev);

	if (!bridge_port)

		return NULL;



	stp_state = mlxsw_sp_bridge_port_stp_state(bridge_port);

	spms_state = mlxsw_sp_stp_spms_state(stp_state);

	if (spms_state != MLXSW_REG_SPMS_STATE_FORWARDING)

		return NULL;



	return dev;

}



static __maybe_unused int

mlxsw_sp_span_entry_tunnel_parms_common(struct net_device *l3edev,

					union mlxsw_sp_l3addr saddr,
@@ -177,13 +245,22 @@ mlxsw_sp_span_entry_tunnel_parms_common(struct net_device *l3edev, 
					struct mlxsw_sp_span_parms *sparmsp)

{

	unsigned char dmac[ETH_ALEN];

	u16 vid = 0;



	if (mlxsw_sp_l3addr_is_zero(gw))

		gw = daddr;



	if (!l3edev || !mlxsw_sp_port_dev_check(l3edev) ||

	    mlxsw_sp_span_dmac(tbl, &gw, l3edev, dmac))

		return mlxsw_sp_span_entry_unoffloadable(sparmsp);

	if (!l3edev || mlxsw_sp_span_dmac(tbl, &gw, l3edev, dmac))

		goto unoffloadable;



	if (netif_is_bridge_master(l3edev)) {

		l3edev = mlxsw_sp_span_entry_bridge(l3edev, dmac, &vid);

		if (!l3edev)

			goto unoffloadable;

	}



	if (!mlxsw_sp_port_dev_check(l3edev))

		goto unoffloadable;



	sparmsp->dest_port = netdev_priv(l3edev);

	sparmsp->ttl = ttl;
@@ -191,7 +268,11 @@ mlxsw_sp_span_entry_tunnel_parms_common(struct net_device *l3edev, 
	memcpy(sparmsp->smac, l3edev->dev_addr, ETH_ALEN);

	sparmsp->saddr = saddr;

	sparmsp->daddr = daddr;

	sparmsp->vid = vid;

	return 0;



unoffloadable:

	return mlxsw_sp_span_entry_unoffloadable(sparmsp);

}



#if IS_ENABLED(CONFIG_NET_IPGRE)
@@ -268,9 +349,10 @@ mlxsw_sp_span_entry_gretap4_configure(struct mlxsw_sp_span_entry *span_entry, 
	/* Create a new port analayzer entry for local_port. */

	mlxsw_reg_mpat_pack(mpat_pl, pa_id, local_port, true,

			    MLXSW_REG_MPAT_SPAN_TYPE_REMOTE_ETH_L3);

	mlxsw_reg_mpat_eth_rspan_pack(mpat_pl, sparms.vid);

	mlxsw_reg_mpat_eth_rspan_l2_pack(mpat_pl,

				    MLXSW_REG_MPAT_ETH_RSPAN_VERSION_NO_HEADER,

				    sparms.dmac, false);

				    sparms.dmac, !!sparms.vid);

	mlxsw_reg_mpat_eth_rspan_l3_ipv4_pack(mpat_pl,

					      sparms.ttl, sparms.smac,

					      be32_to_cpu(sparms.saddr.addr4),
@@ -368,9 +450,10 @@ mlxsw_sp_span_entry_gretap6_configure(struct mlxsw_sp_span_entry *span_entry, 
	/* Create a new port analayzer entry for local_port. */

	mlxsw_reg_mpat_pack(mpat_pl, pa_id, local_port, true,

			    MLXSW_REG_MPAT_SPAN_TYPE_REMOTE_ETH_L3);

	mlxsw_reg_mpat_eth_rspan_pack(mpat_pl, sparms.vid);

	mlxsw_reg_mpat_eth_rspan_l2_pack(mpat_pl,

				    MLXSW_REG_MPAT_ETH_RSPAN_VERSION_NO_HEADER,

				    sparms.dmac, false);

				    sparms.dmac, !!sparms.vid);

	mlxsw_reg_mpat_eth_rspan_l3_ipv6_pack(mpat_pl, sparms.ttl, sparms.smac,

					      sparms.saddr.addr6,

					      sparms.daddr.addr6);

drivers/net/ethernet/mellanox/mlxsw/spectrum_span.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ struct mlxsw_sp_span_parms { 
	unsigned char smac[ETH_ALEN];

	union mlxsw_sp_l3addr daddr;

	union mlxsw_sp_l3addr saddr;

	u16 vid;

};



struct mlxsw_sp_span_entry_ops;

drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

+67 −5
Original line number Diff line number Diff line
@@ -49,7 +49,9 @@ 
#include <linux/netlink.h>

#include <net/switchdev.h>



#include "spectrum_span.h"

#include "spectrum_router.h"

#include "spectrum_switchdev.h"

#include "spectrum.h"

#include "core.h"

#include "reg.h"
@@ -239,7 +241,7 @@ __mlxsw_sp_bridge_port_find(const struct mlxsw_sp_bridge_device *bridge_device, 
	return NULL;

}



static struct mlxsw_sp_bridge_port *

struct mlxsw_sp_bridge_port *

mlxsw_sp_bridge_port_find(struct mlxsw_sp_bridge *bridge,

			  struct net_device *brport_dev)

{
@@ -922,6 +924,9 @@ static int mlxsw_sp_port_attr_set(struct net_device *dev, 
		break;

	}



	if (switchdev_trans_ph_commit(trans))

		mlxsw_sp_span_respin(mlxsw_sp_port->mlxsw_sp);



	return err;

}
@@ -1646,18 +1651,57 @@ mlxsw_sp_port_mrouter_update_mdb(struct mlxsw_sp_port *mlxsw_sp_port, 
	}

}



struct mlxsw_sp_span_respin_work {

	struct work_struct work;

	struct mlxsw_sp *mlxsw_sp;

};



static void mlxsw_sp_span_respin_work(struct work_struct *work)

{

	struct mlxsw_sp_span_respin_work *respin_work =

		container_of(work, struct mlxsw_sp_span_respin_work, work);



	rtnl_lock();

	mlxsw_sp_span_respin(respin_work->mlxsw_sp);

	rtnl_unlock();

	kfree(respin_work);

}



static void mlxsw_sp_span_respin_schedule(struct mlxsw_sp *mlxsw_sp)

{

	struct mlxsw_sp_span_respin_work *respin_work;



	respin_work = kzalloc(sizeof(*respin_work), GFP_ATOMIC);

	if (!respin_work)

		return;



	INIT_WORK(&respin_work->work, mlxsw_sp_span_respin_work);

	respin_work->mlxsw_sp = mlxsw_sp;



	mlxsw_core_schedule_work(&respin_work->work);

}



static int mlxsw_sp_port_obj_add(struct net_device *dev,

				 const struct switchdev_obj *obj,

				 struct switchdev_trans *trans)

{

	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);

	const struct switchdev_obj_port_vlan *vlan;

	int err = 0;



	switch (obj->id) {

	case SWITCHDEV_OBJ_ID_PORT_VLAN:

		err = mlxsw_sp_port_vlans_add(mlxsw_sp_port,

					      SWITCHDEV_OBJ_PORT_VLAN(obj),

					      trans);

		vlan = SWITCHDEV_OBJ_PORT_VLAN(obj);

		err = mlxsw_sp_port_vlans_add(mlxsw_sp_port, vlan, trans);



		if (switchdev_trans_ph_commit(trans)) {

			/* The event is emitted before the changes are actually

			 * applied to the bridge. Therefore schedule the respin

			 * call for later, so that the respin logic sees the

			 * updated bridge state.

			 */

			mlxsw_sp_span_respin_schedule(mlxsw_sp_port->mlxsw_sp);

		}

		break;

	case SWITCHDEV_OBJ_ID_PORT_MDB:

		err = mlxsw_sp_port_mdb_add(mlxsw_sp_port,
@@ -1808,6 +1852,8 @@ static int mlxsw_sp_port_obj_del(struct net_device *dev, 
		break;

	}



	mlxsw_sp_span_respin(mlxsw_sp_port->mlxsw_sp);



	return err;

}
@@ -2235,8 +2281,16 @@ static void mlxsw_sp_switchdev_event_work(struct work_struct *work) 
		fdb_info = &switchdev_work->fdb_info;

		mlxsw_sp_port_fdb_set(mlxsw_sp_port, fdb_info, false);

		break;

	case SWITCHDEV_FDB_ADD_TO_BRIDGE: /* fall through */

	case SWITCHDEV_FDB_DEL_TO_BRIDGE:

		/* These events are only used to potentially update an existing

		 * SPAN mirror.

		 */

		break;

	}



	mlxsw_sp_span_respin(mlxsw_sp_port->mlxsw_sp);



out:

	rtnl_unlock();

	kfree(switchdev_work->fdb_info.addr);
@@ -2265,7 +2319,9 @@ static int mlxsw_sp_switchdev_event(struct notifier_block *unused, 


	switch (event) {

	case SWITCHDEV_FDB_ADD_TO_DEVICE: /* fall through */

	case SWITCHDEV_FDB_DEL_TO_DEVICE:

	case SWITCHDEV_FDB_DEL_TO_DEVICE: /* fall through */

	case SWITCHDEV_FDB_ADD_TO_BRIDGE: /* fall through */

	case SWITCHDEV_FDB_DEL_TO_BRIDGE:

		memcpy(&switchdev_work->fdb_info, ptr,

		       sizeof(switchdev_work->fdb_info));

		switchdev_work->fdb_info.addr = kzalloc(ETH_ALEN, GFP_ATOMIC);
@@ -2297,6 +2353,12 @@ static struct notifier_block mlxsw_sp_switchdev_notifier = { 
	.notifier_call = mlxsw_sp_switchdev_event,

};



u8

mlxsw_sp_bridge_port_stp_state(struct mlxsw_sp_bridge_port *bridge_port)

{

	return bridge_port->stp_state;

}



static int mlxsw_sp_fdb_init(struct mlxsw_sp *mlxsw_sp)

{

	struct mlxsw_sp_bridge *bridge = mlxsw_sp->bridge;