Fix IPsec crypto offloads with vxlan tunnel
Subsystems (6)
v4 cover Fix IPsec crypto offloads with vxlan tunnel
v1 -> v2:
- Move inner_ipproto into xfrm_offload structure.
- Fix static code analysis errors.
- skip checking for skb->encapsulation to be more flexible for vendor
v2 -> v3:
- Fix bug in patch 003 when checking for xo null pointer in mlx5e_ipsec_feature_check
- Fix bug of accidentally commenting out memset in patch 003
v3 -> v4:
- Check explicitly for skb->ecapsulation before calling xfrm_get_inner_ipproto.
- Move patche set to net-next
Huy Nguyen (3):
net/mlx5: Optimize mlx5e_feature_checks for non IPsec packet net/xfrm: Add inner_ipproto into sec_path
net/mlx5: Fix checksum issue of VXLAN and IPsec crypto offload
.../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 65 ++++++++++++++----- .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 37 ++++++++--- .../net/ethernet/mellanox/mlx5/core/en_main.c | 8 ++- include/net/xfrm.h | 1 + net/xfrm/xfrm_output.c | 42 +++++++++++- 5 files changed, 125 insertions(+), 28 deletions(-)
Signature · 1 line
2.24.1
PATCH v4 1/3 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.
--- .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 15 +++++++++------ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 8 +++++--- 2 files changed, 14 insertions(+), 9 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h +9 -6
@@ -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_devstruct 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
@@ -4281,6 +4281,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 }
@@ -4298,9 +4303,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 ))
Signature · 1 line
2.24.1
PATCH v4 2/3 net/xfrm: Add inner_ipproto into sec_path
In reply to Huy NguyenThe inner_ipproto saves the inner IP protocol of the plain text packet. This allows vendor's IPsec feature making offload decision at skb's features_check and configuring hardware at ndo_start_xmit.
For example, ConnectX6-DX IPsec device needs the plaintext's IP protocol to support partial checksum offload on VXLAN/GENEVE packet over IPsec transport mode tunnel.
--- include/net/xfrm.h | 1 + net/xfrm/xfrm_output.c | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-)
include/net/xfrm.h +1 -0
@@ -1024,6 +1024,7 @@ struct xfrm_offload {#define CRYPTO_INVALID_PROTOCOL 128__u8 proto; +__u8 inner_ipproto; };struct sec_path {
net/xfrm/xfrm_output.c +41 -1
59 lines not on this page · raw message
Signature · 1 line
2.24.1
Steffen Klassert
maintainerRe: [PATCH net-next v4 2/3] net/xfrm: Add inner_ipproto into sec_path
Quoted 5 lines · Huy Nguyen
net/xfrm/xfrm_output.c +4
-0+/* For partial checksum offload, the outer header checksum is calculated +* by software and the inner header checksum is calculated by hardware. +* This requires hardware to know the inner packet type to calculate +* the inner header checksum. Save inner ip protocol here to avoid
net/xfrm/xfrm_output.c static int xfrm_output_gso(struct net *net, struct sock *sk, struct sk_buff *skb · line 581
Quoted 10 lines
net/xfrm/xfrm_output.c +10
-0+* traversing the packet in the vendor's xmit code. +* If the encap type is IPIP, just save skb->inner_ipproto. Otherwise, +* get the ip protocol from the IP header. +*/ +static void xfrm_get_inner_ipproto (struct sk_buff *skb) +{ +struct xfrm_offload *xo =xfrm_offload (skb); +const struct ethhdr *eth; + + xo =xfrm_offload (skb);
You fetched the xo pointer already above.
PATCH v4 3/3 net/mlx5: Fix checksum issue of VXLAN and IPsec crypto offload
In reply to Huy NguyenThe packet is VXLAN packet over IPsec transport mode tunnel which has the following format: [IP1 | ESP | UDP | VXLAN | IP2 | TCP] NVIDIA ConnectX card cannot do checksum offload for two L4 headers. The solution is using the checksum partial offload similar to VXLAN | TCP packet. Hardware calculates IP1, IP2 and TCP checksums and software calculates UDP checksum. However, unlike VXLAN | TCP case, IPsec's mlx5 driver cannot access the inner plaintext IP protocol type. Therefore, inner_ipproto is added in the sec_path structure to provide this information. Also, utilize the skb's csum_start to program L4 inner checksum offset.
While at it, remove the call to mlx5e_set_eseg_swp and setup software parser fields directly in mlx5e_ipsec_set_swp. mlx5e_set_eseg_swp is not needed as the two features (GENEVE and IPsec) are different and adding this sharing layer creates unnecessary complexity and affect performance.
For the case VXLAN packet over IPsec tunnel mode tunnel, checksum offload is disabled because the hardware does not support checksum offload for three L3 (IP) headers.
--- .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 65 ++++++++++++++----- .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 24 ++++++- 2 files changed, 70 insertions(+), 19 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c +49 -16
@@ -136,8 +136,6 @@ static void mlx5e_ipsec_set_swp(struct sk_buff *skb, struct mlx5_wqe_eth_seg *eseg, u8 mode, struct xfrm_offload *xo) { - struct mlx5e_swp_spec swp_spec = {}; -/* Tunnel Mode: * SWP: OutL3 InL3 InL4 * Pkt: MAC IP ESP IP L4
@@ -146,23 +144,58 @@ static void mlx5e_ipsec_set_swp(struct sk_buff *skb,* SWP: OutL3 InL4 * InL3 * Pkt: MAC IP ESP L4 +* +* Tunnel(VXLAN TCP/UDP) over Transport Mode +* SWP: OutL3 InL3 InL4 +* Pkt: MAC IP ESP UDP VXLAN IP L4 */ - swp_spec.l3_proto = skb->protocol; - swp_spec.is_tun = mode ==XFRM_MODE_TUNNEL ; -if (swp_spec.is_tun) { -if (xo->proto ==IPPROTO_IPV6 ) { - swp_spec.tun_l3_proto =htons (ETH_P_IPV6 ); - swp_spec.tun_l4_proto =inner_ipv6_hdr (skb)->nexthdr; - }else { - swp_spec.tun_l3_proto =htons (ETH_P_IP ); - swp_spec.tun_l4_proto =inner_ip_hdr (skb)->protocol; - } - }else { - swp_spec.tun_l3_proto = skb->protocol; - swp_spec.tun_l4_proto = xo->proto; + +/* Shared settings */ + eseg->swp_outer_l3_offset =skb_network_offset (skb) /2 ; +if (skb->protocol ==htons (ETH_P_IPV6 )) + eseg->swp_flags |=MLX5_ETH_WQE_SWP_OUTER_L3_IPV6 ; + +/* Tunnel mode */ +if (mode ==XFRM_MODE_TUNNEL ) { + eseg->swp_inner_l3_offset =skb_inner_network_offset (skb) /2 ; + eseg->swp_inner_l4_offset =skb_inner_transport_offset (skb) /2 ; +if (xo->proto ==IPPROTO_IPV6 ) + eseg->swp_flags |=MLX5_ETH_WQE_SWP_INNER_L3_IPV6 ; +if (inner_ip_hdr (skb)->protocol ==IPPROTO_UDP ) + eseg->swp_flags |=MLX5_ETH_WQE_SWP_INNER_L4_UDP ; +return ; + } + +/* Transport mode */ +if (mode !=XFRM_MODE_TRANSPORT ) +return ; + +if (!xo->inner_ipproto) { + eseg->swp_inner_l3_offset =skb_network_offset (skb) /2 ; + eseg->swp_inner_l4_offset =skb_inner_transport_offset (skb) /2 ; +if (skb->protocol ==htons (ETH_P_IPV6 )) + eseg->swp_flags |=MLX5_ETH_WQE_SWP_INNER_L3_IPV6 ; +if (xo->proto ==IPPROTO_UDP ) + eseg->swp_flags |=MLX5_ETH_WQE_SWP_INNER_L4_UDP ; +return ; + } + +/* Tunnel(VXLAN TCP/UDP) over Transport Mode */ +switch (xo->inner_ipproto) { +case IPPROTO_UDP : + eseg->swp_flags |=MLX5_ETH_WQE_SWP_INNER_L4_UDP ; + fallthrough; +case IPPROTO_TCP : + eseg->swp_inner_l3_offset =skb_inner_network_offset (skb) /2 ; + eseg->swp_inner_l4_offset = (skb->csum_start + skb->head - skb->data) /2 ; +if (skb->protocol ==htons (ETH_P_IPV6 )) + eseg->swp_flags |=MLX5_ETH_WQE_SWP_INNER_L3_IPV6 ; +break ; +default : +break ; } -mlx5e_set_eseg_swp (skb, eseg, &swp_spec); +return ; } void mlx5e_ipsec_set_iv_esn(struct sk_buff *skb, struct xfrm_state *x,
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h +21 -3
@@ -96,16 +96,34 @@ void mlx5e_ipsec_tx_build_eseg(struct mlx5e_priv *priv, struct sk_buff *skb,static inline netdev_features_t mlx5e_ipsec_feature_check (struct sk_buff *skb,netdev_features_t features) { +struct xfrm_offload *xo =xfrm_offload (skb);struct sec_path *sp =skb_sec_path (skb); -if (sp && sp->len) { +if (sp && sp->len && xo) {struct xfrm_state *x = sp->xvec[0 ]; -if (x && x->xso.offload_handle) -return features; +if (!x || !x->xso.offload_handle) + goto out_disable; + +if (xo->inner_ipproto) { +/* Cannot support tunnel packet over IPsec tunnel mode +* because we cannot offload three IP header csum +*/ +if (x->props.mode ==XFRM_MODE_TUNNEL ) + goto out_disable; + +/* Only support UDP or TCP L4 checksum */ +if (xo->inner_ipproto !=IPPROTO_UDP && + xo->inner_ipproto !=IPPROTO_TCP ) + goto out_disable; + } + +return features; + }/* Disable CSUM and GSO for software IPsec */ +out_disable:return features & ~(NETIF_F_CSUM_MASK |NETIF_F_GSO_MASK ); }
Signature · 1 line
2.24.1