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

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



Saeed Mahameed says:

====================
This series provides misc updates for mlx5 drivers.
For more information please see tag log below.

Please pull and let me know if there is any problem.

mlx5-updates-2021-06-03

This series contains misc updates for mlx5 driver

1) Alaa disables advanced features when kdump mode to save on memory
2) Jakub counts all link flap events
3) Meir adds support for IPoIB NDR speed
4) Various misc cleanup
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6a8dd8b2 f68406ca

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

+7 −1
Original line number Diff line number Diff line
@@ -974,7 +974,6 @@ int mlx5e_open_rq(struct mlx5e_params *params, struct mlx5e_rq_param *param, 
		  struct mlx5e_xsk_param *xsk, int node,

		  struct mlx5e_rq *rq);

int mlx5e_wait_for_min_rx_wqes(struct mlx5e_rq *rq, int wait_time);

void mlx5e_deactivate_rq(struct mlx5e_rq *rq);

void mlx5e_close_rq(struct mlx5e_rq *rq);

int mlx5e_create_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param);

void mlx5e_destroy_rq(struct mlx5e_rq *rq);
@@ -1163,6 +1162,13 @@ mlx5e_calc_max_nch(struct mlx5e_priv *priv, const struct mlx5e_profile *profile) 
	return priv->netdev->num_rx_queues / max_t(u8, profile->rq_groups, 1);

}



static inline bool

mlx5e_tx_mpwqe_supported(struct mlx5_core_dev *mdev)

{

	return !is_kdump_kernel() &&

		MLX5_CAP_ETH(mdev, enhanced_multi_pkt_send_wqe);

}



int mlx5e_priv_init(struct mlx5e_priv *priv,

		    struct net_device *netdev,

		    struct mlx5_core_dev *mdev);

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

