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

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



Saeed Mahameed says:

====================
mlx5-updates-2021-04-16

This patchset introduces updates to mlx5e netdev driver.

1) Tariq refactors TLS offloads and adds resiliency against RX resync
   failures

2) Maxim reduces code duplications by unifying channels reset flow
   regardless if channels are closed or open

3) Aya Enhances TX/RX health reporters diagnostics to expose the
   internal clock time-stamping format

4) Moshe adds support for ethtool extended link state, to show the reason
   for link down
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 70c18375 95742c1c

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

+8 −5
Original line number Diff line number Diff line
@@ -325,9 +325,9 @@ enum { 
	MLX5E_SQ_STATE_RECOVERING,

	MLX5E_SQ_STATE_IPSEC,

	MLX5E_SQ_STATE_AM,

	MLX5E_SQ_STATE_TLS,

	MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE,

	MLX5E_SQ_STATE_PENDING_XSK_TX,

	MLX5E_SQ_STATE_PENDING_TLS_RX_RESYNC,

};



struct mlx5e_tx_mpwqe {
@@ -500,6 +500,8 @@ struct mlx5e_xdpsq { 
	struct mlx5e_channel      *channel;

} ____cacheline_aligned_in_smp;



struct mlx5e_ktls_resync_resp;



struct mlx5e_icosq {

	/* data path */

	u16                        cc;
@@ -519,6 +521,7 @@ struct mlx5e_icosq { 
	u32                        sqn;

	u16                        reserved_room;

	unsigned long              state;

	struct mlx5e_ktls_resync_resp *ktls_resync;



	/* control path */

	struct mlx5_wq_ctrl        wq_ctrl;
@@ -1015,10 +1018,10 @@ int fn##_ctx(struct mlx5e_priv *priv, void *context) \ 
	return fn(priv); \

}

int mlx5e_safe_reopen_channels(struct mlx5e_priv *priv);

int mlx5e_safe_switch_channels(struct mlx5e_priv *priv,

			       struct mlx5e_channels *new_chs,

int mlx5e_safe_switch_params(struct mlx5e_priv *priv,

			     struct mlx5e_params *new_params,

			     mlx5e_fp_preactivate preactivate,

			       void *context);

			     void *context, bool reset);

int mlx5e_update_tx_netdev_queues(struct mlx5e_priv *priv);

int mlx5e_num_channels_changed(struct mlx5e_priv *priv);

int mlx5e_num_channels_changed_ctx(struct mlx5e_priv *priv, void *context);

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

+3 −0
Original line number Diff line number Diff line
@@ -621,6 +621,9 @@ static void mlx5e_build_async_icosq_param(struct mlx5_core_dev *mdev, 


	mlx5e_build_sq_param_common(mdev, param);

	param->stop_room = mlx5e_stop_room_for_wqe(1); /* for XSK NOP */

	param->is_tls = mlx5_accel_is_ktls_rx(mdev);

	if (param->is_tls)

		param->stop_room += mlx5e_stop_room_for_wqe(1); /* for TLS RX resync NOP */

	MLX5_SET(sqc, sqc, reg_umr, MLX5_CAP_ETH(mdev, reg_umr_sq));

	MLX5_SET(wq, wq, log_wq_sz, log_wq_size);

	mlx5e_build_ico_cq_param(mdev, log_wq_size, &param->cqp);

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

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ struct mlx5e_sq_param { 
	u32                        sqc[MLX5_ST_SZ_DW(sqc)];

	struct mlx5_wq_param       wq;

	bool                       is_mpw;

	bool                       is_tls;

	u16                        stop_room;

};

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

+3 −0
Original line number Diff line number Diff line
@@ -792,6 +792,9 @@ int mlx5e_ptp_rx_manage_fs(struct mlx5e_priv *priv, bool set) 
	if (!priv->profile->rx_ptp_support)

		return 0;



	if (!test_bit(MLX5E_STATE_OPENED, &priv->state))

		return 0;



	if (set) {

		if (!c || !test_bit(MLX5E_PTP_STATE_RX, c->state)) {

			netdev_WARN_ONCE(priv->netdev, "Don't try to add PTP RX-FS rules");

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

+6 −0
Original line number Diff line number Diff line
@@ -323,10 +323,12 @@ static int mlx5e_rx_reporter_diagnose_generic_rq(struct mlx5e_rq *rq, 
	struct mlx5e_priv *priv = rq->priv;

	struct mlx5e_params *params;

	u32 rq_stride, rq_sz;

	bool real_time;

	int err;



	params = &priv->channels.params;

	rq_sz = mlx5e_rqwq_get_size(rq);

	real_time =  mlx5_is_real_time_rq(priv->mdev);

	rq_stride = BIT(mlx5e_mpwqe_get_log_stride_size(priv->mdev, params, NULL));



	err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "RQ");
@@ -345,6 +347,10 @@ static int mlx5e_rx_reporter_diagnose_generic_rq(struct mlx5e_rq *rq, 
	if (err)

		return err;



	err = devlink_fmsg_string_pair_put(fmsg, "ts_format", real_time ? "RT" : "FRC");

	if (err)

		return err;



	err = mlx5e_health_cq_common_diag_fmsg(&rq->cq, fmsg);

	if (err)

		return err;