Commit 3a28eda9 authored by Tariq Toukan's avatar Tariq Toukan Committed by Jakub Kicinski
Browse files

net/mlx5e: IPsec, Enclose csum logic under ipsec config 



All IPsec logic should be wrapped under the compile flag,
including its checksum logic.
Introduce an inline function in ipsec datapath header,
with a corresponding stub.

Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarRaed Salem <raeds@nvidia.com>
Reviewed-by: default avatarHuy Nguyen <huyn@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 763e1e54

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

+10 −0
Original line number Diff line number Diff line
@@ -87,6 +87,11 @@ static inline bool mlx5e_ipsec_is_tx_flow(struct mlx5e_accel_tx_ipsec_state *ips 
	return ipsec_st->x;

}



static inline bool mlx5e_ipsec_eseg_meta(struct mlx5_wqe_eth_seg *eseg)

{

	return eseg->flow_table_metadata & cpu_to_be32(MLX5_ETH_WQE_FT_META_IPSEC);

}



void mlx5e_ipsec_tx_build_eseg(struct mlx5e_priv *priv, struct sk_buff *skb,

			       struct mlx5_wqe_eth_seg *eseg);

#else
@@ -96,6 +101,11 @@ void mlx5e_ipsec_offload_handle_rx_skb(struct net_device *netdev, 
				       struct mlx5_cqe64 *cqe)

{}



static inline bool mlx5e_ipsec_eseg_meta(struct mlx5_wqe_eth_seg *eseg)

{

	return false;

}



static inline bool mlx5_ipsec_is_rx_flow(struct mlx5_cqe64 *cqe) { return false; }

#endif /* CONFIG_MLX5_EN_IPSEC */

drivers/net/ethernet/mellanox/mlx5/core/en_tx.c

+1 −2
Original line number Diff line number Diff line
@@ -241,9 +241,8 @@ mlx5e_txwqe_build_eseg_csum(struct mlx5e_txqsq *sq, struct sk_buff *skb, 
		eseg->cs_flags = MLX5_ETH_WQE_L3_CSUM | MLX5_ETH_WQE_L4_CSUM;

		sq->stats->csum_partial++;

#endif

	} else if (unlikely(eseg->flow_table_metadata & cpu_to_be32(MLX5_ETH_WQE_FT_META_IPSEC))) {

	} else if (unlikely(mlx5e_ipsec_eseg_meta(eseg))) {

		ipsec_txwqe_build_eseg_csum(sq, skb, eseg);



	} else

		sq->stats->csum_none++;

}