+4 −4
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ int mlx5e_validate_params(struct mlx5_core_dev *mdev, struct mlx5e_params *param 


static struct dim_cq_moder mlx5e_get_def_tx_moderation(u8 cq_period_mode)

{

	struct dim_cq_moder moder;

	struct dim_cq_moder moder = {};



	moder.cq_period_mode = cq_period_mode;

	moder.pkts = MLX5E_PARAMS_DEFAULT_TX_CQ_MODERATION_PKTS;
@@ -214,7 +214,7 @@ static struct dim_cq_moder mlx5e_get_def_tx_moderation(u8 cq_period_mode) 


static struct dim_cq_moder mlx5e_get_def_rx_moderation(u8 cq_period_mode)

{

	struct dim_cq_moder moder;

	struct dim_cq_moder moder = {};



	moder.cq_period_mode = cq_period_mode;

	moder.pkts = MLX5E_PARAMS_DEFAULT_RX_CQ_MODERATION_PKTS;
@@ -614,7 +614,7 @@ static u8 mlx5e_build_icosq_log_wq_sz(struct mlx5e_params *params, 


static u8 mlx5e_build_async_icosq_log_wq_sz(struct mlx5_core_dev *mdev)

{

	if (mlx5_accel_is_ktls_rx(mdev))

	if (mlx5e_accel_is_ktls_rx(mdev))

		return MLX5E_PARAMS_DEFAULT_LOG_SQ_SIZE;



	return MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE;
@@ -643,7 +643,7 @@ 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);

	param->is_tls = mlx5e_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));

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

+1 −3
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static inline unsigned int mlx5e_accel_tx_ids_len(struct mlx5e_txqsq *sq, 
/* Part of the eseg touched by TX offloads */

#define MLX5E_ACCEL_ESEG_LEN offsetof(struct mlx5_wqe_eth_seg, mss)



static inline bool mlx5e_accel_tx_eseg(struct mlx5e_priv *priv,

static inline void mlx5e_accel_tx_eseg(struct mlx5e_priv *priv,

				       struct sk_buff *skb,

				       struct mlx5_wqe_eth_seg *eseg, u16 ihs)

{
@@ -175,8 +175,6 @@ static inline bool mlx5e_accel_tx_eseg(struct mlx5e_priv *priv, 
	if (skb->encapsulation && skb->ip_summed == CHECKSUM_PARTIAL)

		mlx5e_tx_tunnel_accel(skb, eseg, ihs);

#endif



	return true;

}



static inline void mlx5e_accel_tx_finish(struct mlx5e_txqsq *sq,

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c

+7 −4
Original line number Diff line number Diff line
@@ -59,12 +59,15 @@ void mlx5e_ktls_build_netdev(struct mlx5e_priv *priv) 
	struct net_device *netdev = priv->netdev;

	struct mlx5_core_dev *mdev = priv->mdev;



	if (mlx5_accel_is_ktls_tx(mdev)) {

	if (!mlx5e_accel_is_ktls_tx(mdev) && !mlx5e_accel_is_ktls_rx(mdev))

		return;



	if (mlx5e_accel_is_ktls_tx(mdev)) {

		netdev->hw_features |= NETIF_F_HW_TLS_TX;

		netdev->features    |= NETIF_F_HW_TLS_TX;

	}



	if (mlx5_accel_is_ktls_rx(mdev))

	if (mlx5e_accel_is_ktls_rx(mdev))

		netdev->hw_features |= NETIF_F_HW_TLS_RX;



	netdev->tlsdev_ops = &mlx5e_ktls_ops;
@@ -89,7 +92,7 @@ int mlx5e_ktls_init_rx(struct mlx5e_priv *priv) 
{

	int err;



	if (!mlx5_accel_is_ktls_rx(priv->mdev))

	if (!mlx5e_accel_is_ktls_rx(priv->mdev))

		return 0;



	priv->tls->rx_wq = create_singlethread_workqueue("mlx5e_tls_rx");
@@ -109,7 +112,7 @@ int mlx5e_ktls_init_rx(struct mlx5e_priv *priv) 


void mlx5e_ktls_cleanup_rx(struct mlx5e_priv *priv)

{

	if (!mlx5_accel_is_ktls_rx(priv->mdev))

	if (!mlx5e_accel_is_ktls_rx(priv->mdev))

		return;



	if (priv->netdev->features & NETIF_F_HW_TLS_RX)

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h

+24 −0
Original line number Diff line number Diff line
@@ -15,6 +15,25 @@ int mlx5e_ktls_set_feature_rx(struct net_device *netdev, bool enable); 
struct mlx5e_ktls_resync_resp *

mlx5e_ktls_rx_resync_create_resp_list(void);

void mlx5e_ktls_rx_resync_destroy_resp_list(struct mlx5e_ktls_resync_resp *resp_list);



static inline bool mlx5e_accel_is_ktls_tx(struct mlx5_core_dev *mdev)

{

	return !is_kdump_kernel() &&

		mlx5_accel_is_ktls_tx(mdev);

}



static inline bool mlx5e_accel_is_ktls_rx(struct mlx5_core_dev *mdev)

{

	return !is_kdump_kernel() &&

		mlx5_accel_is_ktls_rx(mdev);

}



static inline bool mlx5e_accel_is_ktls_device(struct mlx5_core_dev *mdev)

{

	return !is_kdump_kernel() &&

		mlx5_accel_is_ktls_device(mdev);

}



#else



static inline void mlx5e_ktls_build_netdev(struct mlx5e_priv *priv)
@@ -44,6 +63,11 @@ mlx5e_ktls_rx_resync_create_resp_list(void) 


static inline void

mlx5e_ktls_rx_resync_destroy_resp_list(struct mlx5e_ktls_resync_resp *resp_list) {}



static inline bool mlx5e_accel_is_ktls_tx(struct mlx5_core_dev *mdev) { return false; }

static inline bool mlx5e_accel_is_ktls_rx(struct mlx5_core_dev *mdev) { return false; }

static inline bool mlx5e_accel_is_ktls_device(struct mlx5_core_dev *mdev) { return false; }



#endif



#endif /* __MLX5E_TLS_H__ */