Commit 1c5cc012 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'devlink-linecard-and-reporters-locking-cleanup' 

Jiri Pirko says:

====================
devlink: linecard and reporters locking cleanup

This patchset does not change functionality.

Patches 1-2 remove linecards lock and reference counting, converting
them to be protected by devlink instance lock as the rest of
the objects.

Patches 3-4 fix the mlx5 auxiliary device devlink locking scheme whis is
needed for proper reporters lock conversion done in the following
patches.

Patches 5-8 remove reporters locks and reference counting, converting
them to be protected by devlink instance lock as the rest of
the objects.

Patches 9 and 10 convert linecards and reporters dumpit callbacks to
recently introduced devlink_nl_instance_iter_dump() infra.

Patch 11 removes no longer needed devlink_dump_for_each_instance_get()
helper.

The last patch adds assertion to devl_is_registered() as dependency on
other locks is removed.
====================

Link: https://lore.kernel.org/r/20230118152115.1113149-1-jiri@resnulli.us


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 854617f5 63ba54a5

drivers/net/ethernet/mellanox/mlx5/core/dev.c

+2 −12
Original line number Diff line number Diff line
@@ -349,7 +349,6 @@ int mlx5_attach_device(struct mlx5_core_dev *dev) 
	devl_assert_locked(priv_to_devlink(dev));

	mutex_lock(&mlx5_intf_mutex);

	priv->flags &= ~MLX5_PRIV_FLAGS_DETACH;

	priv->flags |= MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;

	for (i = 0; i < ARRAY_SIZE(mlx5_adev_devices); i++) {

		if (!priv->adev[i]) {

			bool is_supported = false;
@@ -397,7 +396,6 @@ int mlx5_attach_device(struct mlx5_core_dev *dev) 
			break;

		}

	}

	priv->flags &= ~MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;

	mutex_unlock(&mlx5_intf_mutex);

	return ret;

}
@@ -412,7 +410,6 @@ void mlx5_detach_device(struct mlx5_core_dev *dev) 


	devl_assert_locked(priv_to_devlink(dev));

	mutex_lock(&mlx5_intf_mutex);

	priv->flags |= MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;

	for (i = ARRAY_SIZE(mlx5_adev_devices) - 1; i >= 0; i--) {

		if (!priv->adev[i])

			continue;
@@ -441,7 +438,6 @@ void mlx5_detach_device(struct mlx5_core_dev *dev) 
		del_adev(&priv->adev[i]->adev);

		priv->adev[i] = NULL;

	}

	priv->flags &= ~MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;

	priv->flags |= MLX5_PRIV_FLAGS_DETACH;

	mutex_unlock(&mlx5_intf_mutex);

}
@@ -540,22 +536,16 @@ static void delete_drivers(struct mlx5_core_dev *dev) 
int mlx5_rescan_drivers_locked(struct mlx5_core_dev *dev)

{

	struct mlx5_priv *priv = &dev->priv;

	int err = 0;



	lockdep_assert_held(&mlx5_intf_mutex);

	if (priv->flags & MLX5_PRIV_FLAGS_DETACH)

		return 0;



	priv->flags |= MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;

	delete_drivers(dev);

	if (priv->flags & MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV)

		goto out;



	err = add_drivers(dev);

		return 0;



out:

	priv->flags &= ~MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;

	return err;

	return add_drivers(dev);

}



bool mlx5_same_hw_devs(struct mlx5_core_dev *dev, struct mlx5_core_dev *peer_dev)

drivers/net/ethernet/mellanox/mlx5/core/en.h

+4 −0
Original line number Diff line number Diff line
@@ -971,6 +971,10 @@ struct mlx5e_priv { 
	struct dentry             *dfs_root;

};



struct mlx5e_dev {

	struct mlx5e_priv *priv;

};



struct mlx5e_rx_handlers {

	mlx5e_fp_handle_rx_cqe handle_rx_cqe;

