Commit 2b68abf9 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge tag 'mlx5-updates-2022-05-02' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 

Saeed Mahameed says:

====================
mlx5-updates-2022-05-02

1) Trivial Misc updates to mlx5 driver

2) From Mark Bloch: Flow steering, general steering refactoring/cleaning

An issue with flow steering deletion flow (when creating a rule without
dests) turned out to be easy to fix but during the fix some issue
with the flow steering creation/deletion flows have been found.

The following patch series tries to fix long standing issues with flow
steering code and hopefully preventing silly future bugs.

  A) Fix an issue where a proper dest type wasn't assigned.
  B) Refactor and fix dests enums values, refactor deletion
     function and do proper bookkeeping of dests.
  C) Change mlx5_del_flow_rules() to delete rules when there are no
     no more rules attached associated with an FTE.
  D) Don't call hard coded deletion function but use the node's
     defined one.
  E) Add a WARN_ON() to catch future bugs when an FTE with dests
     is deleted.

* tag 'mlx5-updates-2022-05-02' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5: fs, an FTE should have no dests when deleted
  net/mlx5: fs, call the deletion function of the node
  net/mlx5: fs, delete the FTE when there are no rules attached to it
  net/mlx5: fs, do proper bookkeeping for forward destinations
  net/mlx5: fs, add unused destination type
  net/mlx5: fs, jump to exit point and don't fall through
  net/mlx5: fs, refactor software deletion rule
  net/mlx5: fs, split software and IFC flow destination definitions
  net/mlx5e: TC, set proper dest type
  net/mlx5e: Remove unused mlx5e_dcbnl_build_rep_netdev function
  net/mlx5e: Drop error CQE handling from the XSK RX handler
  net/mlx5: Print initializing field in case of timeout
  net/mlx5: Delete redundant default assignment of runtime devlink params
  net/mlx5: Remove useless kfree
  net/mlx5: use kvfree() for kvzalloc() in mlx5_ct_fs_smfs_matcher_create
====================

Link: https://lore.kernel.org/r/


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents f4f1fd76 3a09fae0

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

+0 −20
Original line number Diff line number Diff line
@@ -584,14 +584,6 @@ static void mlx5_devlink_set_params_init_values(struct devlink *devlink) 
	struct mlx5_core_dev *dev = devlink_priv(devlink);

	union devlink_param_value value;



	if (dev->priv.steering->mode == MLX5_FLOW_STEERING_MODE_DMFS)

		strcpy(value.vstr, "dmfs");

	else

		strcpy(value.vstr, "smfs");

	devlink_param_driverinit_value_set(devlink,

					   MLX5_DEVLINK_PARAM_ID_FLOW_STEERING_MODE,

					   value);



	value.vbool = MLX5_CAP_GEN(dev, roce);

	devlink_param_driverinit_value_set(devlink,

					   DEVLINK_PARAM_GENERIC_ID_ENABLE_ROCE,
@@ -602,18 +594,6 @@ static void mlx5_devlink_set_params_init_values(struct devlink *devlink) 
	devlink_param_driverinit_value_set(devlink,

					   MLX5_DEVLINK_PARAM_ID_ESW_LARGE_GROUP_NUM,

					   value);



	if (MLX5_ESWITCH_MANAGER(dev)) {

		if (mlx5_esw_vport_match_metadata_supported(dev->priv.eswitch)) {

			dev->priv.eswitch->flags |= MLX5_ESWITCH_VPORT_MATCH_METADATA;

			value.vbool = true;

		} else {

			value.vbool = false;

		}

		devlink_param_driverinit_value_set(devlink,

						   MLX5_DEVLINK_PARAM_ID_ESW_PORT_METADATA,

						   value);

	}

#endif



	value.vu32 = MLX5_COMP_EQ_SIZE;

drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.c

+3 −0
Original line number Diff line number Diff line
@@ -259,6 +259,9 @@ const char *parse_fs_dst(struct trace_seq *p, 
	case MLX5_FLOW_DESTINATION_TYPE_PORT:

		trace_seq_printf(p, "port\n");

		break;

	case MLX5_FLOW_DESTINATION_TYPE_NONE:

		trace_seq_printf(p, "none\n");

		break;

	}



	trace_seq_putc(p, 0);

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

+2 −2
Original line number Diff line number Diff line
@@ -648,8 +648,8 @@ typedef struct sk_buff * 
(*mlx5e_fp_skb_from_cqe_mpwrq)(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi,

			       u16 cqe_bcnt, u32 head_offset, u32 page_idx);

typedef struct sk_buff *

(*mlx5e_fp_skb_from_cqe)(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe,

			 struct mlx5e_wqe_frag_info *wi, u32 cqe_bcnt);

(*mlx5e_fp_skb_from_cqe)(struct mlx5e_rq *rq, struct mlx5e_wqe_frag_info *wi,

			 u32 cqe_bcnt);

typedef bool (*mlx5e_fp_post_rx_wqes)(struct mlx5e_rq *rq);

typedef void (*mlx5e_fp_dealloc_wqe)(struct mlx5e_rq*, u16);

typedef void (*mlx5e_fp_shampo_dealloc_hd)(struct mlx5e_rq*, u16, u16, bool);

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

+0 −2
Original line number Diff line number Diff line
@@ -40,13 +40,11 @@ struct mlx5e_dcbx_dp { 
};



void mlx5e_dcbnl_build_netdev(struct net_device *netdev);

void mlx5e_dcbnl_build_rep_netdev(struct net_device *netdev);

void mlx5e_dcbnl_initialize(struct mlx5e_priv *priv);

void mlx5e_dcbnl_init_app(struct mlx5e_priv *priv);

void mlx5e_dcbnl_delete_app(struct mlx5e_priv *priv);

#else

static inline void mlx5e_dcbnl_build_netdev(struct net_device *netdev) {}

static inline void mlx5e_dcbnl_build_rep_netdev(struct net_device *netdev) {}

static inline void mlx5e_dcbnl_initialize(struct mlx5e_priv *priv) {}

static inline void mlx5e_dcbnl_init_app(struct mlx5e_priv *priv) {}

static inline void mlx5e_dcbnl_delete_app(struct mlx5e_priv *priv) {}

drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_smfs.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ mlx5_ct_fs_smfs_matcher_create(struct mlx5_ct_fs *fs, struct mlx5dr_table *tbl, 
	spec->match_criteria_enable = MLX5_MATCH_MISC_PARAMETERS_2 | MLX5_MATCH_OUTER_HEADERS;



	dr_matcher = mlx5_smfs_matcher_create(tbl, priority, spec);

	kfree(spec);

	kvfree(spec);

	if (!dr_matcher)

		return ERR_PTR(-EINVAL);