IB/core: Introduce and use rdma_create_user_ah

Introduce rdma_create_user_ah API which allows passing udata to
provider driver and additionally which resolves DMAC for RoCE.

ib_resolve_eth_dmac() resolves destination mac address for unicast,
multicast, link local ipv4 mapped ipv6 and ipv6 destination gid entry.
This allows all RoCE provider drivers to avoid duplicating such code.

Such change brings consistency where IB core always resolves dmac and pass
it to RoCE provider drivers for user and kernel consumers, with this
ah_attr->roce.dmac is always an input field for provider drivers.

This uniformity avoids exporting ib_resolve_eth_dmac symbol to providers
or other modules. Therefore its removed as exported symbol at later in
the patch series.

Now uverbs and umad both makes use of rdma_create_user_ah API which
fixes the issue where umad has invalid DMAC for address.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index c1696e6084b2b12b2a671799a891ef0d0f04f3d1..38809962c10536137b919a85338f5094b8d696b2 100644 (file)
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -506,7 +506,7 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf,
                rdma_ah_set_dgid_raw(&ah_attr, packet->mad.hdr.gid);
        }
 
-       ah = rdma_create_ah(agent->qp->pd, &ah_attr);
+       ah = rdma_create_user_ah(agent->qp->pd, &ah_attr, NULL);
        if (IS_ERR(ah)) {
                ret = PTR_ERR(ah);
                goto err_up;

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 52a2cf2d83aaf483944ad9720e55121f2adb6484..0cef1863e2dc7b9925fc8bd890a1e2f487886522 100644 (file)
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -2537,7 +2537,6 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file,
        struct rdma_ah_attr             attr;
        int ret;
        struct ib_udata                   udata;
-       u8                              *dmac;
 
        if (out_len < sizeof resp)
                return -ENOSPC;
@@ -2580,20 +2579,13 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file,
        } else {
                rdma_ah_set_ah_flags(&attr, 0);
        }
-       dmac = rdma_ah_retrieve_dmac(&attr);
-       if (dmac)
-               memset(dmac, 0, ETH_ALEN);
-
-       ah = pd->device->create_ah(pd, &attr, &udata);
 
+       ah = rdma_create_user_ah(pd, &attr, &udata);
        if (IS_ERR(ah)) {
                ret = PTR_ERR(ah);
                goto err_put;
        }
 
-       ah->device  = pd->device;
-       ah->pd      = pd;
-       atomic_inc(&pd->usecnt);
        ah->uobject  = uobj;
        uobj->user_handle = cmd.user_handle;
        uobj->object = ah;

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index de57d6c11a25428d96e8bcb4868fc19794cc374d..4dcfe47c479d23d857cba6d7cab146a6df8a8c1a 100644 (file)
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -302,11 +302,13 @@ EXPORT_SYMBOL(ib_dealloc_pd);
 
 /* Address handles */
 
-struct ib_ah *rdma_create_ah(struct ib_pd *pd, struct rdma_ah_attr *ah_attr)
+static struct ib_ah *_rdma_create_ah(struct ib_pd *pd,
+                                    struct rdma_ah_attr *ah_attr,
+                                    struct ib_udata *udata)
 {
        struct ib_ah *ah;
 
-       ah = pd->device->create_ah(pd, ah_attr, NULL);
+       ah = pd->device->create_ah(pd, ah_attr, udata);
 
        if (!IS_ERR(ah)) {
                ah->device  = pd->device;
@@ -318,8 +320,42 @@ struct ib_ah *rdma_create_ah(struct ib_pd *pd, struct rdma_ah_attr *ah_attr)
 
        return ah;
 }
+
+struct ib_ah *rdma_create_ah(struct ib_pd *pd, struct rdma_ah_attr *ah_attr)
+{
+       return _rdma_create_ah(pd, ah_attr, NULL);
+}
 EXPORT_SYMBOL(rdma_create_ah);
 
+/**
+ * rdma_create_user_ah - Creates an address handle for the
+ * given address vector.
+ * It resolves destination mac address for ah attribute of RoCE type.
+ * @pd: The protection domain associated with the address handle.
+ * @ah_attr: The attributes of the address vector.
+ * @udata: pointer to user's input output buffer information need by
+ *         provider driver.
+ *
+ * It returns 0 on success and returns appropriate error code on error.
+ * The address handle is used to reference a local or global destination
+ * in all UD QP post sends.
+ */
+struct ib_ah *rdma_create_user_ah(struct ib_pd *pd,
+                                 struct rdma_ah_attr *ah_attr,
+                                 struct ib_udata *udata)
+{
+       int err;
+
+       if (ah_attr->type == RDMA_AH_ATTR_TYPE_ROCE) {
+               err = ib_resolve_eth_dmac(pd->device, ah_attr);
+               if (err)
+                       return ERR_PTR(err);
+       }
+
+       return _rdma_create_ah(pd, ah_attr, udata);
+}
+EXPORT_SYMBOL(rdma_create_user_ah);
+
 int ib_get_rdma_header_version(const union rdma_network_hdr *hdr)
 {
        const struct iphdr *ip4h = (struct iphdr *)&hdr->roce4grh;

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index e8608b2dc844fb27c0e7e5ceb359fe357ecf6553..09c4a695155ef286cebebc087a0b0b31e71efdd3 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -2857,6 +2857,21 @@ void ib_dealloc_pd(struct ib_pd *pd);
  */
 struct ib_ah *rdma_create_ah(struct ib_pd *pd, struct rdma_ah_attr *ah_attr);
 
+/**
+ * rdma_create_user_ah - Creates an address handle for the given address vector.
+ * It resolves destination mac address for ah attribute of RoCE type.
+ * @pd: The protection domain associated with the address handle.
+ * @ah_attr: The attributes of the address vector.
+ * @udata: pointer to user's input output buffer information need by
+ *         provider driver.
+ *
+ * It returns 0 on success and returns appropriate error code on error.
+ * The address handle is used to reference a local or global destination
+ * in all UD QP post sends.
+ */
+struct ib_ah *rdma_create_user_ah(struct ib_pd *pd,
+                                 struct rdma_ah_attr *ah_attr,
+                                 struct ib_udata *udata);
 /**
  * ib_get_gids_from_rdma_hdr - Get sgid and dgid from GRH or IPv4 header
  *   work completion.