IB/mlx5: Expose vlan offloads capabilities

Check device's capabilities and report which raw packet capabilities
are supported.

Signed-off-by: Noa Osherovich <noaos@mellanox.com>
Reviewed-by: Maor Gottlieb <maorg@mellanox.com>
Reviewed-by: Yishai Hadas <yishaih@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index f8fe98d229657915134df385a66ac50fd9cd0b88..fe37da2be26fe868701322669c8063534c51370b 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -581,8 +581,15 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
                props->device_cap_flags |= IB_DEVICE_BLOCK_MULTICAST_LOOPBACK;
 
        if (MLX5_CAP_GEN(dev->mdev, eth_net_offloads)) {
-               if (MLX5_CAP_ETH(mdev, csum_cap))
+               if (MLX5_CAP_ETH(mdev, csum_cap)) {
+                       /* Legacy bit to support old userspace libraries */
                        props->device_cap_flags |= IB_DEVICE_RAW_IP_CSUM;
+                       props->raw_packet_caps |= IB_RAW_PACKET_CAP_IP_CSUM;
+               }
+
+               if (MLX5_CAP_ETH(dev->mdev, vlan_cap))
+                       props->raw_packet_caps |=
+                               IB_RAW_PACKET_CAP_CVLAN_STRIPPING;
 
                if (field_avail(typeof(resp), tso_caps, uhw->outlen)) {
                        max_tso = MLX5_CAP_ETH(mdev, max_lso_cap);
@@ -621,8 +628,11 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
        }
 
        if (MLX5_CAP_GEN(dev->mdev, eth_net_offloads) &&
-           MLX5_CAP_ETH(dev->mdev, scatter_fcs))
+           MLX5_CAP_ETH(dev->mdev, scatter_fcs)) {
+               /* Legacy bit to support old userspace libraries */
                props->device_cap_flags |= IB_DEVICE_RAW_SCATTER_FCS;
+               props->raw_packet_caps |= IB_RAW_PACKET_CAP_SCATTER_FCS;
+       }
 
        if (mlx5_get_flow_namespace(dev->mdev, MLX5_FLOW_NAMESPACE_BYPASS))
                props->device_cap_flags |= IB_DEVICE_MANAGED_FLOW_STEERING;