Commit 9e7c5752 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bridge-vlan-notify' 



Petr Machata says:

====================
net: bridge: Notify about bridge VLANs

In commit 946a11e7 ("mlxsw: spectrum_span: Allow bridge for gretap
mirror"), mlxsw got support for offloading mirror-to-gretap such that
the underlay packet path involves a bridge. In that case, the offload is
also influenced by PVID setting of said bridge. However, changes to VLAN
configuration of the bridge itself do not generate switchdev
notifications, so there's no mechanism to prod mlxsw to update the
offload when these settings change.

In this patchset, the problem is resolved by distributing the switchdev
notification SWITCHDEV_OBJ_ID_PORT_VLAN also for configuration changes
on bridge VLANs. Since stacked devices distribute the notification to
lower devices, such event eventually reaches the driver, which can
determine whether it's a bridge or port VLAN by inspecting orig_dev.

To keep things consistent, the newly-distributed notifications observe
the same protocol as the existing ones: dual prepare/commit, with
-EOPNOTSUPP indicating lack of support, even though there's currently
nothing to prepare for and nothing to support. Correspondingly, all
switchdev drivers have been updated to return -EOPNOTSUPP for bridge
VLAN notifications.

In patches #1 and #2, the code base is changed to support the following
additions: functions br_switchdev_port_vlan_add() and
br_switchdev_port_vlan_del() are introduced to simplify sending
notifications; and br_vlan_add_existing() is introduced to later make it
simpler to add error-handling code for the case of configuring a
preexisting VLAN on bridge CPU port.

In patches #3-#6, respectively for mlxsw, rocker, DSA and DPAA2 ethsw,
the new notifications (which are not enabled yet) are ignored to
maintain the current behavior.

In patch #7, the notification is actually enabled.

In patch #8, mlxsw is changed to update offloads of mirror-to-gre also
for bridge-related notifications.

Changes from v3 to v4:

- In patch #1, separate variable declarations from program logic.
- Add patch #2.
- In patch #7, add error handling around a newly-introduced call to
  br_switchdev_port_vlan_add().
- Rephrase commit messages of patches #3-#6 to explain motivation for
  the change.

Changes from v2 to v3:

- Add a fallback definition for br_switchdev_port_obj_add() and
  br_switchdev_port_obj_del() when !CONFIG_NET_SWITCHDEV.

Changes from v1 to v2:

- Rename br_switchdev_port_obj_add() and br_switchdev_port_obj_del() to
  br_switchdev_port_vlan_add() and br_switchdev_port_vlan_del(), and
  move from br_vlan.c to br_switchdev.c.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 32d26a68 7edcb8ec

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

+7 −1
Original line number Diff line number Diff line
@@ -1144,6 +1144,9 @@ static int mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port, 
	struct mlxsw_sp_bridge_port *bridge_port;

	u16 vid;



	if (netif_is_bridge_master(orig_dev))

		return -EOPNOTSUPP;



	if (switchdev_trans_ph_prepare(trans))

		return 0;
@@ -1694,7 +1697,7 @@ static int mlxsw_sp_port_obj_add(struct net_device *dev, 
		vlan = SWITCHDEV_OBJ_PORT_VLAN(obj);

		err = mlxsw_sp_port_vlans_add(mlxsw_sp_port, vlan, trans);



		if (switchdev_trans_ph_commit(trans)) {

		if (switchdev_trans_ph_prepare(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
@@ -1741,6 +1744,9 @@ static int mlxsw_sp_port_vlans_del(struct mlxsw_sp_port *mlxsw_sp_port, 
	struct mlxsw_sp_bridge_port *bridge_port;

	u16 vid;



	if (netif_is_bridge_master(orig_dev))

		return -EOPNOTSUPP;



	bridge_port = mlxsw_sp_bridge_port_find(mlxsw_sp->bridge, orig_dev);

	if (WARN_ON(!bridge_port))

		return -EINVAL;

drivers/net/ethernet/rocker/rocker_main.c

+6 −0
Original line number Diff line number Diff line
@@ -1632,6 +1632,9 @@ rocker_world_port_obj_vlan_add(struct rocker_port *rocker_port, 
{

	struct rocker_world_ops *wops = rocker_port->rocker->wops;



	if (netif_is_bridge_master(vlan->obj.orig_dev))

		return -EOPNOTSUPP;



	if (!wops->port_obj_vlan_add)

		return -EOPNOTSUPP;
@@ -1647,6 +1650,9 @@ rocker_world_port_obj_vlan_del(struct rocker_port *rocker_port, 
{

	struct rocker_world_ops *wops = rocker_port->rocker->wops;



	if (netif_is_bridge_master(vlan->obj.orig_dev))

		return -EOPNOTSUPP;



	if (!wops->port_obj_vlan_del)

		return -EOPNOTSUPP;

	return wops->port_obj_vlan_del(rocker_port, vlan);

drivers/staging/fsl-dpaa2/ethsw/ethsw.c

+6 −0
Original line number Diff line number Diff line
@@ -719,6 +719,9 @@ static int port_vlans_add(struct net_device *netdev, 
	struct ethsw_port_priv *port_priv = netdev_priv(netdev);

	int vid, err;



	if (netif_is_bridge_master(vlan->obj.orig_dev))

		return -EOPNOTSUPP;



	if (switchdev_trans_ph_prepare(trans))

		return 0;
@@ -873,6 +876,9 @@ static int port_vlans_del(struct net_device *netdev, 
	struct ethsw_port_priv *port_priv = netdev_priv(netdev);

	int vid, err;



	if (netif_is_bridge_master(vlan->obj.orig_dev))

		return -EOPNOTSUPP;



	for (vid = vlan->vid_begin; vid <= vlan->vid_end; vid++) {

		err = ethsw_port_del_vlan(port_priv, vid);

		if (err)

net/bridge/br_private.h

+13 −0
Original line number Diff line number Diff line
@@ -1139,6 +1139,8 @@ int br_switchdev_set_port_flag(struct net_bridge_port *p, 
			       unsigned long mask);

void br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb,

			     int type);

int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid, u16 flags);

int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid);



static inline void br_switchdev_frame_unmark(struct sk_buff *skb)

{
@@ -1168,6 +1170,17 @@ static inline int br_switchdev_set_port_flag(struct net_bridge_port *p, 
	return 0;

}



static inline int br_switchdev_port_vlan_add(struct net_device *dev,

					     u16 vid, u16 flags)

{

	return -EOPNOTSUPP;

}



static inline int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid)

{

	return -EOPNOTSUPP;

}



static inline void

br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb, int type)

{

net/bridge/br_switchdev.c

+25 −0
Original line number Diff line number Diff line
@@ -136,3 +136,28 @@ br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb, int type) 
		break;

	}

}



int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid, u16 flags)

{

	struct switchdev_obj_port_vlan v = {

		.obj.orig_dev = dev,

		.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,

		.flags = flags,

		.vid_begin = vid,

		.vid_end = vid,

	};



	return switchdev_port_obj_add(dev, &v.obj);

}



int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid)

{

	struct switchdev_obj_port_vlan v = {

		.obj.orig_dev = dev,

		.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,

		.vid_begin = vid,

		.vid_end = vid,

	};



	return switchdev_port_obj_del(dev, &v.obj);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE