net/mlx5: Fix checksum issue of VXLAN and IPsec crypto offload

The 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.

Signed-off-by: Raed Salem <raeds@nvidia.com>
Signed-off-by: Huy Nguyen <huyn@nvidia.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c
index a97e8d205094dce07f934b4e52d8278bb793e182..33de8f0092a66ce6d8c51987b669ef75b4507565 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c
@@ -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,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h
index cfa98272e4a9e332b6c180c1616c96493ec492d3..5120a59361e6a38c7a9f9cfd424b070459d194e3 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h
@@ -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);
 }