Commit c8b441d2 authored by David S. Miller's avatar David S. Miller
Browse files

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



Saeed Mahameed says:

====================
mlx5-updates-2022-02-16

Misc updates for mlx5:
1) Alex Liu Adds support for using xdp->data_meta

2) Aya Levin Adds PTP counters and port time stamp mode for representors and
switchdev mode.

3) Tariq Toukan, Striding RQ simple improvements.

4) Roi Dayan (7): Create multiple attr instances per flow

Some TC actions use post actions for their implementation.
For example CT and sample actions.

Create a new flow attr instance after each multi table action and
create a post action rule for it as a generic parsing step.
Now multi table actions like CT, sample don't require to do it.

When flow has multiple attr instances, the first flow attr is being
offloaded normally and linked to the next attr (post action rule) by
setting an id on reg_c for matching.
Post action rule (rule created from second attr instance) match the
id on reg_c and does rest of the actions.

Example rule with actions CT,goto will be created with 2 attr instances
as following: attr1(CT)->attr2(goto)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 22b67d17 b070e703

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

+1 −0
Original line number Diff line number Diff line
@@ -714,6 +714,7 @@ struct mlx5e_rq { 
			u8                     umr_in_progress;

			u8                     umr_last_bulk;

			u8                     umr_completed;

			u8                     min_wqe_bulk;

			struct mlx5e_shampo_hd *shampo;

		} mpwqe;

	};

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

+9 −2
Original line number Diff line number Diff line
@@ -178,6 +178,12 @@ u8 mlx5e_mpwqe_get_log_num_strides(struct mlx5_core_dev *mdev, 
		mlx5e_mpwqe_get_log_stride_size(mdev, params, xsk);

}



u8 mlx5e_mpwqe_get_min_wqe_bulk(unsigned int wq_sz)

{

#define UMR_WQE_BULK (2)

	return min_t(unsigned int, UMR_WQE_BULK, wq_sz / 2 - 1);

}



u16 mlx5e_get_rq_headroom(struct mlx5_core_dev *mdev,

			  struct mlx5e_params *params,

			  struct mlx5e_xsk_param *xsk)
@@ -359,12 +365,13 @@ void mlx5e_build_rq_params(struct mlx5_core_dev *mdev, 
{

	/* Prefer Striding RQ, unless any of the following holds:

	 * - Striding RQ configuration is not possible/supported.

	 * - Slow PCI heuristic.

	 * - CQE compression is ON, and stride_index mini_cqe layout is not supported.

	 * - Legacy RQ would use linear SKB while Striding RQ would use non-linear.

	 *

	 * No XSK params: checking the availability of striding RQ in general.

	 */

	if (!slow_pci_heuristic(mdev) &&

	if ((!MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_CQE_COMPRESS) ||

	     MLX5_CAP_GEN(mdev, mini_cqe_resp_stride_index)) &&

	    mlx5e_striding_rq_possible(mdev, params) &&

	    (mlx5e_rx_mpwqe_is_linear_skb(mdev, params, NULL) ||

	     !mlx5e_rx_is_linear_skb(params, NULL)))

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

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ u8 mlx5e_mpwqe_get_log_stride_size(struct mlx5_core_dev *mdev, 
u8 mlx5e_mpwqe_get_log_num_strides(struct mlx5_core_dev *mdev,

				   struct mlx5e_params *params,

				   struct mlx5e_xsk_param *xsk);

u8 mlx5e_mpwqe_get_min_wqe_bulk(unsigned int wq_sz);

u16 mlx5e_get_rq_headroom(struct mlx5_core_dev *mdev,

			  struct mlx5e_params *params,

			  struct mlx5e_xsk_param *xsk);

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

+2 −2
Original line number Diff line number Diff line
@@ -263,14 +263,14 @@ int mlx5e_rep_tc_init(struct mlx5e_rep_priv *rpriv) 
	INIT_LIST_HEAD(&uplink_priv->unready_flows);



	/* init shared tc flow table */

	err = mlx5e_tc_esw_init(&uplink_priv->tc_ht);

	err = mlx5e_tc_esw_init(uplink_priv);

	return err;

}



void mlx5e_rep_tc_cleanup(struct mlx5e_rep_priv *rpriv)

{

	/* delete shared tc flow table */

	mlx5e_tc_esw_cleanup(&rpriv->uplink_priv.tc_ht);

	mlx5e_tc_esw_cleanup(&rpriv->uplink_priv);

	mutex_destroy(&rpriv->uplink_priv.unready_flows_lock);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ int mlx5e_rss_packet_merge_set_param(struct mlx5e_rss *rss, 
			goto inner_tir;

		err = mlx5e_tir_modify(tir, builder);

		if (err) {

			mlx5e_rss_warn(rss->mdev, "Failed to update LRO state of indirect TIR %#x for traffic type %d: err = %d\n",

			mlx5e_rss_warn(rss->mdev, "Failed to update packet merge state of indirect TIR %#x for traffic type %d: err = %d\n",

				       mlx5e_tir_get_tirn(tir), tt, err);

			if (!final_err)

				final_err = err;
@@ -457,7 +457,7 @@ int mlx5e_rss_packet_merge_set_param(struct mlx5e_rss *rss, 
			continue;

		err = mlx5e_tir_modify(tir, builder);

		if (err) {

			mlx5e_rss_warn(rss->mdev, "Failed to update LRO state of inner indirect TIR %#x for traffic type %d: err = %d\n",

			mlx5e_rss_warn(rss->mdev, "Failed to update packet merge state of inner indirect TIR %#x for traffic type %d: err = %d\n",

				       mlx5e_tir_get_tirn(tir), tt, err);

			if (!final_err)

				final_err = err;