Commit dd7cf00f authored by Huy Nguyen's avatar Huy Nguyen Committed by Saeed Mahameed
Browse files

net/mlx5: Optimize mlx5e_feature_checks for non IPsec packet 



mlx5e_ipsec_feature_check belongs to mlx5e_tunnel_features_check.
Also, IPsec is not the default configuration so it should be
checked at the end instead of the beginning of mlx5e_features_check.

Signed-off-by: default avatarRaed Salem <raeds@nvidia.com>
Signed-off-by: default avatarHuy Nguyen <huyn@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 5bf3ee97

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

+9 −6
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ 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)

static inline netdev_features_t

mlx5e_ipsec_feature_check(struct sk_buff *skb, netdev_features_t features)

{

	struct sec_path *sp = skb_sec_path(skb);
@@ -102,9 +102,11 @@ static inline bool mlx5e_ipsec_feature_check(struct sk_buff *skb, struct net_dev 
		struct xfrm_state *x = sp->xvec[0];



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

			return true;

			return features;

	}

	return false;



	/* Disable CSUM and GSO for software IPsec */

	return features & ~(NETIF_F_CSUM_MASK | NETIF_F_GSO_MASK);

}



#else
@@ -120,8 +122,9 @@ 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; }

static inline netdev_features_t

mlx5e_ipsec_feature_check(struct sk_buff *skb, netdev_features_t features)

{ return features & ~(NETIF_F_CSUM_MASK | NETIF_F_GSO_MASK); }

#endif /* CONFIG_MLX5_EN_IPSEC */



#endif /* __MLX5E_IPSEC_RXTX_H__ */

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

+5 −3
Original line number Diff line number Diff line
@@ -4330,6 +4330,11 @@ static netdev_features_t mlx5e_tunnel_features_check(struct mlx5e_priv *priv, 
		/* Support Geneve offload for default UDP port */

		if (port == GENEVE_UDP_PORT && mlx5_geneve_tx_allowed(priv->mdev))

			return features;

#endif

		break;

#ifdef CONFIG_MLX5_EN_IPSEC

	case IPPROTO_ESP:

		return mlx5e_ipsec_feature_check(skb, features);

#endif

	}
@@ -4347,9 +4352,6 @@ netdev_features_t mlx5e_features_check(struct sk_buff *skb, 
	features = vlan_features_check(skb, features);

	features = vxlan_features_check(skb, features);



	if (mlx5e_ipsec_feature_check(skb, netdev, features))

		return features;



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

	if (skb->encapsulation &&

	    (features & NETIF_F_CSUM_MASK || features & NETIF_F_GSO_MASK))