Commit 7f8546f3 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Saeed Mahameed
Browse files

net/mlx5e: Unify checks of TLS offloads 



Both INNOVA and ConnectX TLS offloads perform the same checks in the
beginning. Unify them to reduce repeating code. Do WARN_ON_ONCE on
netdev mismatch and finish with an error in both offloads, not only in
the ConnectX one.

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 f02bac9a

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

+2 −2
Original line number Diff line number Diff line
@@ -95,9 +95,9 @@ mlx5e_get_ktls_tx_priv_ctx(struct tls_context *tls_ctx) 
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 net_device *netdev, struct mlx5e_txqsq *sq,

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

			      struct sk_buff *skb, struct mlx5e_tx_wqe **wqe,

			      u16 *pi);

			      u16 *pi, int datalen);

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

+2 −15
Original line number Diff line number Diff line
@@ -413,28 +413,15 @@ err_out: 
	return MLX5E_KTLS_SYNC_FAIL;

}



bool mlx5e_ktls_handle_tx_skb(struct net_device *netdev, struct mlx5e_txqsq *sq,

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

			      struct sk_buff *skb, struct mlx5e_tx_wqe **wqe,

			      u16 *pi)

			      u16 *pi, int datalen)

{

	struct mlx5e_ktls_offload_context_tx *priv_tx;

	struct mlx5e_sq_stats *stats = sq->stats;

	struct mlx5_wqe_ctrl_seg *cseg;

	struct tls_context *tls_ctx;

	int datalen;

	u32 seq;



	if (!skb->sk || !tls_is_sk_tx_device_offloaded(skb->sk))

		goto out;



	datalen = skb->len - (skb_transport_offset(skb) + tcp_hdrlen(skb));

	if (!datalen)

		goto out;



	tls_ctx = tls_get_ctx(skb->sk);

	if (WARN_ON_ONCE(tls_ctx->netdev != netdev))

		goto err_out;



	priv_tx = mlx5e_get_ktls_tx_priv_ctx(tls_ctx);



	if (unlikely(mlx5e_ktls_tx_offload_test_and_clear_pending(priv_tx))) {

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

+9 −5
Original line number Diff line number Diff line
@@ -266,9 +266,6 @@ bool mlx5e_tls_handle_tx_skb(struct net_device *netdev, struct mlx5e_txqsq *sq, 
	int datalen;

	u32 skb_seq;



	if (MLX5_CAP_GEN(sq->channel->mdev, tls_tx))

		return mlx5e_ktls_handle_tx_skb(netdev, sq, skb, wqe, pi);



	if (!skb->sk || !tls_is_sk_tx_device_offloaded(skb->sk))

		return true;
@@ -277,8 +274,11 @@ bool mlx5e_tls_handle_tx_skb(struct net_device *netdev, struct mlx5e_txqsq *sq, 
		return true;



	tls_ctx = tls_get_ctx(skb->sk);

	if (unlikely(tls_ctx->netdev != netdev))

		return true;

	if (WARN_ON_ONCE(tls_ctx->netdev != netdev))

		goto err_out;



	if (MLX5_CAP_GEN(sq->channel->mdev, tls_tx))

		return mlx5e_ktls_handle_tx_skb(tls_ctx, sq, skb, wqe, pi, datalen);



	skb_seq = ntohl(tcp_hdr(skb)->seq);

	context = mlx5e_get_tls_tx_context(tls_ctx);
@@ -295,6 +295,10 @@ bool mlx5e_tls_handle_tx_skb(struct net_device *netdev, struct mlx5e_txqsq *sq, 


	context->expected_seq = skb_seq + datalen;

	return true;



err_out:

	dev_kfree_skb_any(skb);

	return false;

}



static int tls_update_resync_sn(struct net_device *netdev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE