projects / linux-block.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma...
[linux-block.git] / drivers / infiniband / core / uverbs_cmd.c
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 4d27e4c3fe34badbe941e735edaf9d8fb33b61f2..f9d0d7c413a25b9e15775acf12ae20335140a2f7 100644 (file)
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -41,13 +41,18 @@
 
 #include "uverbs.h"
 
-static struct lock_class_key pd_lock_key;
-static struct lock_class_key mr_lock_key;
-static struct lock_class_key cq_lock_key;
-static struct lock_class_key qp_lock_key;
-static struct lock_class_key ah_lock_key;
-static struct lock_class_key srq_lock_key;
-static struct lock_class_key xrcd_lock_key;
+struct uverbs_lock_class {
+       struct lock_class_key   key;
+       char                    name[16];
+};
+
+static struct uverbs_lock_class pd_lock_class  = { .name = "PD-uobj" };
+static struct uverbs_lock_class mr_lock_class  = { .name = "MR-uobj" };
+static struct uverbs_lock_class cq_lock_class  = { .name = "CQ-uobj" };
+static struct uverbs_lock_class qp_lock_class  = { .name = "QP-uobj" };
+static struct uverbs_lock_class ah_lock_class  = { .name = "AH-uobj" };
+static struct uverbs_lock_class srq_lock_class = { .name = "SRQ-uobj" };
+static struct uverbs_lock_class xrcd_lock_class = { .name = "XRCD-uobj" };
 
 #define INIT_UDATA(udata, ibuf, obuf, ilen, olen)                      \
        do {                                                            \
@@ -83,13 +88,13 @@ static struct lock_class_key xrcd_lock_key;
  */
 
 static void init_uobj(struct ib_uobject *uobj, u64 user_handle,
-                     struct ib_ucontext *context, struct lock_class_key *key)
+                     struct ib_ucontext *context, struct uverbs_lock_class *c)
 {
        uobj->user_handle = user_handle;
        uobj->context     = context;
        kref_init(&uobj->ref);
        init_rwsem(&uobj->mutex);
-       lockdep_set_class(&uobj->mutex, key);
+       lockdep_set_class_and_name(&uobj->mutex, &c->key, c->name);
        uobj->live        = 0;
 }
 
@@ -522,7 +527,7 @@ ssize_t ib_uverbs_alloc_pd(struct ib_uverbs_file *file,
        if (!uobj)
                return -ENOMEM;
 
-       init_uobj(uobj, 0, file->ucontext, &pd_lock_key);
+       init_uobj(uobj, 0, file->ucontext, &pd_lock_class);
        down_write(&uobj->mutex);
 
        pd = file->device->ib_dev->alloc_pd(file->device->ib_dev,
@@ -750,7 +755,7 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file,
                goto err_tree_mutex_unlock;
        }
 
-       init_uobj(&obj->uobject, 0, file->ucontext, &xrcd_lock_key);
+       init_uobj(&obj->uobject, 0, file->ucontext, &xrcd_lock_class);
 
        down_write(&obj->uobject.mutex);
 
@@ -947,7 +952,7 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
        if (!uobj)
                return -ENOMEM;
 
-       init_uobj(uobj, 0, file->ucontext, &mr_lock_key);
+       init_uobj(uobj, 0, file->ucontext, &mr_lock_class);
        down_write(&uobj->mutex);
 
        pd = idr_read_pd(cmd.pd_handle, file->ucontext);
@@ -1115,7 +1120,7 @@ ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file,
        if (!obj)
                return -ENOMEM;
 
-       init_uobj(&obj->uobject, cmd.user_handle, file->ucontext, &cq_lock_key);
+       init_uobj(&obj->uobject, cmd.user_handle, file->ucontext, &cq_lock_class);
        down_write(&obj->uobject.mutex);
 
        if (cmd.comp_channel >= 0) {
@@ -1399,6 +1404,9 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,
        if (copy_from_user(&cmd, buf, sizeof cmd))
                return -EFAULT;
 
+       if (cmd.qp_type == IB_QPT_RAW_PACKET && !capable(CAP_NET_RAW))
+               return -EPERM;
+
        INIT_UDATA(&udata, buf + sizeof cmd,
                   (unsigned long) cmd.response + sizeof resp,
                   in_len - sizeof cmd, out_len - sizeof resp);
@@ -1407,7 +1415,7 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,
        if (!obj)
                return -ENOMEM;
 
-       init_uobj(&obj->uevent.uobject, cmd.user_handle, file->ucontext, &qp_lock_key);
+       init_uobj(&obj->uevent.uobject, cmd.user_handle, file->ucontext, &qp_lock_class);
        down_write(&obj->uevent.uobject.mutex);
 
        if (cmd.qp_type == IB_QPT_XRC_TGT) {
@@ -1418,13 +1426,6 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,
                }
                device = xrcd->device;
        } else {
-               pd  = idr_read_pd(cmd.pd_handle, file->ucontext);
-               scq = idr_read_cq(cmd.send_cq_handle, file->ucontext, 0);
-               if (!pd || !scq) {
-                       ret = -EINVAL;
-                       goto err_put;
-               }
-
                if (cmd.qp_type == IB_QPT_XRC_INI) {
                        cmd.max_recv_wr = cmd.max_recv_sge = 0;
                } else {
@@ -1435,13 +1436,24 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,
                                        goto err_put;
                                }
                        }
-                       rcq = (cmd.recv_cq_handle == cmd.send_cq_handle) ?
-                              scq : idr_read_cq(cmd.recv_cq_handle, file->ucontext, 1);
-                       if (!rcq) {
-                               ret = -EINVAL;
-                               goto err_put;
+
+                       if (cmd.recv_cq_handle != cmd.send_cq_handle) {
+                               rcq = idr_read_cq(cmd.recv_cq_handle, file->ucontext, 0);
+                               if (!rcq) {
+                                       ret = -EINVAL;
+                                       goto err_put;
+                               }
                        }
                }
+
+               scq = idr_read_cq(cmd.send_cq_handle, file->ucontext, !!rcq);
+               rcq = rcq ?: scq;
+               pd  = idr_read_pd(cmd.pd_handle, file->ucontext);
+               if (!pd || !scq) {
+                       ret = -EINVAL;
+                       goto err_put;
+               }
+
                device = pd->device;
        }
 
