Commit c65d3429 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-mlx5-misc-changes-2025-07-09' 

Tariq Toukan says:

====================
net/mlx5: misc changes 2025-07-09

This series contains misc enhancements to the mlx5 driver.
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5d6fc6b4 a194be57

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

+0 −1
Original line number Diff line number Diff line
@@ -383,7 +383,6 @@ enum { 
	MLX5E_SQ_STATE_RECOVERING,

	MLX5E_SQ_STATE_IPSEC,

	MLX5E_SQ_STATE_DIM,

	MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE,

	MLX5E_SQ_STATE_PENDING_XSK_TX,

	MLX5E_SQ_STATE_PENDING_TLS_RX_RESYNC,

	MLX5E_NUM_SQ_STATES, /* Must be kept last */

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

+0 −2
Original line number Diff line number Diff line
@@ -340,8 +340,6 @@ static int mlx5e_ptp_alloc_txqsq(struct mlx5e_ptp *c, int txq_ix, 
	sq->stats     = &c->priv->ptp_stats.sq[tc];

	sq->ptpsq     = ptpsq;

	INIT_WORK(&sq->recover_work, mlx5e_tx_err_cqe_work);

	if (!MLX5_CAP_ETH(mdev, wqe_vlan_insert))

		set_bit(MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE, &sq->state);

	sq->stop_room = param->stop_room;

	sq->ptp_cyc2time = mlx5_sq_ts_translator(mdev);

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

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ static const char * const sq_sw_state_type_name[] = { 
	[MLX5E_SQ_STATE_RECOVERING] = "recovering",

	[MLX5E_SQ_STATE_IPSEC] = "ipsec",

	[MLX5E_SQ_STATE_DIM] = "dim",

	[MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE] = "vlan_need_l2_inline",

	[MLX5E_SQ_STATE_PENDING_XSK_TX] = "pending_xsk_tx",

	[MLX5E_SQ_STATE_PENDING_TLS_RX_RESYNC] = "pending_tls_rx_resync",

};

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

+1 −3
Original line number Diff line number Diff line
@@ -571,8 +571,6 @@ void mlx5e_rx_res_channels_activate(struct mlx5e_rx_res *res, struct mlx5e_chann 


	for (ix = 0; ix < nch; ix++)

		mlx5e_rx_res_channel_activate_direct(res, chs, ix);

	for (ix = nch; ix < res->max_nch; ix++)

		mlx5e_rx_res_channel_deactivate_direct(res, ix);



	if (res->features & MLX5E_RX_RES_FEATURE_PTP) {

		u32 rqn;
@@ -595,7 +593,7 @@ void mlx5e_rx_res_channels_deactivate(struct mlx5e_rx_res *res) 


	mlx5e_rx_res_rss_disable(res);



	for (ix = 0; ix < res->max_nch; ix++)

	for (ix = 0; ix < res->rss_nch; ix++)

		mlx5e_rx_res_channel_deactivate_direct(res, ix);



	if (res->features & MLX5E_RX_RES_FEATURE_PTP) {

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan.c

+22 −21
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ mlx5e_tc_act_vlan_add_push_action(struct mlx5e_priv *priv, 
				  struct net_device **out_dev,

				  struct netlink_ext_ack *extack)

{

	do {

		struct net_device *vlan_dev = *out_dev;

		struct flow_action_entry vlan_act = {

			.id = FLOW_ACTION_VLAN_PUSH,
@@ -103,20 +104,20 @@ mlx5e_tc_act_vlan_add_push_action(struct mlx5e_priv *priv, 
		};

		int err;



	err = parse_tc_vlan_action(priv, &vlan_act, attr->esw_attr, &attr->action, extack, NULL);

		err = parse_tc_vlan_action(priv, &vlan_act, attr->esw_attr,

					   &attr->action, extack, NULL);

		if (err)

			return err;



		rcu_read_lock();

	*out_dev = dev_get_by_index_rcu(dev_net(vlan_dev), dev_get_iflink(vlan_dev));

		*out_dev = dev_get_by_index_rcu(dev_net(vlan_dev),

						dev_get_iflink(vlan_dev));

		rcu_read_unlock();

		if (!*out_dev)

			return -ENODEV;

	} while (is_vlan_dev(*out_dev));



	if (is_vlan_dev(*out_dev))

		err = mlx5e_tc_act_vlan_add_push_action(priv, attr, out_dev, extack);



	return err;

	return 0;

}



int