IB/core: Depend on IPv6 stack to resolve link local address for RoCEv2

RoCEv1 does not use the IPv6 stack to resolve the link local DGID since it
uses GID address. It forms the DMAC directly from the DGID.

The code became confused and also tried to use this bypass for RoCEv2
packets, however RoCEv2 always uses a IP address in the GID and must
always use ARP or neighbor discovery to get the DMAC address.

Now that rdma_addr_find_l2_eth_by_grh() supports resolving link local
address to find destination mac address, lets make use of it.
This aligns it to how the rest of the IPv6 stack resolves link local
destination IPv6 address.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Eli Cohen <eli@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 54b56c4fcc389a1df38a475cca8f321ba548c6ef..75ebd74f8bbdfa531f5fed6510deb416c7dddb25 100644 (file)
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -506,9 +506,20 @@ static int ib_resolve_unicast_gid_dmac(struct ib_device *device,
                return ret;
        }
 
+       /* If destination is link local and source GID is RoCEv1,
+        * IP stack is not used.
+        */
+       if (rdma_link_local_addr((struct in6_addr *)grh->dgid.raw) &&
+           sgid_attr.gid_type == IB_GID_TYPE_ROCE) {
+               rdma_get_ll_mac((struct in6_addr *)grh->dgid.raw,
+                               ah_attr->roce.dmac);
+               goto done;
+       }
+
        ret = rdma_addr_find_l2_eth_by_grh(&sgid, &grh->dgid,
                                           ah_attr->roce.dmac,
                                           sgid_attr.ndev, &hop_limit);
+done:
        dev_put(sgid_attr.ndev);
 
        grh->hop_limit = hop_limit;
@@ -1280,11 +1291,6 @@ static int ib_resolve_eth_dmac(struct ib_device *device,
 
        grh = rdma_ah_retrieve_grh(ah_attr);
 
-       if (rdma_link_local_addr((struct in6_addr *)grh->dgid.raw)) {
-               rdma_get_ll_mac((struct in6_addr *)grh->dgid.raw,
-                               ah_attr->roce.dmac);
-               return 0;
-       }
        if (rdma_is_multicast_addr((struct in6_addr *)ah_attr->grh.dgid.raw)) {
                if (ipv6_addr_v4mapped((struct in6_addr *)ah_attr->grh.dgid.raw)) {
                        __be32 addr = 0;