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

net/mlx5e: IPsec, Inline feature_check fast-path function 



Feature check functions are in the TX fast-path of all SKBs, not only
IPsec traffic.
Move the IPsec feature check function into a header and turn it inline.
Use a stub and clean the config flag condition in Eth main driver file.

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 f3bea940

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

+0 −14
Original line number Diff line number Diff line
@@ -497,20 +497,6 @@ void mlx5e_ipsec_offload_handle_rx_skb(struct net_device *netdev, 
	}

}



bool mlx5e_ipsec_feature_check(struct sk_buff *skb, struct net_device *netdev,

			       netdev_features_t features)

{

	struct sec_path *sp = skb_sec_path(skb);

	struct xfrm_state *x;



	if (sp && sp->len) {

		x = sp->xvec[0];

		if (x && x->xso.offload_handle)

			return true;

	}

	return false;

}



void mlx5e_ipsec_build_inverse_table(void)

{

	u16 mss_inv;

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

+17 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ struct sk_buff *mlx5e_ipsec_handle_rx_skb(struct net_device *netdev, 
					  struct sk_buff *skb, u32 *cqe_bcnt);



void mlx5e_ipsec_inverse_table_init(void);

bool mlx5e_ipsec_feature_check(struct sk_buff *skb, struct net_device *netdev,

			       netdev_features_t features);

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,
@@ -94,6 +92,21 @@ static inline bool mlx5e_ipsec_eseg_meta(struct mlx5_wqe_eth_seg *eseg) 


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

			       struct mlx5_wqe_eth_seg *eseg);



static inline bool mlx5e_ipsec_feature_check(struct sk_buff *skb, struct net_device *netdev,

					     netdev_features_t features)

{

	struct sec_path *sp = skb_sec_path(skb);



	if (sp && sp->len) {

		struct xfrm_state *x = sp->xvec[0];



		if (x && x->xso.offload_handle)

			return true;

	}

	return false;

}



#else

static inline

void mlx5e_ipsec_offload_handle_rx_skb(struct net_device *netdev,
@@ -107,6 +120,8 @@ static inline bool mlx5e_ipsec_eseg_meta(struct mlx5_wqe_eth_seg *eseg) 
}



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

static inline bool mlx5e_ipsec_feature_check(struct sk_buff *skb, struct net_device *netdev,

					     netdev_features_t features) { return false; }

#endif /* CONFIG_MLX5_EN_IPSEC */



#endif /* __MLX5E_IPSEC_RXTX_H__ */

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

+0 −2
Original line number Diff line number Diff line
@@ -4376,10 +4376,8 @@ netdev_features_t mlx5e_features_check(struct sk_buff *skb, 
	features = vlan_features_check(skb, features);

	features = vxlan_features_check(skb, features);



#ifdef CONFIG_MLX5_EN_IPSEC

	if (mlx5e_ipsec_feature_check(skb, netdev, features))

		return features;

#endif



	/* Validate if the tunneled packet is being offloaded by HW */

	if (skb->encapsulation &&