Commit 5b81d59f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mlx5-misc-fixes-2025-07-10' 

Tariq Toukan says:

====================
mlx5 misc fixes 2025-07-10

This small patchset provides misc bug fixes from the team to the mlx5
core and EN drivers.
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 71b976db 4c9fce56

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

+7 −2
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ enum { 


enum {

	MLX5E_TC_PRIO = 0,

	MLX5E_NIC_PRIO

	MLX5E_PROMISC_PRIO,

	MLX5E_NIC_PRIO,

};



struct mlx5e_flow_table {
@@ -68,9 +69,13 @@ struct mlx5e_l2_table { 
				 MLX5_HASH_FIELD_SEL_DST_IP   |\

				 MLX5_HASH_FIELD_SEL_IPSEC_SPI)



/* NIC prio FTS */

/* NIC promisc FT level */

enum {

	MLX5E_PROMISC_FT_LEVEL,

};



/* NIC prio FTS */

enum {

	MLX5E_VLAN_FT_LEVEL,

	MLX5E_L2_FT_LEVEL,

	MLX5E_TTC_FT_LEVEL,

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

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ int mlx5e_dim_rx_change(struct mlx5e_rq *rq, bool enable) 
		__set_bit(MLX5E_RQ_STATE_DIM, &rq->state);

	} else {

		__clear_bit(MLX5E_RQ_STATE_DIM, &rq->state);



		synchronize_net();

		mlx5e_dim_disable(rq->dim);

		rq->dim = NULL;

	}
@@ -140,7 +140,7 @@ int mlx5e_dim_tx_change(struct mlx5e_txqsq *sq, bool enable) 
		__set_bit(MLX5E_SQ_STATE_DIM, &sq->state);

	} else {

		__clear_bit(MLX5E_SQ_STATE_DIM, &sq->state);



		synchronize_net();

		mlx5e_dim_disable(sq->dim);

		sq->dim = NULL;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -780,7 +780,7 @@ static int mlx5e_create_promisc_table(struct mlx5e_flow_steering *fs) 
	ft_attr.max_fte = MLX5E_PROMISC_TABLE_SIZE;

	ft_attr.autogroup.max_num_groups = 1;

	ft_attr.level = MLX5E_PROMISC_FT_LEVEL;

	ft_attr.prio = MLX5E_NIC_PRIO;

	ft_attr.prio = MLX5E_PROMISC_PRIO;



	ft->t = mlx5_create_auto_grouped_flow_table(fs->ns, &ft_attr);

	if (IS_ERR(ft->t)) {

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

+1 −0
Original line number Diff line number Diff line
@@ -1076,6 +1076,7 @@ static int esw_qos_vports_node_update_parent(struct mlx5_esw_sched_node *node, 
		return err;

	}

	esw_qos_node_set_parent(node, parent);

	node->bw_share = 0;



	return 0;

}

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

+9 −4
Original line number Diff line number Diff line
@@ -113,13 +113,16 @@ 
#define ETHTOOL_PRIO_NUM_LEVELS 1

#define ETHTOOL_NUM_PRIOS 11

#define ETHTOOL_MIN_LEVEL (KERNEL_MIN_LEVEL + ETHTOOL_NUM_PRIOS)

/* Promiscuous, Vlan, mac, ttc, inner ttc, {UDP/ANY/aRFS/accel/{esp, esp_err}}, IPsec policy,

/* Vlan, mac, ttc, inner ttc, {UDP/ANY/aRFS/accel/{esp, esp_err}}, IPsec policy,

 * {IPsec RoCE MPV,Alias table},IPsec RoCE policy

 */

#define KERNEL_NIC_PRIO_NUM_LEVELS 11

#define KERNEL_NIC_PRIO_NUM_LEVELS 10

#define KERNEL_NIC_NUM_PRIOS 1

/* One more level for tc */

#define KERNEL_MIN_LEVEL (KERNEL_NIC_PRIO_NUM_LEVELS + 1)

/* One more level for tc, and one more for promisc */

#define KERNEL_MIN_LEVEL (KERNEL_NIC_PRIO_NUM_LEVELS + 2)



#define KERNEL_NIC_PROMISC_NUM_PRIOS 1

#define KERNEL_NIC_PROMISC_NUM_LEVELS 1



#define KERNEL_NIC_TC_NUM_PRIOS  1

#define KERNEL_NIC_TC_NUM_LEVELS 3
@@ -187,6 +190,8 @@ static struct init_tree_node { 
			   ADD_NS(MLX5_FLOW_TABLE_MISS_ACTION_DEF,

				  ADD_MULTIPLE_PRIO(KERNEL_NIC_TC_NUM_PRIOS,

						    KERNEL_NIC_TC_NUM_LEVELS),

				  ADD_MULTIPLE_PRIO(KERNEL_NIC_PROMISC_NUM_PRIOS,

						    KERNEL_NIC_PROMISC_NUM_LEVELS),

				  ADD_MULTIPLE_PRIO(KERNEL_NIC_NUM_PRIOS,

						    KERNEL_NIC_PRIO_NUM_LEVELS))),

		  ADD_PRIO(0, BY_PASS_MIN_LEVEL, 0, FS_CHAINING_CAPS,