IB/mlx5: Report inner RSS capability

BugLink: http://bugs.launchpad.net/bugs/1763366
[ Upstream commit 4e2b53a5cb5a8243284dd7ec4980d2dc556e79f0 ]

Add missing inner RSS support capability as part of
the RSS supported fields.

In addition change MLX5_RX_HASH_INNER to 1UL << 31 in
order to define it as unsigned.

Fixes: 309fa3470fca ("IB/mlx5: Add support for RSS on the inner packet")
Signed-off-by: Maor Gottlieb <maorg@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 262c1aa2e028aae1e9c9bd7f4a3541105faffa17..f8b06102cc5d063ec6858ea3e8913a1e2fd479a0 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -682,7 +682,8 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
                                                MLX5_RX_HASH_SRC_PORT_TCP |
                                                MLX5_RX_HASH_DST_PORT_TCP |
                                                MLX5_RX_HASH_SRC_PORT_UDP |
-                                               MLX5_RX_HASH_DST_PORT_UDP;
+                                               MLX5_RX_HASH_DST_PORT_UDP |
+                                               MLX5_RX_HASH_INNER;
                        resp.response_length += sizeof(resp.rss_caps);
                }
        } else {

diff --git a/include/uapi/rdma/mlx5-abi.h b/include/uapi/rdma/mlx5-abi.h
index a33e0517d3fdd6e3db50c99e78cb6764c1e25feb..062d14f07b612ce381e0b55b36b5ca427b90cac6 100644 (file)
--- a/include/uapi/rdma/mlx5-abi.h
+++ b/include/uapi/rdma/mlx5-abi.h
@@ -307,7 +307,7 @@ enum mlx5_rx_hash_fields {
        MLX5_RX_HASH_SRC_PORT_UDP       = 1 << 6,
        MLX5_RX_HASH_DST_PORT_UDP       = 1 << 7,
        /* Save bits for future fields */
-       MLX5_RX_HASH_INNER              = 1 << 31
+       MLX5_RX_HASH_INNER              = (1UL << 31),
 };
 
 struct mlx5_ib_create_qp_rss {