IB/uverbs: Add ib_ucontext to uverbs_attr_bundle sent from ioctl and cmd flows

Add ib_ucontext to the uverbs_attr_bundle sent down the iocl and cmd flows
as soon as the flow has ib_uobject.

In addition, remove rdma_get_ucontext helper function that is only used by
ib_umem_get.

Signed-off-by: Shamir Rabinovitch <shamir.rabinovitch@oracle.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/rdma_core.c b/drivers/infiniband/core/rdma_core.c
index a260d2f..96f919f 100644 (file)
--- a/drivers/infiniband/core/rdma_core.c
+++ b/drivers/infiniband/core/rdma_core.c
@@ -438,6 +438,38 @@ free:
        uverbs_uobject_put(uobj);
        return ERR_PTR(ret);
 }
+struct ib_uobject *_uobj_get_read(enum uverbs_default_objects type,
+                                 u32 object_id,
+                                 struct uverbs_attr_bundle *attrs)
+{
+       struct ib_uobject *uobj;
+
+       uobj = rdma_lookup_get_uobject(uobj_get_type(attrs, type), attrs->ufile,
+                                      object_id, UVERBS_LOOKUP_READ);
+       if (IS_ERR(uobj))
+               return uobj;
+
+       attrs->context = uobj->context;
+
+       return uobj;
+}
+
+struct ib_uobject *_uobj_get_write(enum uverbs_default_objects type,
+                                  u32 object_id,
+                                  struct uverbs_attr_bundle *attrs)
+{
+       struct ib_uobject *uobj;
+
+       uobj = rdma_lookup_get_uobject(uobj_get_type(attrs, type), attrs->ufile,
+                                      object_id, UVERBS_LOOKUP_WRITE);
+
+       if (IS_ERR(uobj))
+               return uobj;
+
+       attrs->context = uobj->context;
+
+       return uobj;
+}
 
 static struct ib_uobject *
 alloc_begin_idr_uobject(const struct uverbs_api_object *obj,

diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index b69d3ef..fe55515 100644 (file)
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -96,9 +96,13 @@ struct ib_umem *ib_umem_get(struct ib_udata *udata, unsigned long addr,
        struct scatterlist *sg, *sg_list_start;
        unsigned int gup_flags = FOLL_WRITE;
 
-       context = rdma_get_ucontext(udata);
-       if (IS_ERR(context))
-               return ERR_CAST(context);
+       if (!udata)
+               return ERR_PTR(-EIO);
+
+       context = container_of(udata, struct uverbs_attr_bundle, driver_udata)
+                         ->context;
+       if (!context)
+               return ERR_PTR(-EIO);
 
        if (dmasync)
                dma_attrs |= DMA_ATTR_WRITE_BARRIER;

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 5ac143f..c2e7733 100644 (file)
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -2634,7 +2634,7 @@ void flow_resources_add(struct ib_uflow_resources *uflow_res,
 }
 EXPORT_SYMBOL(flow_resources_add);
 
-static int kern_spec_to_ib_spec_action(const struct uverbs_attr_bundle *attrs,
+static int kern_spec_to_ib_spec_action(struct uverbs_attr_bundle *attrs,
                                       struct ib_uverbs_flow_spec *kern_spec,
                                       union ib_flow_spec *ib_spec,
                                       struct ib_uflow_resources *uflow_res)

diff --git a/drivers/infiniband/core/uverbs_ioctl.c b/drivers/infiniband/core/uverbs_ioctl.c
index 0ca04d2..e137994 100644 (file)
--- a/drivers/infiniband/core/uverbs_ioctl.c
+++ b/drivers/infiniband/core/uverbs_ioctl.c
@@ -213,6 +213,7 @@ static int uverbs_process_idrs_array(struct bundle_priv *pbundle,
                        ret = PTR_ERR(attr->uobjects[i]);
                        break;
                }
+               pbundle->bundle.context = attr->uobjects[i]->context;
        }
 
        attr->len = i;
@@ -330,6 +331,7 @@ static int uverbs_process_attr(struct bundle_priv *pbundle,
                                        uattr->data_s64);
                if (IS_ERR(o_attr->uobject))
                        return PTR_ERR(o_attr->uobject);
+               pbundle->bundle.context = o_attr->uobject->context;
                __set_bit(attr_bkey, pbundle->uobj_finalize);
 
                if (spec->u.obj.access == UVERBS_ACCESS_NEW) {
@@ -592,6 +594,7 @@ static int ib_uverbs_cmd_verbs(struct ib_uverbs_file *ufile,
        pbundle->method_elm = method_elm;
        pbundle->method_key = attrs_iter.index;
        pbundle->bundle.ufile = ufile;
+       pbundle->bundle.context = NULL; /* only valid if bundle has uobject */
        pbundle->radix = &uapi->radix;
        pbundle->radix_slots = slot;
        pbundle->radix_slots_len = radix_tree_chunk_size(&attrs_iter);

diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index accc61c..70b7d80 100644 (file)
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -101,30 +101,6 @@ struct ib_ucontext *ib_uverbs_get_ucontext_file(struct ib_uverbs_file *ufile)
 }
 EXPORT_SYMBOL(ib_uverbs_get_ucontext_file);
 
-/* rdma_get_ucontext - Return the ucontext from a udata
- * @udata: The udata to get the context from
- *
- * This can only be called from within a uapi method that was passed ib_udata
- * as a parameter. It returns the ucontext associated with the udata, or ERR_PTR
- * if the udata is NULL or the ucontext has been disassociated.
- */
-struct ib_ucontext *rdma_get_ucontext(struct ib_udata *udata)
-{
-       if (!udata)
-               return ERR_PTR(-EIO);
-
-       /*
-        * FIXME: Really all cases that get here with a udata will have
-        * already called ib_uverbs_get_ucontext_file, or located a uobject
-        * that points to a ucontext. We could store that result in the udata
-        * so this function can't fail.
-        */
-       return ib_uverbs_get_ucontext_file(
-               container_of(udata, struct uverbs_attr_bundle, driver_udata)
-                       ->ufile);
-}
-EXPORT_SYMBOL(rdma_get_ucontext);
-
 int uverbs_dealloc_mw(struct ib_mw *mw)
 {
        struct ib_pd *pd = mw->pd;
@@ -719,6 +695,7 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,
 
        memset(bundle.attr_present, 0, sizeof(bundle.attr_present));
        bundle.ufile = file;
+       bundle.context = NULL; /* only valid if bundle has uobject */
        if (!method_elm->is_ex) {
                size_t in_len = hdr.in_words * 4 - sizeof(hdr);
                size_t out_len = hdr.out_words * 4;

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 135fab2..64ee7c0 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -4247,8 +4247,6 @@ void rdma_roce_rescan_device(struct ib_device *ibdev);
 
 struct ib_ucontext *ib_uverbs_get_ucontext_file(struct ib_uverbs_file *ufile);
 
-struct ib_ucontext *rdma_get_ucontext(struct ib_udata *udata);
-
 int uverbs_destroy_def_handler(struct uverbs_attr_bundle *attrs);
 
 struct net_device *rdma_alloc_netdev(struct ib_device *device, u8 port_num,

diff --git a/include/rdma/uverbs_ioctl.h b/include/rdma/uverbs_ioctl.h
index 27da906..b14a9ee 100644 (file)
--- a/include/rdma/uverbs_ioctl.h
+++ b/include/rdma/uverbs_ioctl.h
@@ -652,6 +652,7 @@ struct uverbs_attr_bundle {
        struct ib_udata driver_udata;
        struct ib_udata ucore;
        struct ib_uverbs_file *ufile;
+       struct ib_ucontext *context;
        DECLARE_BITMAP(attr_present, UVERBS_API_ATTR_BKEY_LEN);
        struct uverbs_attr attrs[];
 };

diff --git a/include/rdma/uverbs_std_types.h b/include/rdma/uverbs_std_types.h
index 883abcf..794c475 100644 (file)
--- a/include/rdma/uverbs_std_types.h
+++ b/include/rdma/uverbs_std_types.h
@@ -48,9 +48,12 @@
 #define uobj_get_type(_attrs, _object)                                         \
        uapi_get_object((_attrs)->ufile->device->uapi, _object)
 
+struct ib_uobject *_uobj_get_read(enum uverbs_default_objects type,
+                                 u32 object_id,
+                                 struct uverbs_attr_bundle *attrs);
+
 #define uobj_get_read(_type, _id, _attrs)                                      \
-       rdma_lookup_get_uobject(uobj_get_type(_attrs, _type), (_attrs)->ufile, \
-                               _uobj_check_id(_id), UVERBS_LOOKUP_READ)
+       _uobj_get_read(_type, _uobj_check_id(_id), _attrs)
 
 #define ufd_get_read(_type, _fdnum, _attrs)                                    \
        rdma_lookup_get_uobject(uobj_get_type(_attrs, _type), (_attrs)->ufile, \
@@ -67,9 +70,12 @@ static inline void *_uobj_get_obj_read(struct ib_uobject *uobj)
        ((struct ib_##_object *)_uobj_get_obj_read(                            \
                uobj_get_read(_type, _id, _attrs)))
 
+struct ib_uobject *_uobj_get_write(enum uverbs_default_objects type,
+                                  u32 object_id,
+                                  struct uverbs_attr_bundle *attrs);
+
 #define uobj_get_write(_type, _id, _attrs)                                     \
-       rdma_lookup_get_uobject(uobj_get_type(_attrs, _type), (_attrs)->ufile, \
-                               _uobj_check_id(_id), UVERBS_LOOKUP_WRITE)
+       _uobj_get_write(_type, _uobj_check_id(_id), _attrs)
 
 int __uobj_perform_destroy(const struct uverbs_api_object *obj, u32 id,
                           const struct uverbs_attr_bundle *attrs);
@@ -123,8 +129,10 @@ __uobj_alloc(const struct uverbs_api_object *obj,
 {
        struct ib_uobject *uobj = rdma_alloc_begin_uobject(obj, attrs->ufile);
 
-       if (!IS_ERR(uobj))
+       if (!IS_ERR(uobj)) {
                *ib_dev = uobj->context->device;
+               attrs->context = uobj->context;
+       }
        return uobj;
 }