@@ -1585,7 +1597,7 @@ ssize_t ib_uverbs_open_qp(struct ib_uverbs_file *file,
        if (!obj)
                return -ENOMEM;
 
-       init_uobj(&obj->uevent.uobject, cmd.user_handle, file->ucontext, &qp_lock_key);
+       init_uobj(&obj->uevent.uobject, cmd.user_handle, file->ucontext, &qp_lock_class);
        down_write(&obj->uevent.uobject.mutex);
 
        xrcd = idr_read_xrcd(cmd.pd_handle, file->ucontext, &xrcd_uobj);
@@ -2272,7 +2284,7 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file,
        if (!uobj)
                return -ENOMEM;
 
-       init_uobj(uobj, cmd.user_handle, file->ucontext, &ah_lock_key);
+       init_uobj(uobj, cmd.user_handle, file->ucontext, &ah_lock_class);
        down_write(&uobj->mutex);
 
        pd = idr_read_pd(cmd.pd_handle, file->ucontext);
@@ -2476,30 +2488,30 @@ static int __uverbs_create_xsrq(struct ib_uverbs_file *file,
        if (!obj)
                return -ENOMEM;
 
-       init_uobj(&obj->uevent.uobject, cmd->user_handle, file->ucontext, &srq_lock_key);
+       init_uobj(&obj->uevent.uobject, cmd->user_handle, file->ucontext, &srq_lock_class);
        down_write(&obj->uevent.uobject.mutex);
 
-       pd  = idr_read_pd(cmd->pd_handle, file->ucontext);
-       if (!pd) {
-               ret = -EINVAL;
-               goto err;
-       }
-
        if (cmd->srq_type == IB_SRQT_XRC) {
-               attr.ext.xrc.cq  = idr_read_cq(cmd->cq_handle, file->ucontext, 0);
-               if (!attr.ext.xrc.cq) {
-                       ret = -EINVAL;
-                       goto err_put_pd;
-               }
-
                attr.ext.xrc.xrcd  = idr_read_xrcd(cmd->xrcd_handle, file->ucontext, &xrcd_uobj);
                if (!attr.ext.xrc.xrcd) {
                        ret = -EINVAL;
-                       goto err_put_cq;
+                       goto err;
                }
 
                obj->uxrcd = container_of(xrcd_uobj, struct ib_uxrcd_object, uobject);
                atomic_inc(&obj->uxrcd->refcnt);
+
+               attr.ext.xrc.cq  = idr_read_cq(cmd->cq_handle, file->ucontext, 0);
+               if (!attr.ext.xrc.cq) {
+                       ret = -EINVAL;
+                       goto err_put_xrcd;
+               }
+       }
+
+       pd  = idr_read_pd(cmd->pd_handle, file->ucontext);
+       if (!pd) {
+               ret = -EINVAL;
+               goto err_put_cq;
        }
 
        attr.event_handler  = ib_uverbs_srq_event_handler;
@@ -2576,17 +2588,17 @@ err_destroy:
        ib_destroy_srq(srq);
 
 err_put:
-       if (cmd->srq_type == IB_SRQT_XRC) {
-               atomic_dec(&obj->uxrcd->refcnt);
-               put_uobj_read(xrcd_uobj);
-       }
+       put_pd_read(pd);
 
 err_put_cq:
        if (cmd->srq_type == IB_SRQT_XRC)
                put_cq_read(attr.ext.xrc.cq);
 
-err_put_pd:
-       put_pd_read(pd);
+err_put_xrcd:
+       if (cmd->srq_type == IB_SRQT_XRC) {
+               atomic_dec(&obj->uxrcd->refcnt);
+               put_uobj_read(xrcd_uobj);
+       }
 
 err:
        put_uobj_write(&obj->uevent.uobject);
Linux 6.x block layer and io_uring tree(s)