FAILED: patch "[PATCH] IB/mlx5: Replace tunnel mpls capability bits for" failed to apply to 4.19-stable tree

FAILED: patch "[PATCH] IB/mlx5: Replace tunnel mpls capability bits for" failed to apply to 4.19-stable tree

[gregkh]

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 41e684ef3f37ce6e5eac3fb5b9c7c1853f4b0447 Mon Sep 17 00:00:00 2001
From: Alex Vesker <valex@mellanox.com>
Date: Thu, 5 Mar 2020 14:38:41 +0200
Subject: [PATCH] IB/mlx5: Replace tunnel mpls capability bits for
 tunnel_offloads

Until now the flex parser capability was used in ib_query_device() to
indicate tunnel_offloads_caps support for mpls_over_gre/mpls_over_udp.

Newer devices and firmware will have configurations with the flexparser
but without mpls support.

Testing for the flex parser capability was a mistake, the tunnel_stateless
capability was intended for detecting mpls and was introduced at the same
time as the flex parser capability.

Otherwise userspace will be incorrectly informed that a future device
supports MPLS when it does not.

Link: https://lore.kernel.org/r/20200305123841.196086-1-leon@kernel.org
Cc: <stable@vger.kernel.org> # 4.17
Fixes: e818e255a58d ("IB/mlx5: Expose MPLS related tunneling offloads")
Signed-off-by: Alex Vesker <valex@mellanox.com>
Reviewed-by: Ariel Levkovich <lariel@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index eba7604eaa76..9c3993c7e9a1 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -1192,12 +1192,10 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
 		if (MLX5_CAP_ETH(mdev, tunnel_stateless_gre))
 			resp.tunnel_offloads_caps |=
 				MLX5_IB_TUNNELED_OFFLOADS_GRE;
-		if (MLX5_CAP_GEN(mdev, flex_parser_protocols) &
-		    MLX5_FLEX_PROTO_CW_MPLS_GRE)
+		if (MLX5_CAP_ETH(mdev, tunnel_stateless_mpls_over_gre))
 			resp.tunnel_offloads_caps |=
 				MLX5_IB_TUNNELED_OFFLOADS_MPLS_GRE;
-		if (MLX5_CAP_GEN(mdev, flex_parser_protocols) &
-		    MLX5_FLEX_PROTO_CW_MPLS_UDP)
+		if (MLX5_CAP_ETH(mdev, tunnel_stateless_mpls_over_udp))
 			resp.tunnel_offloads_caps |=
 				MLX5_IB_TUNNELED_OFFLOADS_MPLS_UDP;
 	}
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index f9bcbe653fda..f3a7189f9d6d 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -877,7 +877,11 @@ struct mlx5_ifc_per_protocol_networking_offload_caps_bits {
 	u8         swp_csum[0x1];
 	u8         swp_lso[0x1];
 	u8         cqe_checksum_full[0x1];
-	u8         reserved_at_24[0x5];
+	u8         tunnel_stateless_geneve_tx[0x1];
+	u8         tunnel_stateless_mpls_over_udp[0x1];
+	u8         tunnel_stateless_mpls_over_gre[0x1];
+	u8         tunnel_stateless_vxlan_gpe[0x1];
+	u8         tunnel_stateless_ipv4_over_vxlan[0x1];
 	u8         tunnel_stateless_ip_over_ip[0x1];
 	u8         reserved_at_2a[0x6];
 	u8         max_vxlan_udp_ports[0x8];

Re: FAILED: patch "[PATCH] IB/mlx5: Replace tunnel mpls capability bits for" failed to apply to 4.19-stable tree

[Sasha Levin]

On Fri, Apr 10, 2020 at 11:01:43AM +0200, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 4.19-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From 41e684ef3f37ce6e5eac3fb5b9c7c1853f4b0447 Mon Sep 17 00:00:00 2001
>From: Alex Vesker <valex@mellanox.com>
>Date: Thu, 5 Mar 2020 14:38:41 +0200
>Subject: [PATCH] IB/mlx5: Replace tunnel mpls capability bits for
> tunnel_offloads
>
>Until now the flex parser capability was used in ib_query_device() to
>indicate tunnel_offloads_caps support for mpls_over_gre/mpls_over_udp.
>
>Newer devices and firmware will have configurations with the flexparser
>but without mpls support.
>
>Testing for the flex parser capability was a mistake, the tunnel_stateless
>capability was intended for detecting mpls and was introduced at the same
>time as the flex parser capability.
>
>Otherwise userspace will be incorrectly informed that a future device
>supports MPLS when it does not.
>
>Link: https://lore.kernel.org/r/20200305123841.196086-1-leon@kernel.org
>Cc: <stable@vger.kernel.org> # 4.17
>Fixes: e818e255a58d ("IB/mlx5: Expose MPLS related tunneling offloads")
>Signed-off-by: Alex Vesker <valex@mellanox.com>
>Reviewed-by: Ariel Levkovich <lariel@mellanox.com>
>Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
>Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

The conflict was around the cqe_checksum_full cap bit being exposed by
db849faa9bef ("net/mlx5e: Rx, Fix checksum calculation for new
hardware").

I've resolved it by exposing cqe_checksum_full, but *not* taking
db849faa9bef.

-- 
Thanks,
Sasha

Re: FAILED: patch "[PATCH] IB/mlx5: Replace tunnel mpls capability bits for" failed to apply to 4.19-stable tree

[Greg KH]

On Mon, Apr 13, 2020 at 10:26:59PM -0400, Sasha Levin wrote:
> On Fri, Apr 10, 2020 at 11:01:43AM +0200, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 4.19-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@vger.kernel.org>.
> > 
> > thanks,
> > 
> > greg k-h
> > 
> > ------------------ original commit in Linus's tree ------------------
> > 
> > > From 41e684ef3f37ce6e5eac3fb5b9c7c1853f4b0447 Mon Sep 17 00:00:00 2001
> > From: Alex Vesker <valex@mellanox.com>
> > Date: Thu, 5 Mar 2020 14:38:41 +0200
> > Subject: [PATCH] IB/mlx5: Replace tunnel mpls capability bits for
> > tunnel_offloads
> > 
> > Until now the flex parser capability was used in ib_query_device() to
> > indicate tunnel_offloads_caps support for mpls_over_gre/mpls_over_udp.
> > 
> > Newer devices and firmware will have configurations with the flexparser
> > but without mpls support.
> > 
> > Testing for the flex parser capability was a mistake, the tunnel_stateless
> > capability was intended for detecting mpls and was introduced at the same
> > time as the flex parser capability.
> > 
> > Otherwise userspace will be incorrectly informed that a future device
> > supports MPLS when it does not.
> > 
> > Link: https://lore.kernel.org/r/20200305123841.196086-1-leon@kernel.org
> > Cc: <stable@vger.kernel.org> # 4.17
> > Fixes: e818e255a58d ("IB/mlx5: Expose MPLS related tunneling offloads")
> > Signed-off-by: Alex Vesker <valex@mellanox.com>
> > Reviewed-by: Ariel Levkovich <lariel@mellanox.com>
> > Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> > Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
> 
> The conflict was around the cqe_checksum_full cap bit being exposed by
> db849faa9bef ("net/mlx5e: Rx, Fix checksum calculation for new
> hardware").
> 
> I've resolved it by exposing cqe_checksum_full, but *not* taking
> db849faa9bef.

Thanks for doing this!

greg k-h