Commit 5e8930aa authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

eth: mlxsw: switch to explicit locking for port registration 



Explicitly lock the devlink instance and use devl_ API.

This will be used by the subsequent patch to invoke
.port_split / .port_unsplit callbacks with devlink
instance lock held.

Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Tested-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 162cca42

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

+2 −2
Original line number Diff line number Diff line
@@ -2983,7 +2983,7 @@ static int __mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u16 local_port, 
	attrs.switch_id.id_len = switch_id_len;

	mlxsw_core_port->local_port = local_port;

	devlink_port_attrs_set(devlink_port, &attrs);

	err = devlink_port_register(devlink, devlink_port, local_port);

	err = devl_port_register(devlink, devlink_port, local_port);

	if (err)

		memset(mlxsw_core_port, 0, sizeof(*mlxsw_core_port));

	return err;
@@ -2995,7 +2995,7 @@ static void __mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u16 local_port 
					&mlxsw_core->ports[local_port];

	struct devlink_port *devlink_port = &mlxsw_core_port->devlink_port;



	devlink_port_unregister(devlink_port);

	devl_port_unregister(devlink_port);

	memset(mlxsw_core_port, 0, sizeof(*mlxsw_core_port));

}

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

+6 −0
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@ static int mlxsw_m_init(struct mlxsw_core *mlxsw_core, 
			struct netlink_ext_ack *extack)

{

	struct mlxsw_m *mlxsw_m = mlxsw_core_driver_priv(mlxsw_core);

	struct devlink *devlink = priv_to_devlink(mlxsw_core);

	int err;



	mlxsw_m->core = mlxsw_core;
@@ -437,7 +438,9 @@ static int mlxsw_m_init(struct mlxsw_core *mlxsw_core, 
		return err;

	}



	devl_lock(devlink);

	err = mlxsw_m_ports_create(mlxsw_m);

	devl_unlock(devlink);

	if (err) {

		dev_err(mlxsw_m->bus_info->dev, "Failed to create ports\n");

		return err;
@@ -449,8 +452,11 @@ static int mlxsw_m_init(struct mlxsw_core *mlxsw_core, 
static void mlxsw_m_fini(struct mlxsw_core *mlxsw_core)

{

	struct mlxsw_m *mlxsw_m = mlxsw_core_driver_priv(mlxsw_core);

	struct devlink *devlink = priv_to_devlink(mlxsw_core);



	devl_lock(devlink);

	mlxsw_m_ports_remove(mlxsw_m);

	devl_unlock(devlink);

}



static const struct mlxsw_config_profile mlxsw_m_config_profile;

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

+14 −0
Original line number Diff line number Diff line
@@ -2025,6 +2025,7 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u16 local_port, 
			       struct netlink_ext_ack *extack)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);

	struct devlink *devlink = priv_to_devlink(mlxsw_core);

	struct mlxsw_sp_port_mapping port_mapping;

	struct mlxsw_sp_port *mlxsw_sp_port;

	enum mlxsw_reg_pmtdb_status status;
@@ -2062,6 +2063,7 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u16 local_port, 


	port_mapping = mlxsw_sp_port->mapping;



	devl_lock(devlink);

	for (i = 0; i < count; i++) {

		u16 s_local_port = mlxsw_reg_pmtdb_port_num_get(pmtdb_pl, i);
@@ -2075,11 +2077,13 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u16 local_port, 
		dev_err(mlxsw_sp->bus_info->dev, "Failed to create split ports\n");

		goto err_port_split_create;

	}

	devl_unlock(devlink);



	return 0;



err_port_split_create:

	mlxsw_sp_port_unsplit_create(mlxsw_sp, count, pmtdb_pl);

	devl_unlock(devlink);

	return err;

}
@@ -2087,6 +2091,7 @@ static int mlxsw_sp_port_unsplit(struct mlxsw_core *mlxsw_core, u16 local_port, 
				 struct netlink_ext_ack *extack)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);

	struct devlink *devlink = priv_to_devlink(mlxsw_core);

	struct mlxsw_sp_port *mlxsw_sp_port;

	char pmtdb_pl[MLXSW_REG_PMTDB_LEN];

	unsigned int count;
@@ -2118,6 +2123,7 @@ static int mlxsw_sp_port_unsplit(struct mlxsw_core *mlxsw_core, u16 local_port, 
		return err;

	}



	devl_lock(devlink);

	for (i = 0; i < count; i++) {

		u16 s_local_port = mlxsw_reg_pmtdb_port_num_get(pmtdb_pl, i);
@@ -2126,6 +2132,7 @@ static int mlxsw_sp_port_unsplit(struct mlxsw_core *mlxsw_core, u16 local_port, 
	}



	mlxsw_sp_port_unsplit_create(mlxsw_sp, count, pmtdb_pl);

	devl_unlock(devlink);



	return 0;

}
@@ -2818,6 +2825,7 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
			 struct netlink_ext_ack *extack)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);

	struct devlink *devlink = priv_to_devlink(mlxsw_core);

	int err;



	mlxsw_sp->core = mlxsw_core;
@@ -2978,7 +2986,9 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
		goto err_sample_trigger_init;

	}



	devl_lock(devlink);

	err = mlxsw_sp_ports_create(mlxsw_sp);

	devl_unlock(devlink);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to create ports\n");

		goto err_ports_create;
@@ -3159,8 +3169,12 @@ static int mlxsw_sp4_init(struct mlxsw_core *mlxsw_core, 
static void mlxsw_sp_fini(struct mlxsw_core *mlxsw_core)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);

	struct devlink *devlink = priv_to_devlink(mlxsw_core);



	devl_lock(devlink);

	mlxsw_sp_ports_remove(mlxsw_sp);

	devl_unlock(devlink);



	rhashtable_destroy(&mlxsw_sp->sample_trigger_ht);

	mlxsw_sp_port_module_info_fini(mlxsw_sp);

	mlxsw_sp_dpipe_fini(mlxsw_sp);