Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43585a41 authored by Ilya Lesokhin's avatar Ilya Lesokhin Committed by David S. Miller
Browse files

net/mlx5e: TLS, Add error statistics 



Add statistics for rare TLS related errors.
Since the errors are rare we have a counter per netdev
rather then per SQ.

Signed-off-by: default avatarIlya Lesokhin <ilyal@mellanox.com>
Signed-off-by: default avatarBoris Pismenny <borisp@mellanox.com>
Acked-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bf239741

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

+1 −1
Original line number Diff line number Diff line
@@ -28,6 +28,6 @@ mlx5_core-$(CONFIG_MLX5_CORE_IPOIB) += ipoib/ipoib.o ipoib/ethtool.o ipoib/ipoib 
mlx5_core-$(CONFIG_MLX5_EN_IPSEC) += en_accel/ipsec.o en_accel/ipsec_rxtx.o \

		en_accel/ipsec_stats.o



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

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



CFLAGS_tracepoint.o := -I$(src)

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

+3 −0
Original line number Diff line number Diff line
@@ -801,6 +801,9 @@ struct mlx5e_priv { 
#ifdef CONFIG_MLX5_EN_IPSEC

	struct mlx5e_ipsec        *ipsec;

#endif

#ifdef CONFIG_MLX5_EN_TLS

	struct mlx5e_tls          *tls;

#endif

};



struct mlx5e_profile {

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

+22 −0
Original line number Diff line number Diff line
@@ -173,3 +173,25 @@ void mlx5e_tls_build_netdev(struct mlx5e_priv *priv) 
	netdev->hw_features |= NETIF_F_HW_TLS_TX;

	netdev->tlsdev_ops = &mlx5e_tls_ops;

}



int mlx5e_tls_init(struct mlx5e_priv *priv)

{

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



	if (!tls)

		return -ENOMEM;



	priv->tls = tls;

	return 0;

}



void mlx5e_tls_cleanup(struct mlx5e_priv *priv)

{

	struct mlx5e_tls *tls = priv->tls;



	if (!tls)

		return;



	kfree(tls);

	priv->tls = NULL;

}

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

+22 −0
Original line number Diff line number Diff line
@@ -38,6 +38,17 @@ 
#include <net/tls.h>

#include "en.h"



struct mlx5e_tls_sw_stats {

	atomic64_t tx_tls_drop_metadata;

	atomic64_t tx_tls_drop_resync_alloc;

	atomic64_t tx_tls_drop_no_sync_data;

	atomic64_t tx_tls_drop_bypass_required;

};



struct mlx5e_tls {

	struct mlx5e_tls_sw_stats sw_stats;

};



struct mlx5e_tls_offload_context {

	struct tls_offload_context base;

	u32 expected_seq;
@@ -55,10 +66,21 @@ mlx5e_get_tls_tx_context(struct tls_context *tls_ctx) 
}



void mlx5e_tls_build_netdev(struct mlx5e_priv *priv);

int mlx5e_tls_init(struct mlx5e_priv *priv);

void mlx5e_tls_cleanup(struct mlx5e_priv *priv);



int mlx5e_tls_get_count(struct mlx5e_priv *priv);

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

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



#else



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

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

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

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

static inline int mlx5e_tls_get_strings(struct mlx5e_priv *priv, uint8_t *data) { return 0; }

static inline int mlx5e_tls_get_stats(struct mlx5e_priv *priv, u64 *data) { return 0; }



#endif

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

+15 −9
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ static struct sk_buff * 
mlx5e_tls_handle_ooo(struct mlx5e_tls_offload_context *context,

		     struct mlx5e_txqsq *sq, struct sk_buff *skb,

		     struct mlx5e_tx_wqe **wqe,

		     u16 *pi)

		     u16 *pi,

		     struct mlx5e_tls *tls)

{

	u32 tcp_seq = ntohl(tcp_hdr(skb)->seq);

	struct sync_info info;
@@ -175,12 +176,14 @@ mlx5e_tls_handle_ooo(struct mlx5e_tls_offload_context *context, 


	sq->stats.tls_ooo++;



	if (mlx5e_tls_get_sync_data(context, tcp_seq, &info))

	if (mlx5e_tls_get_sync_data(context, tcp_seq, &info)) {

		/* We might get here if a retransmission reaches the driver

		 * after the relevant record is acked.

		 * It should be safe to drop the packet in this case

		 */

		atomic64_inc(&tls->sw_stats.tx_tls_drop_no_sync_data);

		goto err_out;

	}



	if (unlikely(info.sync_len < 0)) {

		u32 payload;
@@ -192,21 +195,22 @@ mlx5e_tls_handle_ooo(struct mlx5e_tls_offload_context *context, 
			 */

			return skb;



		netdev_err(skb->dev,

			   "Can't offload from the middle of an SKB [seq: %X, offload_seq: %X, end_seq: %X]\n",

			   tcp_seq, tcp_seq + payload + info.sync_len,

			   tcp_seq + payload);

		atomic64_inc(&tls->sw_stats.tx_tls_drop_bypass_required);

		goto err_out;

	}



	if (unlikely(mlx5e_tls_add_metadata(skb, context->swid)))

	if (unlikely(mlx5e_tls_add_metadata(skb, context->swid))) {

		atomic64_inc(&tls->sw_stats.tx_tls_drop_metadata);

		goto err_out;

	}



	headln = skb_transport_offset(skb) + tcp_hdrlen(skb);

	linear_len += headln + sizeof(info.rcd_sn);

	nskb = alloc_skb(linear_len, GFP_ATOMIC);

	if (unlikely(!nskb))

	if (unlikely(!nskb)) {

		atomic64_inc(&tls->sw_stats.tx_tls_drop_resync_alloc);

		goto err_out;

	}



	context->expected_seq = tcp_seq + skb->len - headln;

	skb_put(nskb, linear_len);
@@ -234,6 +238,7 @@ struct sk_buff *mlx5e_tls_handle_tx_skb(struct net_device *netdev, 
					struct mlx5e_tx_wqe **wqe,

					u16 *pi)

{

	struct mlx5e_priv *priv = netdev_priv(netdev);

	struct mlx5e_tls_offload_context *context;

	struct tls_context *tls_ctx;

	u32 expected_seq;
@@ -256,11 +261,12 @@ struct sk_buff *mlx5e_tls_handle_tx_skb(struct net_device *netdev, 
	expected_seq = context->expected_seq;



	if (unlikely(expected_seq != skb_seq)) {

		skb = mlx5e_tls_handle_ooo(context, sq, skb, wqe, pi);

		skb = mlx5e_tls_handle_ooo(context, sq, skb, wqe, pi, priv->tls);

		goto out;

	}



	if (unlikely(mlx5e_tls_add_metadata(skb, context->swid))) {

		atomic64_inc(&priv->tls->sw_stats.tx_tls_drop_metadata);

		dev_kfree_skb_any(skb);

		skb = NULL;

		goto out;