IB/core: Add idr based standard types

This patch adds the standard idr based types. These types are
used in downstream patches in order to initialize, destroy and
lookup IB standard objects which are based on idr objects.

An idr object requires filling out several parameters. Its op pointer
should point to uverbs_idr_ops and its size should be at least the
size of ib_uobject. We add a macro to make the type declaration easier.

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

7 files changed, 329 insertions, 10 deletions

diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile
index d29f910d98c9..6ebd9ad95010 100644
--- a/drivers/infiniband/core/Makefile
+++ b/drivers/infiniband/core/Makefile
@@ -30,4 +30,4 @@ ib_umad-y :=			user_mad.o
 ib_ucm-y :=                     ucm.o
 
 ib_uverbs-y :=                  uverbs_main.o uverbs_cmd.o uverbs_marshall.o \
-                                rdma_core.o
+                                rdma_core.o uverbs_std_types.o
diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h
index 6215735fa98e..cf0519dff3a2 100644
--- a/drivers/infiniband/core/uverbs.h
+++ b/drivers/infiniband/core/uverbs.h
@@ -201,9 +201,12 @@ void ib_uverbs_wq_event_handler(struct ib_event *event, void *context_ptr);
 void ib_uverbs_srq_event_handler(struct ib_event *event, void *context_ptr);
 void ib_uverbs_event_handler(struct ib_event_handler *handler,
                              struct ib_event *event);
-void ib_uverbs_dealloc_xrcd(struct ib_uverbs_device *dev, struct ib_xrcd *xrcd);
+int ib_uverbs_dealloc_xrcd(struct ib_uverbs_device *dev, struct ib_xrcd *xrcd,
+                           enum rdma_remove_reason why);
 
 int uverbs_dealloc_mw(struct ib_mw *mw);
+void ib_uverbs_detach_umcast(struct ib_qp *qp,
+                             struct ib_uqp_object *uobj);
 
 struct ib_uverbs_flow_spec {
         union {
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 03c4f68a88e1..79de69dc9f1c 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -958,19 +958,25 @@ out:
         return ret;
 }
 
-void ib_uverbs_dealloc_xrcd(struct ib_uverbs_device *dev,
-                            struct ib_xrcd *xrcd)
+int ib_uverbs_dealloc_xrcd(struct ib_uverbs_device *dev,
+                           struct ib_xrcd *xrcd,
+                           enum rdma_remove_reason why)
 {
         struct inode *inode;
+        int ret;
 
         inode = xrcd->inode;
         if (inode && !atomic_dec_and_test(&xrcd->usecnt))
-                return;
+                return 0;
 
-        ib_dealloc_xrcd(xrcd);
+        ret = ib_dealloc_xrcd(xrcd);
 
-        if (inode)
+        if (why == RDMA_REMOVE_DESTROY && ret)
+                atomic_inc(&xrcd->usecnt);
+        else if (inode)
                 xrcd_table_delete(dev, inode);
+
+        return ret;
 }
 
 ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index f6812fb6cd0c..e1db6782d0d4 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -201,8 +201,8 @@ void ib_uverbs_release_uevent(struct ib_uverbs_file *file,
         spin_unlock_irq(&file->async_file->lock);
 }
 
-static void ib_uverbs_detach_umcast(struct ib_qp *qp,
-                                    struct ib_uqp_object *uobj)
+void ib_uverbs_detach_umcast(struct ib_qp *qp,
+                             struct ib_uqp_object *uobj)
 {
         struct ib_uverbs_mcast_entry *mcast, *tmp;
 
@@ -331,7 +331,9 @@ static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file,
                         container_of(uobj, struct ib_uxrcd_object, uobject);
 
                 idr_remove_uobj(uobj);
-                ib_uverbs_dealloc_xrcd(file->device, xrcd);
+                ib_uverbs_dealloc_xrcd(file->device, xrcd,
+                                       file->ucontext ? RDMA_REMOVE_CLOSE :
+                                       RDMA_REMOVE_DRIVER_REMOVE);
                 kfree(uxrcd);
         }
         mutex_unlock(&file->device->xrcd_tree_mutex);
diff --git a/drivers/infiniband/core/uverbs_std_types.c b/drivers/infiniband/core/uverbs_std_types.c
new file mode 100644
index 000000000000..a514556139e7
--- /dev/null
+++ b/drivers/infiniband/core/uverbs_std_types.c
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 2017, Mellanox Technologies inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <rdma/uverbs_std_types.h>
+#include <rdma/ib_user_verbs.h>
+#include <rdma/ib_verbs.h>
+#include <linux/bug.h>
+#include <linux/file.h>
+#include "rdma_core.h"
+#include "uverbs.h"
+
+int uverbs_free_ah(struct ib_uobject *uobject,
+                   enum rdma_remove_reason why)
+{
+        return ib_destroy_ah((struct ib_ah *)uobject->object);
+}
+
+int uverbs_free_flow(struct ib_uobject *uobject,
+                     enum rdma_remove_reason why)
+{
+        return ib_destroy_flow((struct ib_flow *)uobject->object);
+}
+
+int uverbs_free_mw(struct ib_uobject *uobject,
+                   enum rdma_remove_reason why)
+{
+        return uverbs_dealloc_mw((struct ib_mw *)uobject->object);
+}
+
+int uverbs_free_qp(struct ib_uobject *uobject,
+                   enum rdma_remove_reason why)
+{
+        struct ib_qp *qp = uobject->object;
+        struct ib_uqp_object *uqp =
+                container_of(uobject, struct ib_uqp_object, uevent.uobject);
+        int ret;
+
+        if (why == RDMA_REMOVE_DESTROY) {
+                if (!list_empty(&uqp->mcast_list))
+                        return -EBUSY;
+        } else if (qp == qp->real_qp) {
+                ib_uverbs_detach_umcast(qp, uqp);
+        }
+
+        ret = ib_destroy_qp(qp);
+        if (ret && why == RDMA_REMOVE_DESTROY)
+                return ret;
+
+        if (uqp->uxrcd)
+                atomic_dec(&uqp->uxrcd->refcnt);
+
+        ib_uverbs_release_uevent(uobject->context->ufile, &uqp->uevent);
+        return ret;
+}
+
+int uverbs_free_rwq_ind_tbl(struct ib_uobject *uobject,
+                            enum rdma_remove_reason why)
+{
+        struct ib_rwq_ind_table *rwq_ind_tbl = uobject->object;
+        struct ib_wq **ind_tbl = rwq_ind_tbl->ind_tbl;
+        int ret;
+
+        ret = ib_destroy_rwq_ind_table(rwq_ind_tbl);
+        if (!ret || why != RDMA_REMOVE_DESTROY)