Commit 714c88a3 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Saeed Mahameed
Browse files

net/mlx5e: Split TX acceleration offloads into two phases 



After previous modifications, the offloads are no longer called one by
one, the pi is calculated and the wqe is cleared on between of TLS and
IPSEC offloads, which doesn't quite fit mlx5e_accel_handle_tx's purpose.

This patch splits mlx5e_accel_handle_tx into two functions that
correspond to two logical phases of running offloads:

1. Before fetching a WQE. Here runs the code that can post WQEs on its
own, before the main WQE is fetched. It's the main part of TLS offload.

2. After fetching a WQE. Here runs the code that updates the WQE's
fields, but can't post other WQEs any more. It's a minor part of TLS
offload that sets the tisn field in the cseg, and eseg-based offloads
(currently IPSEC, and later patches will move GENEVE and checksum
offloads there, too).

It allows to make mlx5e_xmit take care of all actions needed to transmit
a packet in the right order, improve the structure of the code and
reduce unnecessary operations. The structure will be further improved in
the following patches (all eseg-based offloads will be moved to a single
place, and reserving space for the main WQE will happen between phase 1
and phase 2 of offloads to eliminate unneeded data movements).

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@mellanox.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 55461000

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

+21 −12
Original line number Diff line number Diff line
@@ -102,35 +102,44 @@ mlx5e_udp_gso_handle_tx_skb(struct sk_buff *skb) 
	udp_hdr(skb)->len = htons(payload_len);

}



static inline bool mlx5e_accel_handle_tx(struct sk_buff *skb,

					 struct mlx5e_txqsq *sq,

					 struct net_device *dev,

					 struct mlx5e_tx_wqe **wqe,

					 u16 *pi)

{

struct mlx5e_accel_tx_state {

#ifdef CONFIG_MLX5_EN_TLS

	u32 tls_tisn = 0;

	struct mlx5e_accel_tx_tls_state tls;

#endif

};



static inline bool mlx5e_accel_tx_begin(struct net_device *dev,

					struct mlx5e_txqsq *sq,

					struct sk_buff *skb,

					struct mlx5e_accel_tx_state *state)

{

	if (skb_is_gso(skb) && skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4)

		mlx5e_udp_gso_handle_tx_skb(skb);



#ifdef CONFIG_MLX5_EN_TLS

	if (test_bit(MLX5E_SQ_STATE_TLS, &sq->state)) {

		/* May send SKBs and WQEs. */

		if (unlikely(!mlx5e_tls_handle_tx_skb(dev, sq, skb, &tls_tisn)))

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

			return false;

	}

#endif



	*pi = mlx5_wq_cyc_ctr2ix(&sq->wq, sq->pc);

	*wqe = MLX5E_TX_FETCH_WQE(sq, *pi);

	return true;

}



	(*wqe)->ctrl.tisn = cpu_to_be32(tls_tisn << 8);

static inline bool mlx5e_accel_tx_finish(struct mlx5e_priv *priv,

					 struct mlx5e_txqsq *sq,

					 struct sk_buff *skb,

					 struct mlx5e_tx_wqe *wqe,

					 struct mlx5e_accel_tx_state *state)

{

#ifdef CONFIG_MLX5_EN_TLS

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

#endif



#ifdef CONFIG_MLX5_EN_IPSEC

	if (test_bit(MLX5E_SQ_STATE_IPSEC, &sq->state)) {

		if (unlikely(!mlx5e_ipsec_handle_tx_skb(dev, &(*wqe)->eth, skb)))

		if (unlikely(!mlx5e_ipsec_handle_tx_skb(priv, &wqe->eth, skb)))

			return false;

	}

#endif

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

+1 −2
Original line number Diff line number Diff line
@@ -233,11 +233,10 @@ static void mlx5e_ipsec_set_metadata(struct sk_buff *skb, 
		   ntohs(mdata->content.tx.seq));

}



bool mlx5e_ipsec_handle_tx_skb(struct net_device *netdev,

bool mlx5e_ipsec_handle_tx_skb(struct mlx5e_priv *priv,

			       struct mlx5_wqe_eth_seg *eseg,

			       struct sk_buff *skb)

{

	struct mlx5e_priv *priv = netdev_priv(netdev);

	struct xfrm_offload *xo = xfrm_offload(skb);

	struct mlx5e_ipsec_metadata *mdata;

	struct mlx5e_ipsec_sa_entry *sa_entry;

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

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ void mlx5e_ipsec_set_iv_esn(struct sk_buff *skb, struct xfrm_state *x, 
			    struct xfrm_offload *xo);

void mlx5e_ipsec_set_iv(struct sk_buff *skb, struct xfrm_state *x,

			struct xfrm_offload *xo);

bool mlx5e_ipsec_handle_tx_skb(struct net_device *netdev,

bool mlx5e_ipsec_handle_tx_skb(struct mlx5e_priv *priv,

			       struct mlx5_wqe_eth_seg *eseg,

			       struct sk_buff *skb);

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

+3 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#ifdef CONFIG_MLX5_EN_TLS

#include <net/tls.h>

#include "accel/tls.h"

#include "en_accel/tls_rxtx.h"



#define MLX5E_KTLS_STATIC_UMR_WQE_SZ \

	(offsetof(struct mlx5e_umr_wqe, tls_static_params_ctx) + \
@@ -96,7 +97,8 @@ void mlx5e_ktls_build_netdev(struct mlx5e_priv *priv); 
void mlx5e_ktls_tx_offload_set_pending(struct mlx5e_ktls_offload_context_tx *priv_tx);



bool mlx5e_ktls_handle_tx_skb(struct tls_context *tls_ctx, struct mlx5e_txqsq *sq,

			      struct sk_buff *skb, u32 *tisn, int datalen);

			      struct sk_buff *skb, int datalen,

			      struct mlx5e_accel_tx_tls_state *state);

void mlx5e_ktls_tx_handle_resync_dump_comp(struct mlx5e_txqsq *sq,

					   struct mlx5e_tx_wqe_info *wi,

					   u32 *dma_fifo_cc);

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

+3 −2
Original line number Diff line number Diff line
@@ -414,7 +414,8 @@ err_out: 
}



bool mlx5e_ktls_handle_tx_skb(struct tls_context *tls_ctx, struct mlx5e_txqsq *sq,

			      struct sk_buff *skb, u32 *tisn, int datalen)

			      struct sk_buff *skb, int datalen,

			      struct mlx5e_accel_tx_tls_state *state)

{

	struct mlx5e_ktls_offload_context_tx *priv_tx;

	struct mlx5e_sq_stats *stats = sq->stats;
@@ -447,7 +448,7 @@ bool mlx5e_ktls_handle_tx_skb(struct tls_context *tls_ctx, struct mlx5e_txqsq *s 


	priv_tx->expected_seq = seq + datalen;



	*tisn = priv_tx->tisn;

	state->tls_tisn = priv_tx->tisn;



	stats->tls_encrypted_packets += skb_is_gso(skb) ? skb_shinfo(skb)->gso_segs : 1;

	stats->tls_encrypted_bytes   += datalen;

CRA Git | Maintained and supported by SUSTech CRA and CCSE