IB/core: Explicitly destroy an object while keeping uobject

When some objects are destroyed, we need to extract their status at
destruction. After object's destruction, this status
(e.g. events_reported) relies in the uobject. In order to have the
latest and correct status, the underlying object should be destroyed,
but we should keep the uobject alive and read this information off the
uobject. We introduce a rdma_explicit_destroy function. This function
destroys the class type object (for example, the IDR class type which
destroys the underlying object as well) and then convert the uobject
to be of a null class type. This uobject will then be destroyed as any
other uobject once uverbs_finalize_object[s] is called.

Signed-off-by: Matan Barak <matanb@mellanox.com>
Reviewed-by: Yishai Hadas <yishaih@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/core/rdma_core.c b/drivers/infiniband/core/rdma_core.c
index 2a2f002ac7cbffe1043ef818b3346c07b9cc13fd..85b5ee4defa4bed1cabaeaa1fe0f1121bc91c242 100644 (file)
--- a/drivers/infiniband/core/rdma_core.c
+++ b/drivers/infiniband/core/rdma_core.c
@@ -451,6 +451,41 @@ int __must_check rdma_remove_commit_uobject(struct ib_uobject *uobj)
        return ret;
 }
 
+static int null_obj_type_class_remove_commit(struct ib_uobject *uobj,
+                                            enum rdma_remove_reason why)
+{
+       return 0;
+}
+
+static const struct uverbs_obj_type null_obj_type = {
+       .type_class = &((const struct uverbs_obj_type_class){
+                       .remove_commit = null_obj_type_class_remove_commit,
+                       /* be cautious */
+                       .needs_kfree_rcu = true}),
+};
+
+int rdma_explicit_destroy(struct ib_uobject *uobject)
+{
+       int ret;
+       struct ib_ucontext *ucontext = uobject->context;
+
+       /* Cleanup is running. Calling this should have been impossible */
+       if (!down_read_trylock(&ucontext->cleanup_rwsem)) {
+               WARN(true, "ib_uverbs: Cleanup is running while removing an uobject\n");
+               return 0;
+       }
+       lockdep_check(uobject, true);
+       ret = uobject->type->type_class->remove_commit(uobject,
+                                                      RDMA_REMOVE_DESTROY);
+       if (ret)
+               return ret;
+
+       uobject->type = &null_obj_type;
+
+       up_read(&ucontext->cleanup_rwsem);
+       return 0;
+}
+
 static void alloc_commit_idr_uobject(struct ib_uobject *uobj)
 {
        uverbs_uobject_add(uobj);

diff --git a/include/rdma/uverbs_types.h b/include/rdma/uverbs_types.h
index 9760b6d7074413fe4b3a3ed0126c6fb14051adad..cc04ec65588daa9bc07903dd8831c8cda3d4bc85 100644 (file)
--- a/include/rdma/uverbs_types.h
+++ b/include/rdma/uverbs_types.h
@@ -129,6 +129,7 @@ struct ib_uobject *rdma_alloc_begin_uobject(const struct uverbs_obj_type *type,
 void rdma_alloc_abort_uobject(struct ib_uobject *uobj);
 int __must_check rdma_remove_commit_uobject(struct ib_uobject *uobj);
 int rdma_alloc_commit_uobject(struct ib_uobject *uobj);
+int rdma_explicit_destroy(struct ib_uobject *uobject);
 
 struct uverbs_obj_fd_type {
        /*