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

Merge branch 'mlx5-misc-patches-2023-07-08' 

Tariq Toukan says:

====================
mlx5 misc patches 2023-07-08

This patchset contains features and small enhancements from the team
to the mlx5 core and Eth drivers.
====================

Link: https://patch.msgid.link/20240708080025.1593555-1-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 8ce2dddb f1ac0b7d

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

+1 −1
Original line number Diff line number Diff line
@@ -1145,7 +1145,7 @@ mlx5_tc_ct_entry_replace_rules(struct mlx5_tc_ct_priv *ct_priv, 
			       struct mlx5_ct_entry *entry,

			       u8 zone_restore_id)

{

	int err;

	int err = 0;



	if (mlx5_tc_ct_entry_in_ct_table(entry)) {

		err = mlx5_tc_ct_entry_replace_rule(ct_priv, flow_rule, entry, false,

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

+2 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ static const struct counter_desc sw_stats_desc[] = { 
	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_gro_bytes) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_gro_skbs) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_gro_large_hds) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_hds_nodata_packets) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_hds_nodata_bytes) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_ecn_mark) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_removed_vlan_packets) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_csum_unnecessary) },

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h

+5 −0
Original line number Diff line number Diff line
@@ -1379,6 +1379,11 @@ int mlx5dr_cmd_create_modify_header_arg(struct mlx5_core_dev *dev, 
void mlx5dr_cmd_destroy_modify_header_arg(struct mlx5_core_dev *dev,

					  u32 obj_id);



int mlx5dr_definer_get(struct mlx5dr_domain *dmn, u16 format_id,

		       u8 *dw_selectors, u8 *byte_selectors,

		       u8 *match_mask, u32 *definer_id);

void mlx5dr_definer_put(struct mlx5dr_domain *dmn, u32 definer_id);



struct mlx5dr_icm_pool *mlx5dr_icm_pool_create(struct mlx5dr_domain *dmn,

					       enum mlx5dr_icm_type icm_type);

void mlx5dr_icm_pool_destroy(struct mlx5dr_icm_pool *pool);

drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h

+0 −5
Original line number Diff line number Diff line
@@ -153,11 +153,6 @@ int mlx5dr_action_destroy(struct mlx5dr_action *action); 


u32 mlx5dr_action_get_pkt_reformat_id(struct mlx5dr_action *action);



int mlx5dr_definer_get(struct mlx5dr_domain *dmn, u16 format_id,

		       u8 *dw_selectors, u8 *byte_selectors,

		       u8 *match_mask, u32 *definer_id);

void mlx5dr_definer_put(struct mlx5dr_domain *dmn, u32 definer_id);



static inline bool

mlx5dr_is_supported(struct mlx5_core_dev *dev)

{