Commit da212bd2 authored by Moshe Shemesh's avatar Moshe Shemesh Committed by Paolo Abeni
Browse files

net/mlx5: Use devl_ API in mlx5_esw_devlink_sf_port_register 



The function mlx5_esw_devlink_sf_port_register() calls
devlink_port_register() and devlink_rate_leaf_create(). Use devl_ API to
call devl_port_register() and devl_rate_leaf_create() accordingly and
add devlink instance lock in driver paths to this function.

Similarly, use devl_ API to call devl_port_unregister() and
devl_rate_leaf_destroy() in mlx5_esw_devlink_sf_port_unregister() and
ensure locking devlink instance lock on all the paths to this function
too.

This will be used by the downstream patch to invoke
mlx5_devlink_eswitch_mode_set() with devlink lock held.

Note this patch is taking devlink lock on mlx5_devlink_sf_port_new/del()
which are devlink callbacks for port_new/del(). We will take these locks
off once these callbacks will be locked by devlink too.

Signed-off-by: default avatarMoshe Shemesh <moshe@nvidia.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent f1bc646c

drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c

+5 −5
Original line number Diff line number Diff line
@@ -156,11 +156,11 @@ int mlx5_esw_devlink_sf_port_register(struct mlx5_eswitch *esw, struct devlink_p 
	devlink_port_attrs_pci_sf_set(dl_port, controller, pfnum, sfnum, !!controller);

	devlink = priv_to_devlink(dev);

	dl_port_index = mlx5_esw_vport_to_devlink_port_index(dev, vport_num);

	err = devlink_port_register(devlink, dl_port, dl_port_index);

	err = devl_port_register(devlink, dl_port, dl_port_index);

	if (err)

		return err;



	err = devlink_rate_leaf_create(dl_port, vport);

	err = devl_rate_leaf_create(dl_port, vport);

	if (err)

		goto rate_err;
@@ -168,7 +168,7 @@ int mlx5_esw_devlink_sf_port_register(struct mlx5_eswitch *esw, struct devlink_p 
	return 0;



rate_err:

	devlink_port_unregister(dl_port);

	devl_port_unregister(dl_port);

	return err;

}
@@ -182,9 +182,9 @@ void mlx5_esw_devlink_sf_port_unregister(struct mlx5_eswitch *esw, u16 vport_num 


	if (vport->dl_port->devlink_rate) {

		mlx5_esw_qos_vport_update_group(esw, vport, NULL, NULL);

		devlink_rate_leaf_destroy(vport->dl_port);

		devl_rate_leaf_destroy(vport->dl_port);

	}



	devlink_port_unregister(vport->dl_port);

	devl_port_unregister(vport->dl_port);

	vport->dl_port = NULL;

}

drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c

+4 −0
Original line number Diff line number Diff line
@@ -355,7 +355,9 @@ int mlx5_devlink_sf_port_new(struct devlink *devlink, 
				   "Port add is only supported in eswitch switchdev mode or SF ports are disabled.");

		return -EOPNOTSUPP;

	}

	devl_lock(devlink);

	err = mlx5_sf_add(dev, table, new_attr, extack, new_port_index);

	devl_unlock(devlink);

	mlx5_sf_table_put(table);

	return err;

}
@@ -400,7 +402,9 @@ int mlx5_devlink_sf_port_del(struct devlink *devlink, unsigned int port_index, 
		goto sf_err;

	}



	devl_lock(devlink);

	mlx5_esw_offloads_sf_vport_disable(esw, sf->hw_fn_id);

	devl_unlock(devlink);

	mlx5_sf_id_erase(table, sf);



	mutex_lock(&table->sf_state_lock);