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

Commit 52a227b3 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum_switchdev: Handle SWITCHDEV_PORT_OBJ_ADD/_DEL 



Following patches will change the way of distributing port object
changes from a switchdev operation to a switchdev notifier. The
switchdev code currently recursively descends through layers of lower
devices, eventually calling the op on a front-panel port device. The
notifier will instead be sent referencing the bridge port device, which
may be a stacking device that's one of front-panel ports uppers, or a
completely unrelated device.

To handle SWITCHDEV_PORT_OBJ_ADD and _DEL, subscribe to the blocking
notifier chain. Dispatch to mlxsw_sp_port_obj_add() resp. _del() to
maintain the behavior that the switchdev operation based code currently
has. Defer to switchdev_handle_port_obj_add() / _del() to handle the
recursive descend, because mlxsw supports a number of upper types.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f30f0601

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

+44 −1
Original line number Diff line number Diff line
@@ -3118,6 +3118,32 @@ static struct notifier_block mlxsw_sp_switchdev_notifier = { 
	.notifier_call = mlxsw_sp_switchdev_event,

};



static int mlxsw_sp_switchdev_blocking_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_OBJ_ADD:

		err = switchdev_handle_port_obj_add(dev, ptr,

						    mlxsw_sp_port_dev_check,

						    mlxsw_sp_port_obj_add);

		return notifier_from_errno(err);

	case SWITCHDEV_PORT_OBJ_DEL:

		err = switchdev_handle_port_obj_del(dev, ptr,

						    mlxsw_sp_port_dev_check,

						    mlxsw_sp_port_obj_del);

		return notifier_from_errno(err);

	}



	return NOTIFY_DONE;

}



static struct notifier_block mlxsw_sp_switchdev_blocking_notifier = {

	.notifier_call = mlxsw_sp_switchdev_blocking_event,

};



u8

mlxsw_sp_bridge_port_stp_state(struct mlxsw_sp_bridge_port *bridge_port)

{
@@ -3127,6 +3153,7 @@ mlxsw_sp_bridge_port_stp_state(struct mlxsw_sp_bridge_port *bridge_port) 
static int mlxsw_sp_fdb_init(struct mlxsw_sp *mlxsw_sp)

{

	struct mlxsw_sp_bridge *bridge = mlxsw_sp->bridge;

	struct notifier_block *nb;

	int err;



	err = mlxsw_sp_ageing_set(mlxsw_sp, MLXSW_SP_DEFAULT_AGEING_TIME);
@@ -3141,17 +3168,33 @@ static int mlxsw_sp_fdb_init(struct mlxsw_sp *mlxsw_sp) 
		return err;

	}



	nb = &mlxsw_sp_switchdev_blocking_notifier;

	err = register_switchdev_blocking_notifier(nb);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to register switchdev blocking notifier\n");

		goto err_register_switchdev_blocking_notifier;

	}



	INIT_DELAYED_WORK(&bridge->fdb_notify.dw, mlxsw_sp_fdb_notify_work);

	bridge->fdb_notify.interval = MLXSW_SP_DEFAULT_LEARNING_INTERVAL;

	mlxsw_sp_fdb_notify_work_schedule(mlxsw_sp);

	return 0;



err_register_switchdev_blocking_notifier:

	unregister_switchdev_notifier(&mlxsw_sp_switchdev_notifier);

	return err;

}



static void mlxsw_sp_fdb_fini(struct mlxsw_sp *mlxsw_sp)

{

	struct notifier_block *nb;



	cancel_delayed_work_sync(&mlxsw_sp->bridge->fdb_notify.dw);

	unregister_switchdev_notifier(&mlxsw_sp_switchdev_notifier);



	nb = &mlxsw_sp_switchdev_blocking_notifier;

	unregister_switchdev_blocking_notifier(nb);



	unregister_switchdev_notifier(&mlxsw_sp_switchdev_notifier);

}



int mlxsw_sp_switchdev_init(struct mlxsw_sp *mlxsw_sp)