Commit 8112d5f6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mlx5-cleanups-2025-03-19' 

Tariq Toukan says:

====================
mlx5 cleanups 2025-03-19

This series contains small cleanups to the mlx5 core and Eth drivers.
====================

Link: https://patch.msgid.link/1742412199-159596-1-git-send-email-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c3ad9d9e cba38d12

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ config MLX5_CORE_EN 
	bool "Mellanox 5th generation network adapters (ConnectX series) Ethernet support"

	depends on NETDEVICES && ETHERNET && INET && PCI && MLX5_CORE

	select PAGE_POOL

	select PAGE_POOL_STATS

	select DIMLIB

	help

	  Ethernet support in Mellanox Technologies ConnectX-4 NIC.

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

+3 −6
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ static void mlx5e_tc_tun_route_attr_cleanup(struct mlx5e_tc_tun_route_attr *attr 
{

	if (attr->n)

		neigh_release(attr->n);

	if (attr->route_dev)

	dev_put(attr->route_dev);

}
@@ -68,7 +67,6 @@ static int get_route_and_out_devs(struct mlx5e_priv *priv, 
	 * while holding rcu read lock. Take the net_device for correctness

	 * sake.

	 */

	if (uplink_upper)

	dev_hold(uplink_upper);

	rcu_read_unlock();
@@ -76,7 +74,6 @@ static int get_route_and_out_devs(struct mlx5e_priv *priv, 
			  netif_is_lag_master(uplink_upper) &&

			  real_dev == uplink_upper &&

			  mlx5_lag_is_sriov(priv->mdev));

	if (uplink_upper)

	dev_put(uplink_upper);



	/* if the egress device isn't on the same HW e-switch or

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

+3 −6
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ static int mlx5e_set_int_port_tunnel(struct mlx5e_priv *priv, 
						&attr->action, out_index);



out:

	if (route_dev)

	dev_put(route_dev);



	return err;
@@ -753,7 +752,6 @@ static int mlx5e_set_vf_tunnel(struct mlx5_eswitch *esw, 
	}



out:

	if (route_dev)

	dev_put(route_dev);

	return err;

}
@@ -788,7 +786,6 @@ static int mlx5e_update_vf_tunnel(struct mlx5_eswitch *esw, 
	mlx5e_tc_match_to_reg_mod_hdr_change(esw->dev, mod_hdr_acts, VPORT_TO_REG, act_id, data);



out:

	if (route_dev)

	dev_put(route_dev);

	return err;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static int mlx5e_rq_shampo_hd_info_alloc(struct mlx5e_rq *rq, int node) 
	return 0;



err_nomem:

	kvfree(shampo->bitmap);

	bitmap_free(shampo->bitmap);

	kvfree(shampo->pages);



	return -ENOMEM;
@@ -367,7 +367,7 @@ static int mlx5e_rq_shampo_hd_info_alloc(struct mlx5e_rq *rq, int node) 


static void mlx5e_rq_shampo_hd_info_free(struct mlx5e_rq *rq)

{

	kvfree(rq->mpwqe.shampo->bitmap);

	bitmap_free(rq->mpwqe.shampo->bitmap);

	kvfree(rq->mpwqe.shampo->pages);

}

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

+0 −14
Original line number Diff line number Diff line
@@ -37,9 +37,7 @@ 
#include "en/ptp.h"

#include "en/port.h"



#ifdef CONFIG_PAGE_POOL_STATS

#include <net/page_pool/helpers.h>

#endif



void mlx5e_ethtool_put_stat(u64 **data, u64 val)

{
@@ -196,7 +194,6 @@ static const struct counter_desc sw_stats_desc[] = { 
	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_arfs_err) },

#endif

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_recover) },

#ifdef CONFIG_PAGE_POOL_STATS

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_alloc_fast) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_alloc_slow) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_alloc_slow_high_order) },
@@ -208,7 +205,6 @@ static const struct counter_desc sw_stats_desc[] = { 
	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_recycle_ring) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_recycle_ring_full) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_recycle_released_ref) },

#endif

#ifdef CONFIG_MLX5_EN_TLS

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_tls_decrypted_packets) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_tls_decrypted_bytes) },
@@ -377,7 +373,6 @@ static void mlx5e_stats_grp_sw_update_stats_rq_stats(struct mlx5e_sw_stats *s, 
	s->rx_arfs_err                += rq_stats->arfs_err;

#endif

	s->rx_recover                 += rq_stats->recover;

#ifdef CONFIG_PAGE_POOL_STATS

	s->rx_pp_alloc_fast          += rq_stats->pp_alloc_fast;

	s->rx_pp_alloc_slow          += rq_stats->pp_alloc_slow;

	s->rx_pp_alloc_empty         += rq_stats->pp_alloc_empty;
@@ -389,7 +384,6 @@ static void mlx5e_stats_grp_sw_update_stats_rq_stats(struct mlx5e_sw_stats *s, 
	s->rx_pp_recycle_ring			+= rq_stats->pp_recycle_ring;

	s->rx_pp_recycle_ring_full		+= rq_stats->pp_recycle_ring_full;

	s->rx_pp_recycle_released_ref		+= rq_stats->pp_recycle_released_ref;

#endif

#ifdef CONFIG_MLX5_EN_TLS

	s->rx_tls_decrypted_packets   += rq_stats->tls_decrypted_packets;

	s->rx_tls_decrypted_bytes     += rq_stats->tls_decrypted_bytes;
@@ -496,7 +490,6 @@ static void mlx5e_stats_grp_sw_update_stats_qos(struct mlx5e_priv *priv, 
	}

}



#ifdef CONFIG_PAGE_POOL_STATS

static void mlx5e_stats_update_stats_rq_page_pool(struct mlx5e_channel *c)

{

	struct mlx5e_rq_stats *rq_stats = c->rq.stats;
@@ -519,11 +512,6 @@ static void mlx5e_stats_update_stats_rq_page_pool(struct mlx5e_channel *c) 
	rq_stats->pp_recycle_ring_full = stats.recycle_stats.ring_full;

	rq_stats->pp_recycle_released_ref = stats.recycle_stats.released_refcnt;

}

#else

static void mlx5e_stats_update_stats_rq_page_pool(struct mlx5e_channel *c)

{

}

#endif



static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(sw)

{
@@ -2131,7 +2119,6 @@ static const struct counter_desc rq_stats_desc[] = { 
	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, arfs_err) },

#endif

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, recover) },

#ifdef CONFIG_PAGE_POOL_STATS

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_alloc_fast) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_alloc_slow) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_alloc_slow_high_order) },
@@ -2143,7 +2130,6 @@ static const struct counter_desc rq_stats_desc[] = { 
	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_recycle_ring) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_recycle_ring_full) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_recycle_released_ref) },

#endif

#ifdef CONFIG_MLX5_EN_TLS

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, tls_decrypted_packets) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, tls_decrypted_bytes) },