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

Commit 8f4ef499 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-Remove-switchdev_ops' 



Florian Fainelli says:

====================
net: Remove switchdev_ops

This patch series completes the removal of the switchdev_ops by
converting switchdev_port_attr_set() to use either the blocking
(process) or non-blocking (atomic) notifier since we typically need to
deal with both depending on where in the bridge code we get called from.

This was tested with the forwarding selftests and DSA hardware.

Ido, hopefully this captures your comments done on v1, if not, can you
illustrate with some pseudo-code what you had in mind if that's okay?

Changes in v3:

- added Reviewed-by tags from Ido where relevant
- added missing notifier_to_errno() in net/bridge/br_switchdev.c when
  calling the atomic notifier for PRE_BRIDGE_FLAGS
- kept mlxsw_sp_switchdev_init() in mlxsw/

Changes in v2:

- do not check for SWITCHDEV_F_DEFER when calling the blocking notifier
  and instead directly call the atomic notifier from the single location
  where this is required
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1d997875 3d705f07

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

+0 −3
Original line number Diff line number Diff line
@@ -3660,7 +3660,6 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	}

	mlxsw_sp_port->default_vlan = mlxsw_sp_port_vlan;



	mlxsw_sp_port_switchdev_init(mlxsw_sp_port);

	mlxsw_sp->ports[local_port] = mlxsw_sp_port;

	err = register_netdev(dev);

	if (err) {
@@ -3677,7 +3676,6 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 


err_register_netdev:

	mlxsw_sp->ports[local_port] = NULL;

	mlxsw_sp_port_switchdev_fini(mlxsw_sp_port);

	mlxsw_sp_port_vlan_destroy(mlxsw_sp_port_vlan);

err_port_vlan_create:

err_port_pvid_set:
@@ -3720,7 +3718,6 @@ static void mlxsw_sp_port_remove(struct mlxsw_sp *mlxsw_sp, u8 local_port) 
	mlxsw_core_port_clear(mlxsw_sp->core, local_port, mlxsw_sp);

	unregister_netdev(mlxsw_sp_port->dev); /* This calls ndo_stop */

	mlxsw_sp->ports[local_port] = NULL;

	mlxsw_sp_port_switchdev_fini(mlxsw_sp_port);

	mlxsw_sp_port_vlan_flush(mlxsw_sp_port, true);

	mlxsw_sp_port_nve_fini(mlxsw_sp_port);

	mlxsw_sp_tc_qdisc_fini(mlxsw_sp_port);

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

+0 −2
Original line number Diff line number Diff line
@@ -407,8 +407,6 @@ extern const struct mlxsw_sp_sb_vals mlxsw_sp2_sb_vals; 
/* spectrum_switchdev.c */

int mlxsw_sp_switchdev_init(struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_switchdev_fini(struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_port_switchdev_init(struct mlxsw_sp_port *mlxsw_sp_port);

void mlxsw_sp_port_switchdev_fini(struct mlxsw_sp_port *mlxsw_sp_port);

int mlxsw_sp_rif_fdb_op(struct mlxsw_sp *mlxsw_sp, const char *mac, u16 fid,

			bool adding);

void

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

+12 −12
Original line number Diff line number Diff line
@@ -1938,10 +1938,6 @@ static struct mlxsw_sp_port *mlxsw_sp_lag_rep_port(struct mlxsw_sp *mlxsw_sp, 
	return NULL;

}



static const struct switchdev_ops mlxsw_sp_port_switchdev_ops = {

	.switchdev_port_attr_set	= mlxsw_sp_port_attr_set,

};



static int

mlxsw_sp_bridge_8021q_port_join(struct mlxsw_sp_bridge_device *bridge_device,

				struct mlxsw_sp_bridge_port *bridge_port,
@@ -3123,6 +3119,13 @@ static int mlxsw_sp_switchdev_event(struct notifier_block *unused, 
	struct net_device *br_dev;

	int err;



	if (event == SWITCHDEV_PORT_ATTR_SET) {

		err = switchdev_handle_port_attr_set(dev, ptr,

						     mlxsw_sp_port_dev_check,

						     mlxsw_sp_port_attr_set);

		return notifier_from_errno(err);

	}



	/* Tunnel devices are not our uppers, so check their master instead */

	br_dev = netdev_master_upper_dev_get_rcu(dev);

	if (!br_dev)
@@ -3446,6 +3449,11 @@ static int mlxsw_sp_switchdev_blocking_event(struct notifier_block *unused, 
							mlxsw_sp_port_dev_check,

							mlxsw_sp_port_obj_del);

		return notifier_from_errno(err);

	case SWITCHDEV_PORT_ATTR_SET:

		err = switchdev_handle_port_attr_set(dev, ptr,

						     mlxsw_sp_port_dev_check,

						     mlxsw_sp_port_attr_set);

		return notifier_from_errno(err);

	}



	return NOTIFY_DONE;
@@ -3533,11 +3541,3 @@ void mlxsw_sp_switchdev_fini(struct mlxsw_sp *mlxsw_sp) 
	kfree(mlxsw_sp->bridge);

}

void mlxsw_sp_port_switchdev_init(struct mlxsw_sp_port *mlxsw_sp_port)

{

	mlxsw_sp_port->dev->switchdev_ops = &mlxsw_sp_port_switchdev_ops;

}



void mlxsw_sp_port_switchdev_fini(struct mlxsw_sp_port *mlxsw_sp_port)

{

}

drivers/net/ethernet/mscc/ocelot.c

+27 −5
Original line number Diff line number Diff line
@@ -1324,10 +1324,6 @@ static int ocelot_port_obj_del(struct net_device *dev, 
	return ret;

}



static const struct switchdev_ops ocelot_port_switchdev_ops = {

	.switchdev_port_attr_set	= ocelot_port_attr_set,

};



static int ocelot_port_bridge_join(struct ocelot_port *ocelot_port,

				   struct net_device *bridge)

{
@@ -1582,6 +1578,28 @@ struct notifier_block ocelot_netdevice_nb __read_mostly = { 
};

EXPORT_SYMBOL(ocelot_netdevice_nb);



static int ocelot_switchdev_event(struct notifier_block *unused,

				  unsigned long event, void *ptr)

{

	struct net_device *dev = switchdev_notifier_info_to_dev(ptr);

	int err;



	switch (event) {

	case SWITCHDEV_PORT_ATTR_SET:

		err = switchdev_handle_port_attr_set(dev, ptr,

						     ocelot_netdevice_dev_check,

						     ocelot_port_attr_set);

		return notifier_from_errno(err);

	}



	return NOTIFY_DONE;

}



struct notifier_block ocelot_switchdev_nb __read_mostly = {

	.notifier_call = ocelot_switchdev_event,

};

EXPORT_SYMBOL(ocelot_switchdev_nb);



static int ocelot_switchdev_blocking_event(struct notifier_block *unused,

					   unsigned long event, void *ptr)

{
@@ -1600,6 +1618,11 @@ static int ocelot_switchdev_blocking_event(struct notifier_block *unused, 
						    ocelot_netdevice_dev_check,

						    ocelot_port_obj_del);

		return notifier_from_errno(err);

	case SWITCHDEV_PORT_ATTR_SET:

		err = switchdev_handle_port_attr_set(dev, ptr,

						     ocelot_netdevice_dev_check,

						     ocelot_port_attr_set);

		return notifier_from_errno(err);

	}



	return NOTIFY_DONE;
@@ -1633,7 +1656,6 @@ int ocelot_probe_port(struct ocelot *ocelot, u8 port, 


	dev->netdev_ops = &ocelot_port_netdev_ops;

	dev->ethtool_ops = &ocelot_ethtool_ops;

	dev->switchdev_ops = &ocelot_port_switchdev_ops;



	dev->hw_features |= NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_RXFCS;

	dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;

drivers/net/ethernet/mscc/ocelot.h

+1 −0
Original line number Diff line number Diff line
@@ -499,6 +499,7 @@ int ocelot_probe_port(struct ocelot *ocelot, u8 port, 
		      struct phy_device *phy);



extern struct notifier_block ocelot_netdevice_nb;

extern struct notifier_block ocelot_switchdev_nb;

extern struct notifier_block ocelot_switchdev_blocking_nb;



#endif