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

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



Saeed Mahameed says:

====================
mlx5-updates-2021-06-26

This series provides small updates to mlx5 driver.

1) Increase hairpin buffer size

2) Improve peroformance in SF allocation

3) Add IPsec support to uplink representor

4) Add stats for number of deleted kTLS TX offloaded connections

5) Add support for flow sampler in SW steering
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3095f512 5589b8f1

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

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,6 @@ int mlx5e_ipsec_init(struct mlx5e_priv *priv) 
	spin_lock_init(&ipsec->sadb_rx_lock);

	ida_init(&ipsec->halloc);

	ipsec->en_priv = priv;

	ipsec->en_priv->ipsec = ipsec;

	ipsec->no_trailer = !!(mlx5_accel_ipsec_device_caps(priv->mdev) &

			       MLX5_ACCEL_IPSEC_CAP_RX_NO_TRAILER);

	ipsec->wq = alloc_ordered_workqueue("mlx5e_ipsec: %s", 0,
@@ -438,6 +437,7 @@ int mlx5e_ipsec_init(struct mlx5e_priv *priv) 
		return -ENOMEM;

	}



	priv->ipsec = ipsec;

	mlx5e_accel_ipsec_fs_init(priv);

	netdev_dbg(priv->netdev, "IPSec attached to netdevice\n");

	return 0;

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

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ void mlx5e_ktls_del_tx(struct net_device *netdev, struct tls_context *tls_ctx) 
	priv = netdev_priv(netdev);

	mdev = priv->mdev;



	atomic64_inc(&priv_tx->sw_stats->tx_tls_del);

	mlx5e_destroy_tis(mdev, priv_tx->tisn);

	mlx5_ktls_destroy_key(mdev, priv_tx->key_id);

	kfree(priv_tx);

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

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 


struct mlx5e_tls_sw_stats {

	atomic64_t tx_tls_ctx;

	atomic64_t tx_tls_del;

	atomic64_t tx_tls_drop_metadata;

	atomic64_t tx_tls_drop_resync_alloc;

	atomic64_t tx_tls_drop_no_sync_data;

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

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static const struct counter_desc mlx5e_tls_sw_stats_desc[] = { 


static const struct counter_desc mlx5e_ktls_sw_stats_desc[] = {

	{ MLX5E_DECLARE_STAT(struct mlx5e_tls_sw_stats, tx_tls_ctx) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_tls_sw_stats, tx_tls_del) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_tls_sw_stats, rx_tls_ctx) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_tls_sw_stats, rx_tls_del) },

};

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

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include "lib/mlx5.h"

#define CREATE_TRACE_POINTS

#include "diag/en_rep_tracepoint.h"

#include "en_accel/ipsec.h"



#define MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE \

	max(0x7, MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)
@@ -630,6 +631,11 @@ static int mlx5e_init_ul_rep(struct mlx5_core_dev *mdev, 
			     struct net_device *netdev)

{

	struct mlx5e_priv *priv = netdev_priv(netdev);

	int err;



	err = mlx5e_ipsec_init(priv);

	if (err)

		mlx5_core_err(mdev, "Uplink rep IPsec initialization failed, %d\n", err);



	mlx5e_vxlan_set_netdev_info(priv);

	return mlx5e_init_rep(mdev, netdev);
@@ -637,6 +643,7 @@ static int mlx5e_init_ul_rep(struct mlx5_core_dev *mdev, 


static void mlx5e_cleanup_rep(struct mlx5e_priv *priv)

{

	mlx5e_ipsec_cleanup(priv);

}



static int mlx5e_create_rep_ttc_table(struct mlx5e_priv *priv)