RDMA/cma: Set default GID type as RoCE when resolving RoCE route

As the function name suggests cma_resolve_iboe_route() resolves RoCE
route. However, its default GID type is IB_GID_TYPE_IB and not
IB_GID_TYPE_ROCE, even though both are mapped to the same enum value.
Change default GID type to IB_GID_TYPE_ROCE.

cma_iboe_set_mgid() is updated to reflect the RoCEv2 GID check.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Reviewed-by: Noa Osherovich <noaos@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 9841e7ca5c06677a0086838a66a6cd4ade776c65..e63a51b68ed569e461b3a2756309253bc899f320 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2528,7 +2528,7 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)
        struct cma_work *work;
        int ret;
        struct net_device *ndev = NULL;
-       enum ib_gid_type gid_type = IB_GID_TYPE_IB;
+       enum ib_gid_type gid_type = IB_GID_TYPE_ROCE;
        u8 default_roce_tos = id_priv->cma_dev->default_roce_tos[id_priv->id.port_num -
                                        rdma_start_port(id_priv->cma_dev->device)];
        u8 tos = id_priv->tos_set ? id_priv->tos : default_roce_tos;
@@ -4009,8 +4009,10 @@ static void cma_iboe_set_mgid(struct sockaddr *addr, union ib_gid *mgid,
        } else if (addr->sa_family == AF_INET6) {
                memcpy(mgid, &sin6->sin6_addr, sizeof *mgid);
        } else {
-               mgid->raw[0] = (gid_type == IB_GID_TYPE_IB) ? 0xff : 0;
-               mgid->raw[1] = (gid_type == IB_GID_TYPE_IB) ? 0x0e : 0;
+               mgid->raw[0] =
+                       (gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP) ? 0 : 0xff;
+               mgid->raw[1] =
+                       (gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP) ? 0 : 0x0e;
                mgid->raw[2] = 0;
                mgid->raw[3] = 0;
                mgid->raw[4] = 0;