[net PATCH] mlx4e: Do not attempt to offload VXLAN ports that are unrecognized

[net PATCH] mlx4e: Do not attempt to offload VXLAN ports that are unrecognized

[Alexander Duyck]

The mlx4e driver does not support more than one port for VXLAN offload.  As
such expecting the hardware to offload other ports is invalid since it
appears the parsing logic is used to perform Tx checksum and segmentation
offloads.  Use the vxlan_port number to determine in which cases we can
apply the offload and in which cases we can not.

Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
---
 drivers/net/ethernet/mellanox/mlx4/en_netdev.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 973391bfe286..2221403b65e4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -2447,9 +2447,14 @@ static netdev_features_t mlx4_en_features_check(struct sk_buff *skb,
 	 * strip that feature if this is an IPv6 encapsulated frame.
 	 */
 	if (skb->encapsulation &&
-	    (skb->ip_summed == CHECKSUM_PARTIAL) &&
-	    (ip_hdr(skb)->version != 4))
-		features &= ~(NETIF_F_CSUM_MASK | NETIF_F_GSO_MASK);
+	    (skb->ip_summed == CHECKSUM_PARTIAL)) {
+		struct mlx4_en_priv *priv = netdev_priv(dev);
+
+		if (!priv->vxlan_port ||
+		    (ip_hdr(skb)->version != 4) ||
+		    (udp_hdr(skb)->dest != priv->vxlan_port))
+			features &= ~(NETIF_F_CSUM_MASK | NETIF_F_GSO_MASK);
+	}
 
 	return features;
 }

Re: [net PATCH] mlx4e: Do not attempt to offload VXLAN ports that are unrecognized

[Tariq Toukan]

> The mlx4e driver does not support more than one port for VXLAN offload.  As
> such expecting the hardware to offload other ports is invalid since it
> appears the parsing logic is used to perform Tx checksum and segmentation
> offloads.  Use the vxlan_port number to determine in which cases we can
> apply the offload and in which cases we can not.
>
> Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>

Looks good to me. Thanks Alex!

Re: [net PATCH] mlx4e: Do not attempt to offload VXLAN ports that are unrecognized

[David Miller]

From: Alexander Duyck <aduyck@mirantis.com>
Date: Wed, 15 Jun 2016 14:42:11 -0700

> The mlx4e driver does not support more than one port for VXLAN offload.  As
> such expecting the hardware to offload other ports is invalid since it
> appears the parsing logic is used to perform Tx checksum and segmentation
> offloads.  Use the vxlan_port number to determine in which cases we can
> apply the offload and in which cases we can not.
> 
> Signed-off-by: Alexander Duyck <aduyck@mirantis.com>

Applied.