RDMA/uverbs: Make write() handlers return 0 on success

Currently they return the command length, while all other handlers return
0. This makes the write path closer to the write_ex and ioctl path.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>

diff --git a/drivers/infiniband/core/rdma_core.c b/drivers/infiniband/core/rdma_core.c
index cf671a643d4cd190e9acff329177a07236d112cf..efa2924892713f6737ade75ad0d619db8203581a 100644 (file)
--- a/drivers/infiniband/core/rdma_core.c
+++ b/drivers/infiniband/core/rdma_core.c
@@ -245,13 +245,11 @@ struct ib_uobject *__uobj_get_destroy(const struct uverbs_api_object *obj,
 }
 
 /*
- * Does both uobj_get_destroy() and uobj_put_destroy().  Returns success_res
- * on success (negative errno on failure). For use by callers that do not need
- * the uobj.
+ * Does both uobj_get_destroy() and uobj_put_destroy().  Returns 0 on success
+ * (negative errno on failure). For use by callers that do not need the uobj.
  */
 int __uobj_perform_destroy(const struct uverbs_api_object *obj, u32 id,
-                          const struct uverbs_attr_bundle *attrs,
-                          int success_res)
+                          const struct uverbs_attr_bundle *attrs)
 {
        struct ib_uobject *uobj;
 
@@ -260,7 +258,7 @@ int __uobj_perform_destroy(const struct uverbs_api_object *obj, u32 id,
                return PTR_ERR(uobj);
 
        rdma_lookup_put_uobject(uobj, UVERBS_LOOKUP_WRITE);
-       return success_res;
+       return 0;
 }
 
 /* alloc_uobj must be undone by uverbs_destroy_uobject() */

diff --git a/drivers/infiniband/core/rdma_core.h b/drivers/infiniband/core/rdma_core.h
index edd299174d9588f94e05870b6814f03734ec62eb..59edd75140959de89af788450b476dc8648c684e 100644 (file)
--- a/drivers/infiniband/core/rdma_core.h
+++ b/drivers/infiniband/core/rdma_core.h
@@ -137,8 +137,8 @@ struct uverbs_api_ioctl_method {
 };
 
 struct uverbs_api_write_method {
-       ssize_t (*handler)(struct uverbs_attr_bundle *attrs,
-                          const char __user *buf, int in_len, int out_len);
+       int (*handler)(struct uverbs_attr_bundle *attrs, const char __user *buf,
+                      int in_len, int out_len);
        int (*handler_ex)(struct uverbs_attr_bundle *attrs,
                          struct ib_udata *ucore, struct ib_udata *uhw);
        u8 disabled:1;

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index a49926a63ce0b67200e6e6e86605ae3edd805589..d058b86dbc43981bfcf081f45f98f4ae8b922175 100644 (file)
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -65,9 +65,9 @@ _ib_uverbs_lookup_comp_file(s32 fd, const struct uverbs_attr_bundle *attrs)
 #define ib_uverbs_lookup_comp_file(_fd, _ufile)                                \
        _ib_uverbs_lookup_comp_file((_fd)*typecheck(s32, _fd), _ufile)
 
-static ssize_t ib_uverbs_get_context(struct uverbs_attr_bundle *attrs,
-                                    const char __user *buf, int in_len,
-                                    int out_len)
+static int ib_uverbs_get_context(struct uverbs_attr_bundle *attrs,
+                                const char __user *buf, int in_len,
+                                int out_len)
 {
        struct ib_uverbs_file *file = attrs->ufile;
        struct ib_uverbs_get_context      cmd;
@@ -157,7 +157,7 @@ static ssize_t ib_uverbs_get_context(struct uverbs_attr_bundle *attrs,
 
        mutex_unlock(&file->ucontext_lock);
 
-       return in_len;
+       return 0;
 
 err_file:
        ib_uverbs_free_async_event_file(file);
@@ -225,9 +225,9 @@ static void copy_query_dev_fields(struct ib_ucontext *ucontext,
        resp->phys_port_cnt             = ib_dev->phys_port_cnt;
 }
 
-static ssize_t ib_uverbs_query_device(struct uverbs_attr_bundle *attrs,
-                                     const char __user *buf, int in_len,
-                                     int out_len)
+static int ib_uverbs_query_device(struct uverbs_attr_bundle *attrs,
+                                 const char __user *buf, int in_len,
+                                 int out_len)
 {
        struct ib_uverbs_query_device      cmd;
        struct ib_uverbs_query_device_resp resp;
@@ -249,7 +249,7 @@ static ssize_t ib_uverbs_query_device(struct uverbs_attr_bundle *attrs,
        if (copy_to_user(u64_to_user_ptr(cmd.response), &resp, sizeof resp))
                return -EFAULT;
 
-       return in_len;
+       return 0;
 }
 
 /*
@@ -273,9 +273,8 @@ static u32 make_port_cap_flags(const struct ib_port_attr *attr)
        return res;
 }
 
-static ssize_t ib_uverbs_query_port(struct uverbs_attr_bundle *attrs,
-                                   const char __user *buf, int in_len,
-                                   int out_len)
+static int ib_uverbs_query_port(struct uverbs_attr_bundle *attrs,
+                               const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_query_port      cmd;
        struct ib_uverbs_query_port_resp resp;
@@ -335,12 +334,11 @@ static ssize_t ib_uverbs_query_port(struct uverbs_attr_bundle *attrs,
        if (copy_to_user(u64_to_user_ptr(cmd.response), &resp, sizeof resp))
                return -EFAULT;
 
-       return in_len;
+       return 0;
 }
 
-static ssize_t ib_uverbs_alloc_pd(struct uverbs_attr_bundle *attrs,
-                                 const char __user *buf, int in_len,
-                                 int out_len)
+static int ib_uverbs_alloc_pd(struct uverbs_attr_bundle *attrs,
+                             const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_alloc_pd      cmd;
        struct ib_uverbs_alloc_pd_resp resp;
@@ -387,7 +385,7 @@ static ssize_t ib_uverbs_alloc_pd(struct uverbs_attr_bundle *attrs,
                goto err_copy;
        }
 
-       return uobj_alloc_commit(uobj, in_len);
+       return uobj_alloc_commit(uobj);
 
 err_copy:
        ib_dealloc_pd(pd);
@@ -397,17 +395,15 @@ static ssize_t ib_uverbs_alloc_pd(struct uverbs_attr_bundle *attrs,
        return ret;
 }
 
-static ssize_t ib_uverbs_dealloc_pd(struct uverbs_attr_bundle *attrs,
-                                   const char __user *buf, int in_len,
-                                   int out_len)
+static int ib_uverbs_dealloc_pd(struct uverbs_attr_bundle *attrs,
+                               const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_dealloc_pd cmd;
 
        if (copy_from_user(&cmd, buf, sizeof cmd))
                return -EFAULT;
 
-       return uobj_perform_destroy(UVERBS_OBJECT_PD, cmd.pd_handle, attrs,
-                                   in_len);
+       return uobj_perform_destroy(UVERBS_OBJECT_PD, cmd.pd_handle, attrs);
 }
 
 struct xrcd_table_entry {
@@ -495,9 +491,8 @@ static void xrcd_table_delete(struct ib_uverbs_device *dev,
        }
 }
 
-static ssize_t ib_uverbs_open_xrcd(struct uverbs_attr_bundle *attrs,
-                                  const char __user *buf, int in_len,
-                                  int out_len)
+static int ib_uverbs_open_xrcd(struct uverbs_attr_bundle *attrs,
+                              const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_device *ibudev = attrs->ufile->device;
        struct ib_uverbs_open_xrcd      cmd;
@@ -593,7 +588,7 @@ static ssize_t ib_uverbs_open_xrcd(struct uverbs_attr_bundle *attrs,
 
        mutex_unlock(&ibudev->xrcd_tree_mutex);
 
-       return uobj_alloc_commit(&obj->uobject, in_len);
+       return uobj_alloc_commit(&obj->uobject);
 
 err_copy:
        if (inode) {
@@ -617,17 +612,15 @@ static ssize_t ib_uverbs_open_xrcd(struct uverbs_attr_bundle *attrs,
        return ret;
 }
 
-static ssize_t ib_uverbs_close_xrcd(struct uverbs_attr_bundle *attrs,
-                                   const char __user *buf, int in_len,
-                                   int out_len)
+static int ib_uverbs_close_xrcd(struct uverbs_attr_bundle *attrs,
+                               const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_close_xrcd cmd;
 
        if (copy_from_user(&cmd, buf, sizeof cmd))
                return -EFAULT;
 
-       return uobj_perform_destroy(UVERBS_OBJECT_XRCD, cmd.xrcd_handle, attrs,
-                                   in_len);
+       return uobj_perform_destroy(UVERBS_OBJECT_XRCD, cmd.xrcd_handle, attrs);
 }
 
 int ib_uverbs_dealloc_xrcd(struct ib_uobject *uobject,
@@ -655,8 +648,8 @@ int ib_uverbs_dealloc_xrcd(struct ib_uobject *uobject,
        return ret;
 }
 
-static ssize_t ib_uverbs_reg_mr(struct uverbs_attr_bundle *attrs,
-                               const char __user *buf, int in_len, int out_len)
+static int ib_uverbs_reg_mr(struct uverbs_attr_bundle *attrs,
+                           const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_reg_mr      cmd;
        struct ib_uverbs_reg_mr_resp resp;
@@ -733,7 +726,7 @@ static ssize_t ib_uverbs_reg_mr(struct uverbs_attr_bundle *attrs,
 
        uobj_put_obj_read(pd);
 
-       return uobj_alloc_commit(uobj, in_len);
+       return uobj_alloc_commit(uobj);
 
 err_copy:
        ib_dereg_mr(mr);
@@ -746,9 +739,8 @@ static ssize_t ib_uverbs_reg_mr(struct uverbs_attr_bundle *attrs,
        return ret;
 }
 
-static ssize_t ib_uverbs_rereg_mr(struct uverbs_attr_bundle *attrs,
-                                 const char __user *buf, int in_len,
-                                 int out_len)
+static int ib_uverbs_rereg_mr(struct uverbs_attr_bundle *attrs,
+                             const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_rereg_mr      cmd;
        struct ib_uverbs_rereg_mr_resp resp;
@@ -825,7 +817,7 @@ static ssize_t ib_uverbs_rereg_mr(struct uverbs_attr_bundle *attrs,
        if (copy_to_user(u64_to_user_ptr(cmd.response), &resp, sizeof(resp)))
                ret = -EFAULT;
        else
-               ret = in_len;
+               ret = 0;
 
 put_uobj_pd:
        if (cmd.flags & IB_MR_REREG_PD)
@@ -837,22 +829,19 @@ static ssize_t ib_uverbs_rereg_mr(struct uverbs_attr_bundle *attrs,
        return ret;
 }
 
-static ssize_t ib_uverbs_dereg_mr(struct uverbs_attr_bundle *attrs,
-                                 const char __user *buf, int in_len,
-                                 int out_len)
+static int ib_uverbs_dereg_mr(struct uverbs_attr_bundle *attrs,
+                             const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_dereg_mr cmd;
 
        if (copy_from_user(&cmd, buf, sizeof cmd))
                return -EFAULT;
 
-       return uobj_perform_destroy(UVERBS_OBJECT_MR, cmd.mr_handle, attrs,
-                                   in_len);
+       return uobj_perform_destroy(UVERBS_OBJECT_MR, cmd.mr_handle, attrs);
 }
 
-static ssize_t ib_uverbs_alloc_mw(struct uverbs_attr_bundle *attrs,
-                                 const char __user *buf, int in_len,
-                                 int out_len)
+static int ib_uverbs_alloc_mw(struct uverbs_attr_bundle *attrs,
+                             const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_alloc_mw      cmd;
        struct ib_uverbs_alloc_mw_resp resp;
@@ -907,7 +896,7 @@ static ssize_t ib_uverbs_alloc_mw(struct uverbs_attr_bundle *attrs,
        }
 
        uobj_put_obj_read(pd);
-       return uobj_alloc_commit(uobj, in_len);
+       return uobj_alloc_commit(uobj);
 
 err_copy:
        uverbs_dealloc_mw(mw);
@@ -918,22 +907,20 @@ static ssize_t ib_uverbs_alloc_mw(struct uverbs_attr_bundle *attrs,
        return ret;
 }
 
-static ssize_t ib_uverbs_dealloc_mw(struct uverbs_attr_bundle *attrs,
-                                   const char __user *buf, int in_len,
-                                   int out_len)
+static int ib_uverbs_dealloc_mw(struct uverbs_attr_bundle *attrs,
+                               const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_dealloc_mw cmd;
 
        if (copy_from_user(&cmd, buf, sizeof(cmd)))
                return -EFAULT;
 
-       return uobj_perform_destroy(UVERBS_OBJECT_MW, cmd.mw_handle, attrs,
-                                   in_len);
+       return uobj_perform_destroy(UVERBS_OBJECT_MW, cmd.mw_handle, attrs);
 }
 
-static ssize_t ib_uverbs_create_comp_channel(struct uverbs_attr_bundle *attrs,
-                                            const char __user *buf, int in_len,
-                                            int out_len)
+static int ib_uverbs_create_comp_channel(struct uverbs_attr_bundle *attrs,
+                                        const char __user *buf, int in_len,
+                                        int out_len)
 {
        struct ib_uverbs_create_comp_channel       cmd;
        struct ib_uverbs_create_comp_channel_resp  resp;
@@ -962,7 +949,7 @@ static ssize_t ib_uverbs_create_comp_channel(struct uverbs_attr_bundle *attrs,
                return -EFAULT;
        }
 
-       return uobj_alloc_commit(uobj, in_len);
+       return uobj_alloc_commit(uobj);
 }
 
 static struct ib_ucq_object *create_cq(struct uverbs_attr_bundle *attrs,
@@ -1041,7 +1028,7 @@ static struct ib_ucq_object *create_cq(struct uverbs_attr_bundle *attrs,
        if (ret)
                goto err_cb;
 
-       ret = uobj_alloc_commit(&obj->uobject, 0);
+       ret = uobj_alloc_commit(&obj->uobject);
        if (ret)
                return ERR_PTR(ret);
        return obj;
@@ -1070,9 +1057,8 @@ static int ib_uverbs_create_cq_cb(struct uverbs_attr_bundle *attrs,
        return 0;
 }
 
-static ssize_t ib_uverbs_create_cq(struct uverbs_attr_bundle *attrs,
-                                  const char __user *buf, int in_len,
-                                  int out_len)
+static int ib_uverbs_create_cq(struct uverbs_attr_bundle *attrs,
+                              const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_create_cq      cmd;
        struct ib_uverbs_ex_create_cq   cmd_ex;
@@ -1109,7 +1095,7 @@ static ssize_t ib_uverbs_create_cq(struct uverbs_attr_bundle *attrs,
        if (IS_ERR(obj))
                return PTR_ERR(obj);
 
-       return in_len;
+       return 0;
 }
 
 static int ib_uverbs_ex_create_cq_cb(struct uverbs_attr_bundle *attrs,
@@ -1155,9 +1141,8 @@ static int ib_uverbs_ex_create_cq(struct uverbs_attr_bundle *attrs,
        return PTR_ERR_OR_ZERO(obj);
 }
 
-static ssize_t ib_uverbs_resize_cq(struct uverbs_attr_bundle *attrs,
-                                  const char __user *buf, int in_len,
-                                  int out_len)
+static int ib_uverbs_resize_cq(struct uverbs_attr_bundle *attrs,
+                              const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_resize_cq      cmd;
        struct ib_uverbs_resize_cq_resp resp = {};
@@ -1189,7 +1174,7 @@ static ssize_t ib_uverbs_resize_cq(struct uverbs_attr_bundle *attrs,
 out:
        uobj_put_obj_read(cq);
 
-       return ret ? ret : in_len;
+       return ret;
 }
 
 static int copy_wc_to_user(struct ib_device *ib_dev, void __user *dest,
@@ -1222,9 +1207,8 @@ static int copy_wc_to_user(struct ib_device *ib_dev, void __user *dest,
        return 0;
 }
 
-static ssize_t ib_uverbs_poll_cq(struct uverbs_attr_bundle *attrs,
-                                const char __user *buf, int in_len,
-                                int out_len)
+static int ib_uverbs_poll_cq(struct uverbs_attr_bundle *attrs,
+                            const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_poll_cq       cmd;
        struct ib_uverbs_poll_cq_resp  resp;
@@ -1266,16 +1250,16 @@ static ssize_t ib_uverbs_poll_cq(struct uverbs_attr_bundle *attrs,
                goto out_put;
        }
 
-       ret = in_len;
+       ret = 0;
 
 out_put:
        uobj_put_obj_read(cq);
        return ret;
 }
 
-static ssize_t ib_uverbs_req_notify_cq(struct uverbs_attr_bundle *attrs,
-                                      const char __user *buf, int in_len,
-                                      int out_len)
+static int ib_uverbs_req_notify_cq(struct uverbs_attr_bundle *attrs,
+                                  const char __user *buf, int in_len,
+                                  int out_len)
 {
        struct ib_uverbs_req_notify_cq cmd;
        struct ib_cq                  *cq;
@@ -1292,12 +1276,11 @@ static ssize_t ib_uverbs_req_notify_cq(struct uverbs_attr_bundle *attrs,
 
        uobj_put_obj_read(cq);
 
-       return in_len;
+       return 0;
 }
 
-static ssize_t ib_uverbs_destroy_cq(struct uverbs_attr_bundle *attrs,
-                                   const char __user *buf, int in_len,
-                                   int out_len)
+static int ib_uverbs_destroy_cq(struct uverbs_attr_bundle *attrs,
+                               const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_destroy_cq      cmd;
        struct ib_uverbs_destroy_cq_resp resp;
@@ -1321,7 +1304,7 @@ static ssize_t ib_uverbs_destroy_cq(struct uverbs_attr_bundle *attrs,
        if (copy_to_user(u64_to_user_ptr(cmd.response), &resp, sizeof resp))
                return -EFAULT;
 
-       return in_len;
+       return 0;
 }
 
 static int create_qp(struct uverbs_attr_bundle *attrs,
@@ -1578,7 +1561,7 @@ static int create_qp(struct uverbs_attr_bundle *attrs,
        if (ind_tbl)
                uobj_put_obj_read(ind_tbl);
 
-       return uobj_alloc_commit(&obj->uevent.uobject, 0);
+       return uobj_alloc_commit(&obj->uevent.uobject);
 err_cb:
        ib_destroy_qp(qp);
 
@@ -1610,9 +1593,8 @@ static int ib_uverbs_create_qp_cb(struct uverbs_attr_bundle *attrs,
        return 0;
 }
 
-static ssize_t ib_uverbs_create_qp(struct uverbs_attr_bundle *attrs,
-                                  const char __user *buf, int in_len,
-                                  int out_len)
+static int ib_uverbs_create_qp(struct uverbs_attr_bundle *attrs,
+                              const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_create_qp      cmd;
        struct ib_uverbs_ex_create_qp   cmd_ex;
@@ -1657,7 +1639,7 @@ static ssize_t ib_uverbs_create_qp(struct uverbs_attr_bundle *attrs,
        if (err)
                return err;
 
-       return in_len;
+       return 0;
 }
 
 static int ib_uverbs_ex_create_qp_cb(struct uverbs_attr_bundle *attrs,
@@ -1705,9 +1687,8 @@ static int ib_uverbs_ex_create_qp(struct uverbs_attr_bundle *attrs,
        return 0;
 }
 
-static ssize_t ib_uverbs_open_qp(struct uverbs_attr_bundle *attrs,
-                                const char __user *buf, int in_len,
-                                int out_len)
+static int ib_uverbs_open_qp(struct uverbs_attr_bundle *attrs,
+                            const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_open_qp        cmd;
        struct ib_uverbs_create_qp_resp resp;
@@ -1780,7 +1761,7 @@ static ssize_t ib_uverbs_open_qp(struct uverbs_attr_bundle *attrs,
        qp->uobject = &obj->uevent.uobject;
        uobj_put_read(xrcd_uobj);
 
-       return uobj_alloc_commit(&obj->uevent.uobject, in_len);
+       return uobj_alloc_commit(&obj->uevent.uobject);
 
 err_destroy:
        ib_destroy_qp(qp);
@@ -1813,9 +1794,8 @@ static void copy_ah_attr_to_uverbs(struct ib_uverbs_qp_dest *uverb_attr,
        uverb_attr->port_num          = rdma_ah_get_port_num(rdma_attr);
 }
 
-static ssize_t ib_uverbs_query_qp(struct uverbs_attr_bundle *attrs,
-                                 const char __user *buf, int in_len,
-                                 int out_len)
+static int ib_uverbs_query_qp(struct uverbs_attr_bundle *attrs,
+                             const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_query_qp      cmd;
        struct ib_uverbs_query_qp_resp resp;
@@ -1888,7 +1868,7 @@ static ssize_t ib_uverbs_query_qp(struct uverbs_attr_bundle *attrs,
        kfree(attr);
        kfree(init_attr);
 
-       return ret ? ret : in_len;
+       return ret;
 }
 
 /* Remove ignored fields set in the attribute mask */
@@ -2087,13 +2067,11 @@ static int modify_qp(struct uverbs_attr_bundle *attrs,
        return ret;
 }
 
-static ssize_t ib_uverbs_modify_qp(struct uverbs_attr_bundle *attrs,
-                                  const char __user *buf, int in_len,
-                                  int out_len)
+static int ib_uverbs_modify_qp(struct uverbs_attr_bundle *attrs,
+                              const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_ex_modify_qp cmd = {};
        struct ib_udata udata;
-       int ret;
 
        if (copy_from_user(&cmd.base, buf, sizeof(cmd.base)))
                return -EFAULT;
@@ -2106,11 +2084,7 @@ static ssize_t ib_uverbs_modify_qp(struct uverbs_attr_bundle *attrs,
                   in_len - sizeof(cmd.base) - sizeof(struct ib_uverbs_cmd_hdr),
                   out_len);
 
-       ret = modify_qp(attrs, &cmd, &udata);
-       if (ret)
-               return ret;
-
-       return in_len;
+       return modify_qp(attrs, &cmd, &udata);
 }
 
 static int ib_uverbs_ex_modify_qp(struct uverbs_attr_bundle *attrs,
@@ -2147,9 +2121,8 @@ static int ib_uverbs_ex_modify_qp(struct uverbs_attr_bundle *attrs,
        return ret;
 }
 
-static ssize_t ib_uverbs_destroy_qp(struct uverbs_attr_bundle *attrs,
-                                   const char __user *buf, int in_len,
-                                   int out_len)
+static int ib_uverbs_destroy_qp(struct uverbs_attr_bundle *attrs,
+                               const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_destroy_qp      cmd;
        struct ib_uverbs_destroy_qp_resp resp;
@@ -2172,7 +2145,7 @@ static ssize_t ib_uverbs_destroy_qp(struct uverbs_attr_bundle *attrs,
        if (copy_to_user(u64_to_user_ptr(cmd.response), &resp, sizeof resp))
                return -EFAULT;
 
-       return in_len;
+       return 0;
 }
 
 static void *alloc_wr(size_t wr_size, __u32 num_sge)
@@ -2185,9 +2158,8 @@ static void *alloc_wr(size_t wr_size, __u32 num_sge)
                         num_sge * sizeof (struct ib_sge), GFP_KERNEL);
 }
 
-static ssize_t ib_uverbs_post_send(struct uverbs_attr_bundle *attrs,
-                                  const char __user *buf, int in_len,
-                                  int out_len)
+static int ib_uverbs_post_send(struct uverbs_attr_bundle *attrs,
+                              const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_post_send      cmd;
        struct ib_uverbs_post_send_resp resp;
@@ -2370,7 +2342,7 @@ static ssize_t ib_uverbs_post_send(struct uverbs_attr_bundle *attrs,
 out:
        kfree(user_wr);
 
-       return ret ? ret : in_len;
+       return ret;
 }
 
 static struct ib_recv_wr *ib_uverbs_unmarshall_recv(const char __user *buf,
@@ -2465,9 +2437,8 @@ static struct ib_recv_wr *ib_uverbs_unmarshall_recv(const char __user *buf,
        return ERR_PTR(ret);
 }
 
-static ssize_t ib_uverbs_post_recv(struct uverbs_attr_bundle *attrs,
-                                  const char __user *buf, int in_len,
-                                  int out_len)
+static int ib_uverbs_post_recv(struct uverbs_attr_bundle *attrs,
+                              const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_post_recv      cmd;
        struct ib_uverbs_post_recv_resp resp;
@@ -2511,12 +2482,12 @@ static ssize_t ib_uverbs_post_recv(struct uverbs_attr_bundle *attrs,
                wr = next;
        }
 
-       return ret ? ret : in_len;
+       return ret;
 }
 
-static ssize_t ib_uverbs_post_srq_recv(struct uverbs_attr_bundle *attrs,
-                                      const char __user *buf, int in_len,
-                                      int out_len)
+static int ib_uverbs_post_srq_recv(struct uverbs_attr_bundle *attrs,
+                                  const char __user *buf, int in_len,
+                                  int out_len)
 {
        struct ib_uverbs_post_srq_recv      cmd;
        struct ib_uverbs_post_srq_recv_resp resp;
@@ -2560,12 +2531,11 @@ static ssize_t ib_uverbs_post_srq_recv(struct uverbs_attr_bundle *attrs,
                wr = next;
        }
 
-       return ret ? ret : in_len;
+       return ret;
 }
 
-static ssize_t ib_uverbs_create_ah(struct uverbs_attr_bundle *attrs,
-                                  const char __user *buf, int in_len,
-                                  int out_len)
+static int ib_uverbs_create_ah(struct uverbs_attr_bundle *attrs,
+                              const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_create_ah       cmd;
        struct ib_uverbs_create_ah_resp  resp;
@@ -2639,7 +2609,7 @@ static ssize_t ib_uverbs_create_ah(struct uverbs_attr_bundle *attrs,
        }
 
        uobj_put_obj_read(pd);
-       return uobj_alloc_commit(uobj, in_len);
+       return uobj_alloc_commit(uobj);
 
 err_copy:
        rdma_destroy_ah(ah);
@@ -2652,22 +2622,20 @@ static ssize_t ib_uverbs_create_ah(struct uverbs_attr_bundle *attrs,
        return ret;
 }
 
-static ssize_t ib_uverbs_destroy_ah(struct uverbs_attr_bundle *attrs,
-                                   const char __user *buf, int in_len,
-                                   int out_len)
+static int ib_uverbs_destroy_ah(struct uverbs_attr_bundle *attrs,
+                               const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_destroy_ah cmd;
 
        if (copy_from_user(&cmd, buf, sizeof cmd))
                return -EFAULT;
 
-       return uobj_perform_destroy(UVERBS_OBJECT_AH, cmd.ah_handle, attrs,
-                                   in_len);
+       return uobj_perform_destroy(UVERBS_OBJECT_AH, cmd.ah_handle, attrs);
 }
 
-static ssize_t ib_uverbs_attach_mcast(struct uverbs_attr_bundle *attrs,
-                                     const char __user *buf, int in_len,
-                                     int out_len)
+static int ib_uverbs_attach_mcast(struct uverbs_attr_bundle *attrs,
+                                 const char __user *buf, int in_len,
+                                 int out_len)
 {
        struct ib_uverbs_attach_mcast cmd;
        struct ib_qp                 *qp;
@@ -2711,12 +2679,12 @@ static ssize_t ib_uverbs_attach_mcast(struct uverbs_attr_bundle *attrs,
        mutex_unlock(&obj->mcast_lock);
        uobj_put_obj_read(qp);
 
-       return ret ? ret : in_len;
+       return ret;
 }
 
-static ssize_t ib_uverbs_detach_mcast(struct uverbs_attr_bundle *attrs,
-                                     const char __user *buf, int in_len,
-                                     int out_len)
+static int ib_uverbs_detach_mcast(struct uverbs_attr_bundle *attrs,
+                                 const char __user *buf, int in_len,
+                                 int out_len)
 {
        struct ib_uverbs_detach_mcast cmd;
        struct ib_uqp_object         *obj;
@@ -2754,7 +2722,7 @@ static ssize_t ib_uverbs_detach_mcast(struct uverbs_attr_bundle *attrs,
 out_put:
        mutex_unlock(&obj->mcast_lock);
        uobj_put_obj_read(qp);
-       return ret ? ret : in_len;
+       return ret;
 }
 
 struct ib_uflow_resources *flow_resources_alloc(size_t num_specs)
@@ -3173,7 +3141,7 @@ static int ib_uverbs_ex_create_wq(struct uverbs_attr_bundle *attrs,
 
        uobj_put_obj_read(pd);
        uobj_put_obj_read(cq);
-       return uobj_alloc_commit(&obj->uevent.uobject, 0);
+       return uobj_alloc_commit(&obj->uevent.uobject);
 
 err_copy:
        ib_destroy_wq(wq);
@@ -3399,7 +3367,7 @@ static int ib_uverbs_ex_create_rwq_ind_table(struct uverbs_attr_bundle *attrs,
        for (j = 0; j < num_read_wqs; j++)
                uobj_put_obj_read(wqs[j]);
 
-       return uobj_alloc_commit(uobj, 0);
+       return uobj_alloc_commit(uobj);
 
 err_copy:
        ib_destroy_rwq_ind_table(rwq_ind_tbl);
@@ -3440,7 +3408,7 @@ static int ib_uverbs_ex_destroy_rwq_ind_table(struct uverbs_attr_bundle *attrs,
                return -EOPNOTSUPP;
 
        return uobj_perform_destroy(UVERBS_OBJECT_RWQ_IND_TBL,
-                                   cmd.ind_tbl_handle, attrs, 0);
+                                   cmd.ind_tbl_handle, attrs);
 }
 
 static int ib_uverbs_ex_create_flow(struct uverbs_attr_bundle *attrs,
@@ -3598,7 +3566,7 @@ static int ib_uverbs_ex_create_flow(struct uverbs_attr_bundle *attrs,
        kfree(flow_attr);
        if (cmd.flow_attr.num_of_specs)
                kfree(kern_flow_attr);
-       return uobj_alloc_commit(uobj, 0);
+       return uobj_alloc_commit(uobj);
 err_copy:
        if (!qp->device->destroy_flow(flow_id))
                atomic_dec(&qp->usecnt);
@@ -3633,8 +3601,7 @@ static int ib_uverbs_ex_destroy_flow(struct uverbs_attr_bundle *attrs,
        if (cmd.comp_mask)
                return -EINVAL;
 
-       return uobj_perform_destroy(UVERBS_OBJECT_FLOW, cmd.flow_handle, attrs,
-                                   0);
+       return uobj_perform_destroy(UVERBS_OBJECT_FLOW, cmd.flow_handle, attrs);
 }
 
 static int __uverbs_create_xsrq(struct uverbs_attr_bundle *attrs,
@@ -3750,7 +3717,7 @@ static int __uverbs_create_xsrq(struct uverbs_attr_bundle *attrs,
                uobj_put_obj_read(attr.ext.cq);
 
        uobj_put_obj_read(pd);
-       return uobj_alloc_commit(&obj->uevent.uobject, 0);
+       return uobj_alloc_commit(&obj->uevent.uobject);
 
 err_copy:
        ib_destroy_srq(srq);
@@ -3773,15 +3740,13 @@ static int __uverbs_create_xsrq(struct uverbs_attr_bundle *attrs,
        return ret;
 }
 
-static ssize_t ib_uverbs_create_srq(struct uverbs_attr_bundle *attrs,
-                                   const char __user *buf, int in_len,
-                                   int out_len)
+static int ib_uverbs_create_srq(struct uverbs_attr_bundle *attrs,
+                               const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_create_srq      cmd;
        struct ib_uverbs_create_xsrq     xcmd;
        struct ib_uverbs_create_srq_resp resp;
        struct ib_udata                  udata;
-       int ret;
 
        if (out_len < sizeof resp)
                return -ENOSPC;
@@ -3803,21 +3768,16 @@ static ssize_t ib_uverbs_create_srq(struct uverbs_attr_bundle *attrs,
                   in_len - sizeof(cmd) - sizeof(struct ib_uverbs_cmd_hdr),
                   out_len - sizeof(resp));
 
-       ret = __uverbs_create_xsrq(attrs, &xcmd, &udata);
-       if (ret)
-               return ret;
-
-       return in_len;
+       return __uverbs_create_xsrq(attrs, &xcmd, &udata);
 }
 
-static ssize_t ib_uverbs_create_xsrq(struct uverbs_attr_bundle *attrs,
-                                    const char __user *buf, int in_len,
-                                    int out_len)
+static int ib_uverbs_create_xsrq(struct uverbs_attr_bundle *attrs,
+                                const char __user *buf, int in_len,
+                                int out_len)
 {
        struct ib_uverbs_create_xsrq     cmd;
        struct ib_uverbs_create_srq_resp resp;
        struct ib_udata                  udata;
-       int ret;
 
        if (out_len < sizeof resp)
                return -ENOSPC;
@@ -3830,16 +3790,11 @@ static ssize_t ib_uverbs_create_xsrq(struct uverbs_attr_bundle *attrs,
                   in_len - sizeof(cmd) - sizeof(struct ib_uverbs_cmd_hdr),
                   out_len - sizeof(resp));
 
-       ret = __uverbs_create_xsrq(attrs, &cmd, &udata);
-       if (ret)
-               return ret;
-
-       return in_len;
+       return __uverbs_create_xsrq(attrs, &cmd, &udata);
 }
 
-static ssize_t ib_uverbs_modify_srq(struct uverbs_attr_bundle *attrs,
-                                   const char __user *buf, int in_len,
-                                   int out_len)
+static int ib_uverbs_modify_srq(struct uverbs_attr_bundle *attrs,
+                               const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_modify_srq cmd;
        struct ib_udata             udata;
@@ -3864,12 +3819,11 @@ static ssize_t ib_uverbs_modify_srq(struct uverbs_attr_bundle *attrs,
 
        uobj_put_obj_read(srq);
 
-       return ret ? ret : in_len;
+       return ret;
 }
 
-static ssize_t ib_uverbs_query_srq(struct uverbs_attr_bundle *attrs,
-                                  const char __user *buf, int in_len,
-                                  int out_len)
+static int ib_uverbs_query_srq(struct uverbs_attr_bundle *attrs,
+                              const char __user *buf, int in_len, int out_len)
 {
        struct ib_uverbs_query_srq      cmd;
        struct ib_uverbs_query_srq_resp resp;
@@ -3903,12 +3857,12 @@ static ssize_t ib_uverbs_query_srq(struct uverbs_attr_bundle *attrs,
        if (copy_to_user(u64_to_user_ptr(cmd.response), &resp, sizeof resp))
                return -EFAULT;
 
-       return in_len;
+       return 0;
 }
 
-static ssize_t ib_uverbs_destroy_srq(struct uverbs_attr_bundle *attrs,
-                                    const char __user *buf, int in_len,
-                                    int out_len)
+static int ib_uverbs_destroy_srq(struct uverbs_attr_bundle *attrs,
+                                const char __user *buf, int in_len,
+                                int out_len)
 {
        struct ib_uverbs_destroy_srq      cmd;
        struct ib_uverbs_destroy_srq_resp resp;
@@ -3931,7 +3885,7 @@ static ssize_t ib_uverbs_destroy_srq(struct uverbs_attr_bundle *attrs,
        if (copy_to_user(u64_to_user_ptr(cmd.response), &resp, sizeof(resp)))
                return -EFAULT;
 
-       return in_len;
+       return 0;
 }
 
 static int ib_uverbs_ex_query_device(struct uverbs_attr_bundle *attrs,

diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index c5d245133b51de6afcdac94b56d726156292bf2d..ac830735f45b41e0931f212c1118ed330c9df330 100644 (file)
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -688,11 +688,10 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,
                                        ex_hdr.provider_out_words * 8);
 
                ret = method_elm->handler_ex(&bundle, &ucore, &uhw);
-               ret = (ret) ? : count;
        }
 
        srcu_read_unlock(&file->device->disassociate_srcu, srcu_key);
-       return ret;
+       return (ret) ? : count;
 }
 
 static int ib_uverbs_mmap(struct file *filp, struct vm_area_struct *vma)

diff --git a/drivers/infiniband/core/uverbs_uapi.c b/drivers/infiniband/core/uverbs_uapi.c
index ad72d726efa92fa1fe292183350bed4b4ee9ce0a..4738c266ff50673acdb15c8c30d8365ec5bbebd2 100644 (file)
--- a/drivers/infiniband/core/uverbs_uapi.c
+++ b/drivers/infiniband/core/uverbs_uapi.c
@@ -8,9 +8,8 @@
 #include "rdma_core.h"
 #include "uverbs.h"
 
-static ssize_t ib_uverbs_notsupp(struct uverbs_attr_bundle *attrs,
-                                const char __user *buf, int in_len,
-                                int out_len)
+static int ib_uverbs_notsupp(struct uverbs_attr_bundle *attrs,
+                            const char __user *buf, int in_len, int out_len)
 {
        return -EOPNOTSUPP;
 }

diff --git a/include/rdma/uverbs_ioctl.h b/include/rdma/uverbs_ioctl.h
index f744691cd9ae440f4a99e88428beec27683fcff8..2a59d6ad9f6263a9acbf8e1b5c54f6466f8aa3e9 100644 (file)
--- a/include/rdma/uverbs_ioctl.h
+++ b/include/rdma/uverbs_ioctl.h
@@ -368,9 +368,9 @@ struct uapi_definition {
 
        union {
                bool (*func_is_supported)(struct ib_device *device);
-               ssize_t (*func_write)(struct uverbs_attr_bundle *attrs,
-                                     const char __user *buf, int in_len,
-                                     int out_len);
+               int (*func_write)(struct uverbs_attr_bundle *attrs,
+                                 const char __user *buf, int in_len,
+                                 int out_len);
                int (*func_write_ex)(struct uverbs_attr_bundle *attrs,
                                     struct ib_udata *ucore,
                                     struct ib_udata *uhw);

diff --git a/include/rdma/uverbs_std_types.h b/include/rdma/uverbs_std_types.h
index a6358c36bba04bb43bd48afd9a0e2e6d7da52d23..df878ce02c94655cd3af6e6fb2c0563618b068b8 100644 (file)
--- a/include/rdma/uverbs_std_types.h
+++ b/include/rdma/uverbs_std_types.h
@@ -72,11 +72,10 @@ static inline void *_uobj_get_obj_read(struct ib_uobject *uobj)
                                _uobj_check_id(_id), UVERBS_LOOKUP_WRITE)
 
 int __uobj_perform_destroy(const struct uverbs_api_object *obj, u32 id,
-                          const struct uverbs_attr_bundle *attrs,
-                          int success_res);
-#define uobj_perform_destroy(_type, _id, _attrs, _success_res)                 \
+                          const struct uverbs_attr_bundle *attrs);
+#define uobj_perform_destroy(_type, _id, _attrs)                               \
        __uobj_perform_destroy(uobj_get_type(_attrs, _type),                   \
-                              _uobj_check_id(_id), _attrs, _success_res)
+                              _uobj_check_id(_id), _attrs)
 
 struct ib_uobject *__uobj_get_destroy(const struct uverbs_api_object *obj,
                                      u32 id,
@@ -104,14 +103,13 @@ static inline void uobj_put_write(struct ib_uobject *uobj)
        rdma_lookup_put_uobject(uobj, UVERBS_LOOKUP_WRITE);
 }
 
-static inline int __must_check uobj_alloc_commit(struct ib_uobject *uobj,
-                                                int success_res)
+static inline int __must_check uobj_alloc_commit(struct ib_uobject *uobj)
 {
        int ret = rdma_alloc_commit_uobject(uobj);
 
        if (ret)
                return ret;
-       return success_res;
+       return 0;
 }
 
 static inline void uobj_alloc_abort(struct ib_uobject *uobj)