Explorar o código

net/mlx5e: IPsec, fix byte count in CQE

This patch fixes the byte count indication in CQE for processed IPsec
packets that contain a metadata header.

Signed-off-by: Boris Pismenny <borisp@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Boris Pismenny %!s(int64=7) %!d(string=hai) anos
pai
achega
b3ccf97813

+ 1 - 0
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c

@@ -364,6 +364,7 @@ struct sk_buff *mlx5e_ipsec_handle_rx_skb(struct net_device *netdev,
 	}
 	}
 
 
 	remove_metadata_hdr(skb);
 	remove_metadata_hdr(skb);
+	*cqe_bcnt -= MLX5E_METADATA_ETHER_LEN;
 
 
 	return skb;
 	return skb;
 }
 }

+ 1 - 1
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h

@@ -41,7 +41,7 @@
 #include "en.h"
 #include "en.h"
 
 
 struct sk_buff *mlx5e_ipsec_handle_rx_skb(struct net_device *netdev,
 struct sk_buff *mlx5e_ipsec_handle_rx_skb(struct net_device *netdev,
-					  struct sk_buff *skb);
+					  struct sk_buff *skb, u32 *cqe_bcnt);
 void mlx5e_ipsec_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe);
 void mlx5e_ipsec_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe);
 
 
 void mlx5e_ipsec_inverse_table_init(void);
 void mlx5e_ipsec_inverse_table_init(void);

+ 1 - 1
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c

@@ -1547,7 +1547,7 @@ void mlx5e_ipsec_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe)
 		mlx5e_free_rx_wqe(rq, wi);
 		mlx5e_free_rx_wqe(rq, wi);
 		goto wq_cyc_pop;
 		goto wq_cyc_pop;
 	}
 	}
-	skb = mlx5e_ipsec_handle_rx_skb(rq->netdev, skb);
+	skb = mlx5e_ipsec_handle_rx_skb(rq->netdev, skb, &cqe_bcnt);
 	if (unlikely(!skb)) {
 	if (unlikely(!skb)) {
 		mlx5e_free_rx_wqe(rq, wi);
 		mlx5e_free_rx_wqe(rq, wi);
 		goto wq_cyc_pop;
 		goto wq_cyc_pop;