Commit d1c9cffe authored by Cosmin Ratiu's avatar Cosmin Ratiu Committed by Jakub Kicinski
Browse files

net/mlx5: hw counters: Remove mlx5_fc_create_ex 



It no longer serves any purpose and is identical to mlx5_fc_create upon
which it was originally based of.

Signed-off-by: default avatarCosmin Ratiu <cratiu@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20241001103709.58127-7-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4a67ebf8

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

+1 −1
Original line number Diff line number Diff line
@@ -1026,7 +1026,7 @@ mlx5_tc_ct_counter_create(struct mlx5_tc_ct_priv *ct_priv) 
		return ERR_PTR(-ENOMEM);



	counter->is_shared = false;

	counter->counter = mlx5_fc_create_ex(ct_priv->dev, true);

	counter->counter = mlx5_fc_create(ct_priv->dev, true);

	if (IS_ERR(counter->counter)) {

		ct_dbg("Failed to create counter for ct entry");

		ret = PTR_ERR(counter->counter);

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

+1 −6
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static struct mlx5_fc *mlx5_fc_acquire(struct mlx5_core_dev *dev, bool aging) 
	return mlx5_fc_single_alloc(dev);

}



struct mlx5_fc *mlx5_fc_create_ex(struct mlx5_core_dev *dev, bool aging)

struct mlx5_fc *mlx5_fc_create(struct mlx5_core_dev *dev, bool aging)

{

	struct mlx5_fc *counter = mlx5_fc_acquire(dev, aging);

	struct mlx5_fc_stats *fc_stats = dev->priv.fc_stats;
@@ -304,11 +304,6 @@ struct mlx5_fc *mlx5_fc_create_ex(struct mlx5_core_dev *dev, bool aging) 
	mlx5_fc_release(dev, counter);

	return ERR_PTR(err);

}



struct mlx5_fc *mlx5_fc_create(struct mlx5_core_dev *dev, bool aging)

{

	return mlx5_fc_create_ex(dev, aging);

}

EXPORT_SYMBOL(mlx5_fc_create);



u32 mlx5_fc_id(struct mlx5_fc *counter)

include/linux/mlx5/fs.h

+0 −3
Original line number Diff line number Diff line
@@ -298,9 +298,6 @@ int mlx5_modify_rule_destination(struct mlx5_flow_handle *handler, 


struct mlx5_fc *mlx5_fc_create(struct mlx5_core_dev *dev, bool aging);



/* As mlx5_fc_create() but doesn't queue stats refresh thread. */

struct mlx5_fc *mlx5_fc_create_ex(struct mlx5_core_dev *dev, bool aging);



void mlx5_fc_destroy(struct mlx5_core_dev *dev, struct mlx5_fc *counter);

u64 mlx5_fc_query_lastuse(struct mlx5_fc *counter);

void mlx5_fc_query_cached(struct mlx5_fc *counter,