IB/core: Change ib_resolve_eth_dmac to use it in create AH

The function ib_resolve_eth_dmac() requires struct qp_attr * and
qp_attr_mask as parameters while the function might be useful to resolve
dmac for address handles. This patch changes the signature of the
function so it can be used in the flow of creating an address handle.

Signed-off-by: Moni Shoua <monis@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/core/core_priv.h b/drivers/infiniband/core/core_priv.h
index 19d499dcab764bc74307b3bd3617cd7657874792..1acc95b3aaa37081dffa41e333982fb4261e0001 100644 (file)
--- a/drivers/infiniband/core/core_priv.h
+++ b/drivers/infiniband/core/core_priv.h
@@ -72,9 +72,6 @@ void ib_device_unregister_sysfs(struct ib_device *device);
 void ib_cache_setup(void);
 void ib_cache_cleanup(void);
 
-int ib_resolve_eth_dmac(struct ib_qp *qp,
-                       struct ib_qp_attr *qp_attr, int *qp_attr_mask);
-
 typedef void (*roce_netdev_callback)(struct ib_device *device, u8 port,
              struct net_device *idev, void *cookie);
 

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index d84dcde7a8bbaf09587a8c86e9b3b6d185f8705b..77bb15f6641400647a65af7df1618f546f58a31d 100644 (file)
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -2402,9 +2402,11 @@ ssize_t ib_uverbs_modify_qp(struct ib_uverbs_file *file,
        attr->alt_ah_attr.port_num          = cmd.alt_dest.port_num;
 
        if (qp->real_qp == qp) {
-               ret = ib_resolve_eth_dmac(qp, attr, &cmd.attr_mask);
-               if (ret)
-                       goto release_qp;
+               if (cmd.attr_mask & IB_QP_AV) {
+                       ret = ib_resolve_eth_dmac(qp->device, &attr->ah_attr);
+                       if (ret)
+                               goto release_qp;
+               }
                ret = qp->device->modify_qp(qp, attr,
                        modify_qp_mask(qp->qp_type, cmd.attr_mask), &udata);
        } else {

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 98e10c5f2a964839d882bd21b980fc1ef0055ae2..cacee169cd554e42059078a04eca74a99b3f0667 100644 (file)
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -1198,66 +1198,66 @@ int ib_modify_qp_is_ok(enum ib_qp_state cur_state, enum ib_qp_state next_state,
 }
 EXPORT_SYMBOL(ib_modify_qp_is_ok);
 
-int ib_resolve_eth_dmac(struct ib_qp *qp,
-                       struct ib_qp_attr *qp_attr, int *qp_attr_mask)
+int ib_resolve_eth_dmac(struct ib_device *device,
+                       struct ib_ah_attr *ah_attr)
 {
        int           ret = 0;
 
-       if (*qp_attr_mask & IB_QP_AV) {
-               if (qp_attr->ah_attr.port_num < rdma_start_port(qp->device) ||
-                   qp_attr->ah_attr.port_num > rdma_end_port(qp->device))
-                       return -EINVAL;
-
-               if (!rdma_cap_eth_ah(qp->device, qp_attr->ah_attr.port_num))
-                       return 0;
-
-               if (rdma_link_local_addr((struct in6_addr *)qp_attr->ah_attr.grh.dgid.raw)) {
-                       rdma_get_ll_mac((struct in6_addr *)qp_attr->ah_attr.grh.dgid.raw,
-                                       qp_attr->ah_attr.dmac);
-               } else {
-                       union ib_gid            sgid;
-                       struct ib_gid_attr      sgid_attr;
-                       int                     ifindex;
-                       int                     hop_limit;
-
-                       ret = ib_query_gid(qp->device,
-                                          qp_attr->ah_attr.port_num,
-                                          qp_attr->ah_attr.grh.sgid_index,
-                                          &sgid, &sgid_attr);
-
-                       if (ret || !sgid_attr.ndev) {
-                               if (!ret)
-                                       ret = -ENXIO;
-                               goto out;
-                       }
+       if (ah_attr->port_num < rdma_start_port(device) ||
+           ah_attr->port_num > rdma_end_port(device))
+               return -EINVAL;
 
-                       ifindex = sgid_attr.ndev->ifindex;
+       if (!rdma_cap_eth_ah(device, ah_attr->port_num))
+               return 0;
 
-                       ret = rdma_addr_find_l2_eth_by_grh(&sgid,
-                                                          &qp_attr->ah_attr.grh.dgid,
-                                                          qp_attr->ah_attr.dmac,
-                                                          NULL, &ifindex, &hop_limit);
+       if (rdma_link_local_addr((struct in6_addr *)ah_attr->grh.dgid.raw)) {
+               rdma_get_ll_mac((struct in6_addr *)ah_attr->grh.dgid.raw,
+                               ah_attr->dmac);
+       } else {
+               union ib_gid            sgid;
+               struct ib_gid_attr      sgid_attr;
+               int                     ifindex;
+               int                     hop_limit;
+
+               ret = ib_query_gid(device,
+                                  ah_attr->port_num,
+                                  ah_attr->grh.sgid_index,
+                                  &sgid, &sgid_attr);
+
+               if (ret || !sgid_attr.ndev) {
+                       if (!ret)
+                               ret = -ENXIO;
+                       goto out;
+               }
 
-                       dev_put(sgid_attr.ndev);
+               ifindex = sgid_attr.ndev->ifindex;
 
-                       qp_attr->ah_attr.grh.hop_limit = hop_limit;
-               }
+               ret = rdma_addr_find_l2_eth_by_grh(&sgid,
+                                                  &ah_attr->grh.dgid,
+                                                  ah_attr->dmac,
+                                                  NULL, &ifindex, &hop_limit);
+
+               dev_put(sgid_attr.ndev);
+
+               ah_attr->grh.hop_limit = hop_limit;
        }
 out:
        return ret;
 }
 EXPORT_SYMBOL(ib_resolve_eth_dmac);
 
-
 int ib_modify_qp(struct ib_qp *qp,
                 struct ib_qp_attr *qp_attr,
                 int qp_attr_mask)
 {
-       int ret;
 
-       ret = ib_resolve_eth_dmac(qp, qp_attr, &qp_attr_mask);
-       if (ret)
-               return ret;
+       if (qp_attr_mask & IB_QP_AV) {
+               int ret;
+
+               ret = ib_resolve_eth_dmac(qp->device, &qp_attr->ah_attr);
+               if (ret)
+                       return ret;
+       }
 
        return qp->device->modify_qp(qp->real_qp, qp_attr, qp_attr_mask, NULL);
 }

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 6d0dd6525e14773cc7bf233c9a77bdf284b8c4b3..0c6f973e407c29ab3e7b58585d838294476f4f81 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -3394,4 +3394,6 @@ void ib_drain_rq(struct ib_qp *qp);
 void ib_drain_sq(struct ib_qp *qp);
 void ib_drain_qp(struct ib_qp *qp);
 
+int ib_resolve_eth_dmac(struct ib_device *device,
+                       struct ib_ah_attr *ah_attr);
 #endif /* IB_VERBS_H */