	mlx5e_fp_handle_rx_cqe handle_rx_cqe_mpwqe;

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

+28 −16
Original line number Diff line number Diff line
@@ -4,6 +4,29 @@ 
#include "en/devlink.h"

#include "eswitch.h"



static const struct devlink_ops mlx5e_devlink_ops = {

};



struct mlx5e_dev *mlx5e_create_devlink(struct device *dev)

{

	struct mlx5e_dev *mlx5e_dev;

	struct devlink *devlink;



	devlink = devlink_alloc(&mlx5e_devlink_ops, sizeof(*mlx5e_dev), dev);

	if (!devlink)

		return ERR_PTR(-ENOMEM);

	devlink_register(devlink);

	return devlink_priv(devlink);

}



void mlx5e_destroy_devlink(struct mlx5e_dev *mlx5e_dev)

{

	struct devlink *devlink = priv_to_devlink(mlx5e_dev);



	devlink_unregister(devlink);

	devlink_free(devlink);

}



static void

mlx5e_devlink_get_port_parent_id(struct mlx5_core_dev *dev, struct netdev_phys_item_id *ppid)

{
@@ -14,14 +37,14 @@ mlx5e_devlink_get_port_parent_id(struct mlx5_core_dev *dev, struct netdev_phys_i 
	memcpy(ppid->id, &parent_id, sizeof(parent_id));

}



int mlx5e_devlink_port_register(struct mlx5e_priv *priv)

int mlx5e_devlink_port_register(struct mlx5e_dev *mlx5e_dev,

				struct mlx5e_priv *priv)

{

	struct devlink *devlink = priv_to_devlink(priv->mdev);

	struct devlink *devlink = priv_to_devlink(mlx5e_dev);

	struct devlink_port_attrs attrs = {};

	struct netdev_phys_item_id ppid = {};

	struct devlink_port *dl_port;

	unsigned int dl_port_index;

	int ret;



	if (mlx5_core_is_pf(priv->mdev)) {

		attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;
@@ -42,23 +65,12 @@ int mlx5e_devlink_port_register(struct mlx5e_priv *priv) 
	memset(dl_port, 0, sizeof(*dl_port));

	devlink_port_attrs_set(dl_port, &attrs);



	if (!(priv->mdev->priv.flags & MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW))

		devl_lock(devlink);

	ret = devl_port_register(devlink, dl_port, dl_port_index);

	if (!(priv->mdev->priv.flags & MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW))

		devl_unlock(devlink);



	return ret;

	return devlink_port_register(devlink, dl_port, dl_port_index);

}



void mlx5e_devlink_port_unregister(struct mlx5e_priv *priv)

{

	struct devlink_port *dl_port = mlx5e_devlink_get_dl_port(priv);

	struct devlink *devlink = priv_to_devlink(priv->mdev);



	if (!(priv->mdev->priv.flags & MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW))

		devl_lock(devlink);

	devl_port_unregister(dl_port);

	if (!(priv->mdev->priv.flags & MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW))

		devl_unlock(devlink);

	devlink_port_unregister(dl_port);

}

drivers/net/ethernet/mellanox/mlx5/core/en/devlink.h

+4 −1
Original line number Diff line number Diff line
@@ -7,7 +7,10 @@ 
#include <net/devlink.h>

#include "en.h"



int mlx5e_devlink_port_register(struct mlx5e_priv *priv);

struct mlx5e_dev *mlx5e_create_devlink(struct device *dev);

void mlx5e_destroy_devlink(struct mlx5e_dev *mlx5e_dev);

int mlx5e_devlink_port_register(struct mlx5e_dev *mlx5e_dev,

				struct mlx5e_priv *priv);

void mlx5e_devlink_port_unregister(struct mlx5e_priv *priv);



static inline struct devlink_port *

drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -754,6 +754,6 @@ void mlx5e_reporter_rx_destroy(struct mlx5e_priv *priv) 
	if (!priv->rx_reporter)

		return;



	devlink_port_health_reporter_destroy(priv->rx_reporter);

	devlink_health_reporter_destroy(priv->rx_reporter);

	priv->rx_reporter = NULL;

}