Commit 943aa7bd authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

net/mlx5: Remove tls vs. ktls separation as it is the same 

After removal FPGA TLS, we can remove tls->ktls indirection too,
as it is the same thing.

Link: https://lore.kernel.org/r/67e596599edcffb0de43f26551208dfd34ac777e.1649073691.git.leonro@nvidia.com


Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
parent 691f17b9

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ mlx5_core-$(CONFIG_MLX5_FPGA) += fpga/cmd.o fpga/core.o fpga/conn.o fpga/sdk.o 
mlx5_core-$(CONFIG_MLX5_EN_IPSEC) += en_accel/ipsec.o en_accel/ipsec_rxtx.o \

				     en_accel/ipsec_stats.o en_accel/ipsec_fs.o



mlx5_core-$(CONFIG_MLX5_EN_TLS) += en_accel/tls.o en_accel/tls_rxtx.o en_accel/tls_stats.o \

mlx5_core-$(CONFIG_MLX5_EN_TLS) += en_accel/ktls_stats.o \

				   en_accel/fs_tcp.o en_accel/ktls.o en_accel/ktls_txrx.o \

				   en_accel/ktls_tx.o en_accel/ktls_rx.o

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

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ u16 mlx5e_calc_sq_stop_room(struct mlx5_core_dev *mdev, struct mlx5e_params *par 
	bool is_mpwqe = MLX5E_GET_PFLAG(params, MLX5E_PFLAG_SKB_TX_MPWQE);

	u16 stop_room;



	stop_room  = mlx5e_tls_get_stop_room(mdev, params);

	stop_room  = mlx5e_ktls_get_stop_room(mdev, params);

	stop_room += mlx5e_stop_room_for_max_wqe(mdev);

	if (is_mpwqe)

		/* A MPWQE can take up to the maximum-sized WQE + all the normal

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

+6 −5
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include "en_accel/ipsec_rxtx.h"

#include "en_accel/tls.h"

#include "en_accel/tls_rxtx.h"

#include "en_accel/ktls.h"

#include "en_accel/ktls_txrx.h"

#include "en.h"

#include "en/txrx.h"
@@ -124,8 +124,9 @@ static inline bool mlx5e_accel_tx_begin(struct net_device *dev, 


#ifdef CONFIG_MLX5_EN_TLS

	/* May send SKBs and WQEs. */

	if (mlx5e_tls_skb_offloaded(skb))

		if (unlikely(!mlx5e_tls_handle_tx_skb(dev, sq, skb, &state->tls)))

	if (mlx5e_ktls_skb_offloaded(skb))

		if (unlikely(!mlx5e_ktls_handle_tx_skb(dev, sq, skb,

						       &state->tls)))

			return false;

#endif
@@ -174,7 +175,7 @@ static inline void mlx5e_accel_tx_finish(struct mlx5e_txqsq *sq, 
					 struct mlx5_wqe_inline_seg *inlseg)

{

#ifdef CONFIG_MLX5_EN_TLS

	mlx5e_tls_handle_tx_wqe(&wqe->ctrl, &state->tls);

	mlx5e_ktls_handle_tx_wqe(&wqe->ctrl, &state->tls);

#endif



#ifdef CONFIG_MLX5_EN_IPSEC

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

+21 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 


#include "en.h"

#include "lib/mlx5.h"

#include "en_accel/tls.h"

#include "en_accel/ktls.h"

#include "en_accel/ktls_utils.h"

#include "en_accel/fs_tcp.h"
@@ -159,3 +158,24 @@ void mlx5e_ktls_cleanup_rx(struct mlx5e_priv *priv) 


	destroy_workqueue(priv->tls->rx_wq);

}



int mlx5e_ktls_init(struct mlx5e_priv *priv)

{

	struct mlx5e_tls *tls;



	if (!mlx5e_accel_is_ktls_device(priv->mdev))

		return 0;



	tls = kzalloc(sizeof(*tls), GFP_KERNEL);

	if (!tls)

		return -ENOMEM;



	priv->tls = tls;

	return 0;

}



void mlx5e_ktls_cleanup(struct mlx5e_priv *priv)

{

	kfree(priv->tls);

	priv->tls = NULL;

}

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

+32 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#define __MLX5E_KTLS_H__



#include <linux/tls.h>

#include <net/tls.h>

#include "en.h"



#ifdef CONFIG_MLX5_EN_TLS
@@ -61,6 +62,25 @@ static inline bool mlx5e_accel_is_ktls_device(struct mlx5_core_dev *mdev) 
		mlx5_accel_is_ktls_device(mdev);

}



struct mlx5e_tls_sw_stats {

	atomic64_t tx_tls_ctx;

	atomic64_t tx_tls_del;

	atomic64_t rx_tls_ctx;

	atomic64_t rx_tls_del;

};



struct mlx5e_tls {

	struct mlx5e_tls_sw_stats sw_stats;

	struct workqueue_struct *rx_wq;

};



int mlx5e_ktls_init(struct mlx5e_priv *priv);

void mlx5e_ktls_cleanup(struct mlx5e_priv *priv);



int mlx5e_ktls_get_count(struct mlx5e_priv *priv);

int mlx5e_ktls_get_strings(struct mlx5e_priv *priv, uint8_t *data);

int mlx5e_ktls_get_stats(struct mlx5e_priv *priv, u64 *data);



#else

static inline int

mlx5_ktls_create_key(struct mlx5_core_dev *mdev,
@@ -107,6 +127,18 @@ static inline bool mlx5e_accel_is_ktls_tx(struct mlx5_core_dev *mdev) { return f 
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; }



static inline int mlx5e_ktls_init(struct mlx5e_priv *priv) { return 0; }

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

static inline int mlx5e_ktls_get_count(struct mlx5e_priv *priv) { return 0; }

static inline int mlx5e_ktls_get_strings(struct mlx5e_priv *priv, uint8_t *data)

{

	return 0;

}



static inline int mlx5e_ktls_get_stats(struct mlx5e_priv *priv, u64 *data)

{

	return 0;

}

#endif



#endif /* __MLX5E_TLS_H__ */