IB/umem: remove the dmasync argument to ib_umem_get

The argument is always ignored, so remove it.

Link: https://lore.kernel.org/r/20191113073214.9514-3-hch@lst.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Acked-by: Michal Kalderon <michal.kalderon@marvell.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index 66148739b00ff1da1257062f667343bc594bd212..7a3b99597eada179ed5e0f8f2c6e6cab3a9a52d0 100644 (file)
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -185,10 +185,9 @@ EXPORT_SYMBOL(ib_umem_find_best_pgsz);
  * @addr: userspace virtual address to start at
  * @size: length of region to pin
  * @access: IB_ACCESS_xxx flags for memory being pinned
- * @dmasync: flush in-flight DMA when the memory region is written
  */
 struct ib_umem *ib_umem_get(struct ib_udata *udata, unsigned long addr,
-                           size_t size, int access, int dmasync)
+                           size_t size, int access)
 {
        struct ib_ucontext *context;
        struct ib_umem *umem;

diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
index 8afd7d93cfe430ccaad782bcaf93d8736fcddd0b..9b6ca15a183cd880a77574c3d473c4df47203412 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
+++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
@@ -837,7 +837,7 @@ static int bnxt_re_init_user_qp(struct bnxt_re_dev *rdev, struct bnxt_re_pd *pd,
                bytes += (qplib_qp->sq.max_wqe * psn_sz);
        }
        bytes = PAGE_ALIGN(bytes);
-       umem = ib_umem_get(udata, ureq.qpsva, bytes, IB_ACCESS_LOCAL_WRITE, 1);
+       umem = ib_umem_get(udata, ureq.qpsva, bytes, IB_ACCESS_LOCAL_WRITE);
        if (IS_ERR(umem))
                return PTR_ERR(umem);
 
@@ -851,7 +851,7 @@ static int bnxt_re_init_user_qp(struct bnxt_re_dev *rdev, struct bnxt_re_pd *pd,
                bytes = (qplib_qp->rq.max_wqe * BNXT_QPLIB_MAX_RQE_ENTRY_SIZE);
                bytes = PAGE_ALIGN(bytes);
                umem = ib_umem_get(udata, ureq.qprva, bytes,
-                                  IB_ACCESS_LOCAL_WRITE, 1);
+                                  IB_ACCESS_LOCAL_WRITE);
                if (IS_ERR(umem))
                        goto rqfail;
                qp->rumem = umem;
@@ -1304,7 +1304,7 @@ static int bnxt_re_init_user_srq(struct bnxt_re_dev *rdev,
 
        bytes = (qplib_srq->max_wqe * BNXT_QPLIB_MAX_RQE_ENTRY_SIZE);
        bytes = PAGE_ALIGN(bytes);
-       umem = ib_umem_get(udata, ureq.srqva, bytes, IB_ACCESS_LOCAL_WRITE, 1);
+       umem = ib_umem_get(udata, ureq.srqva, bytes, IB_ACCESS_LOCAL_WRITE);
        if (IS_ERR(umem))
                return PTR_ERR(umem);
 
@@ -2547,7 +2547,7 @@ int bnxt_re_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 
                cq->umem = ib_umem_get(udata, req.cq_va,
                                       entries * sizeof(struct cq_base),
-                                      IB_ACCESS_LOCAL_WRITE, 1);
+                                      IB_ACCESS_LOCAL_WRITE);
                if (IS_ERR(cq->umem)) {
                        rc = PTR_ERR(cq->umem);
                        goto fail;
@@ -3512,7 +3512,7 @@ struct ib_mr *bnxt_re_reg_user_mr(struct ib_pd *ib_pd, u64 start, u64 length,
        /* The fixed portion of the rkey is the same as the lkey */
        mr->ib_mr.rkey = mr->qplib_mr.rkey;
 
-       umem = ib_umem_get(udata, start, length, mr_access_flags, 0);
+       umem = ib_umem_get(udata, start, length, mr_access_flags);
        if (IS_ERR(umem)) {
                dev_err(rdev_to_dev(rdev), "Failed to get umem");
                rc = -EFAULT;

diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
index 35c284af574dadaee494f71e5381f0462c6bb3f1..fe3a7e8561dfff8e86ae20ee5db925fdf49c9107 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -543,7 +543,7 @@ struct ib_mr *c4iw_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
 
        mhp->rhp = rhp;
 
-       mhp->umem = ib_umem_get(udata, start, length, acc, 0);
+       mhp->umem = ib_umem_get(udata, start, length, acc);
        if (IS_ERR(mhp->umem))
                goto err_free_skb;
 

diff --git a/drivers/infiniband/hw/efa/efa_verbs.c b/drivers/infiniband/hw/efa/efa_verbs.c
index b242ea7a3bc868904a9726a75fe7a51ceb90b38b..657baa63faec22ebaefc615a5c0cf428a26485b6 100644 (file)
--- a/drivers/infiniband/hw/efa/efa_verbs.c
+++ b/drivers/infiniband/hw/efa/efa_verbs.c
@@ -1371,7 +1371,7 @@ struct ib_mr *efa_reg_mr(struct ib_pd *ibpd, u64 start, u64 length,
                goto err_out;
        }
 
-       mr->umem = ib_umem_get(udata, start, length, access_flags, 0);
+       mr->umem = ib_umem_get(udata, start, length, access_flags);
        if (IS_ERR(mr->umem)) {
                err = PTR_ERR(mr->umem);
                ibdev_dbg(&dev->ibdev,

diff --git a/drivers/infiniband/hw/hns/hns_roce_cq.c b/drivers/infiniband/hw/hns/hns_roce_cq.c
index e25fa19c249c452893c134495ad31348c4564422..cde2960328dfd017747c73eaa57b1580cdbd0f2d 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_cq.c
+++ b/drivers/infiniband/hw/hns/hns_roce_cq.c
@@ -219,7 +219,7 @@ static int hns_roce_ib_get_cq_umem(struct hns_roce_dev *hr_dev,
        u32 npages;
 
        *umem = ib_umem_get(udata, buf_addr, cqe * hr_dev->caps.cq_entry_sz,
-                           IB_ACCESS_LOCAL_WRITE, 1);
+                           IB_ACCESS_LOCAL_WRITE);
        if (IS_ERR(*umem))
                return PTR_ERR(*umem);
 

diff --git a/drivers/infiniband/hw/hns/hns_roce_db.c b/drivers/infiniband/hw/hns/hns_roce_db.c
index c00714c2f16a60ca4c9a92c8148f73add6dddc56..10af6958ab694de8f1b8fc7d889a3ad956d1d14f 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_db.c
+++ b/drivers/infiniband/hw/hns/hns_roce_db.c
@@ -31,7 +31,7 @@ int hns_roce_db_map_user(struct hns_roce_ucontext *context,
 
        refcount_set(&page->refcount, 1);
        page->user_virt = page_addr;
-       page->umem = ib_umem_get(udata, page_addr, PAGE_SIZE, 0, 0);
+       page->umem = ib_umem_get(udata, page_addr, PAGE_SIZE, 0);
        if (IS_ERR(page->umem)) {
                ret = PTR_ERR(page->umem);
                kfree(page);

diff --git a/drivers/infiniband/hw/hns/hns_roce_mr.c b/drivers/infiniband/hw/hns/hns_roce_mr.c
index 6589e283cc77ce8a41e8daa10e139082b23b04ba..9ad19170c3f97d63a9f9986bd45eaeb1c6ecba0d 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_mr.c
+++ b/drivers/infiniband/hw/hns/hns_roce_mr.c
@@ -1145,7 +1145,7 @@ struct ib_mr *hns_roce_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
        if (!mr)
                return ERR_PTR(-ENOMEM);
 
-       mr->umem = ib_umem_get(udata, start, length, access_flags, 0);
+       mr->umem = ib_umem_get(udata, start, length, access_flags);
        if (IS_ERR(mr->umem)) {
                ret = PTR_ERR(mr->umem);
                goto err_free;
@@ -1230,7 +1230,7 @@ static int rereg_mr_trans(struct ib_mr *ibmr, int flags,
        }
        ib_umem_release(mr->umem);
 
-       mr->umem = ib_umem_get(udata, start, length, mr_access_flags, 0);
+       mr->umem = ib_umem_get(udata, start, length, mr_access_flags);
        if (IS_ERR(mr->umem)) {
                ret = PTR_ERR(mr->umem);
                mr->umem = NULL;

diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c b/drivers/infiniband/hw/hns/hns_roce_qp.c
index 9442f017db02a590b445bde4ad7231c65f15ef93..a6565b67480146282d2e68bf1be7018607b0526a 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_qp.c
+++ b/drivers/infiniband/hw/hns/hns_roce_qp.c
@@ -745,7 +745,7 @@ static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev,
                }
 
                hr_qp->umem = ib_umem_get(udata, ucmd.buf_addr,
-                                         hr_qp->buff_size, 0, 0);
+                                         hr_qp->buff_size, 0);
                if (IS_ERR(hr_qp->umem)) {
                        dev_err(dev, "ib_umem_get error for create qp\n");
                        ret = PTR_ERR(hr_qp->umem);

diff --git a/drivers/infiniband/hw/hns/hns_roce_srq.c b/drivers/infiniband/hw/hns/hns_roce_srq.c
index a1bfa51c67fe30fa8d4b3b9585f0ad7a686c3136..0cceae0fb4af3b31d211b833f6e99f2ce9c47707 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_srq.c
+++ b/drivers/infiniband/hw/hns/hns_roce_srq.c
@@ -186,7 +186,7 @@ static int create_user_srq(struct hns_roce_srq *srq, struct ib_udata *udata,
        if (ib_copy_from_udata(&ucmd, udata, sizeof(ucmd)))
                return -EFAULT;
 
-       srq->umem = ib_umem_get(udata, ucmd.buf_addr, srq_buf_size, 0, 0);
+       srq->umem = ib_umem_get(udata, ucmd.buf_addr, srq_buf_size, 0);
        if (IS_ERR(srq->umem))
                return PTR_ERR(srq->umem);
 
@@ -206,7 +206,7 @@ static int create_user_srq(struct hns_roce_srq *srq, struct ib_udata *udata,
 
        /* config index queue BA */
        srq->idx_que.umem = ib_umem_get(udata, ucmd.que_addr,
-                                       srq->idx_que.buf_size, 0, 0);
+                                       srq->idx_que.buf_size, 0);
        if (IS_ERR(srq->idx_que.umem)) {
                dev_err(hr_dev->dev, "ib_umem_get error for index queue\n");
                ret = PTR_ERR(srq->idx_que.umem);

diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
index cd9ee1664a69e2f431cd169e8376d9a55a846a59..86375947bc67a9550cb26658999ee0908d798254 100644 (file)
--- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
@@ -1763,7 +1763,7 @@ static struct ib_mr *i40iw_reg_user_mr(struct ib_pd *pd,
 
        if (length > I40IW_MAX_MR_SIZE)
                return ERR_PTR(-EINVAL);
-       region = ib_umem_get(udata, start, length, acc, 0);
+       region = ib_umem_get(udata, start, length, acc);
        if (IS_ERR(region))
                return (struct ib_mr *)region;
 

diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index a7d238d312f06ed8664456f8e8886b36d2ff8a8b..306b21281fa2ac4c29dc5bc9554c6bde9590d876 100644 (file)
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -145,7 +145,7 @@ static int mlx4_ib_get_cq_umem(struct mlx4_ib_dev *dev, struct ib_udata *udata,
        int n;
 
        *umem = ib_umem_get(udata, buf_addr, cqe * cqe_size,
-                           IB_ACCESS_LOCAL_WRITE, 1);
+                           IB_ACCESS_LOCAL_WRITE);
        if (IS_ERR(*umem))
                return PTR_ERR(*umem);
 

diff --git a/drivers/infiniband/hw/mlx4/doorbell.c b/drivers/infiniband/hw/mlx4/doorbell.c
index 0f390351cef0d2e221168b84e528f30f32097cb2..714f9df5bf3919143a11d4c6e1e6026fd2480bae 100644 (file)
--- a/drivers/infiniband/hw/mlx4/doorbell.c
+++ b/drivers/infiniband/hw/mlx4/doorbell.c
@@ -64,7 +64,7 @@ int mlx4_ib_db_map_user(struct ib_udata *udata, unsigned long virt,
 
        page->user_virt = (virt & PAGE_MASK);
        page->refcnt    = 0;
-       page->umem = ib_umem_get(udata, virt & PAGE_MASK, PAGE_SIZE, 0, 0);
+       page->umem = ib_umem_get(udata, virt & PAGE_MASK, PAGE_SIZE, 0);
        if (IS_ERR(page->umem)) {
                err = PTR_ERR(page->umem);
                kfree(page);

diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c
index 6ae503cfc52640144cc7521f0d2fb67e9de80cfa..dfa17bcdcdbcfbf1b03f2d351a9b83d9716b3ca9 100644 (file)
--- a/drivers/infiniband/hw/mlx4/mr.c
+++ b/drivers/infiniband/hw/mlx4/mr.c
@@ -398,7 +398,7 @@ static struct ib_umem *mlx4_get_umem_mr(struct ib_udata *udata, u64 start,
                up_read(&current->mm->mmap_sem);
        }
 
-       return ib_umem_get(udata, start, length, access_flags, 0);
+       return ib_umem_get(udata, start, length, access_flags);
 }
 
 struct ib_mr *mlx4_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,

diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index bd4aa04416c6bcd50ed17aae6716208178d48e4d..85f57b76e446a815da90816d651c9a3d4cd2938e 100644 (file)
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -916,7 +916,7 @@ static int create_rq(struct ib_pd *pd, struct ib_qp_init_attr *init_attr,
        qp->buf_size = (qp->rq.wqe_cnt << qp->rq.wqe_shift) +
                       (qp->sq.wqe_cnt << qp->sq.wqe_shift);
 
-       qp->umem = ib_umem_get(udata, wq.buf_addr, qp->buf_size, 0, 0);
+       qp->umem = ib_umem_get(udata, wq.buf_addr, qp->buf_size, 0);
        if (IS_ERR(qp->umem)) {
                err = PTR_ERR(qp->umem);
                goto err;
@@ -1110,8 +1110,7 @@ static int create_qp_common(struct ib_pd *pd, struct ib_qp_init_attr *init_attr,
                if (err)
                        goto err;
 
-               qp->umem =
-                       ib_umem_get(udata, ucmd.buf_addr, qp->buf_size, 0, 0);
+               qp->umem = ib_umem_get(udata, ucmd.buf_addr, qp->buf_size, 0);
                if (IS_ERR(qp->umem)) {
                        err = PTR_ERR(qp->umem);
                        goto err;

diff --git a/drivers/infiniband/hw/mlx4/srq.c b/drivers/infiniband/hw/mlx4/srq.c
index 848db7264cc9548f0eb1e02c10e29a04732806ca..8dcf6e3d9ae24b605433fd4b38f796acb83c383e 100644 (file)
--- a/drivers/infiniband/hw/mlx4/srq.c
+++ b/drivers/infiniband/hw/mlx4/srq.c
@@ -110,7 +110,7 @@ int mlx4_ib_create_srq(struct ib_srq *ib_srq,
                if (ib_copy_from_udata(&ucmd, udata, sizeof(ucmd)))
                        return -EFAULT;
 
-               srq->umem = ib_umem_get(udata, ucmd.buf_addr, buf_size, 0, 0);
+               srq->umem = ib_umem_get(udata, ucmd.buf_addr, buf_size, 0);
                if (IS_ERR(srq->umem))
                        return PTR_ERR(srq->umem);
 

diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
index cc938d27f9131a9d58b0b3cb882dce01736eafb4..dd8d24ee8e1d9acfa6b0be8b2a64ca9aacc3b995 100644 (file)
--- a/drivers/infiniband/hw/mlx5/cq.c
+++ b/drivers/infiniband/hw/mlx5/cq.c
@@ -709,7 +709,7 @@ static int create_cq_user(struct mlx5_ib_dev *dev, struct ib_udata *udata,
 
        cq->buf.umem =
                ib_umem_get(udata, ucmd.buf_addr, entries * ucmd.cqe_size,
-                           IB_ACCESS_LOCAL_WRITE, 1);
+                           IB_ACCESS_LOCAL_WRITE);
        if (IS_ERR(cq->buf.umem)) {
                err = PTR_ERR(cq->buf.umem);
                return err;
@@ -1110,7 +1110,7 @@ static int resize_user(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
 
        umem = ib_umem_get(udata, ucmd.buf_addr,
                           (size_t)ucmd.cqe_size * entries,
-                          IB_ACCESS_LOCAL_WRITE, 1);
+                          IB_ACCESS_LOCAL_WRITE);
        if (IS_ERR(umem)) {
                err = PTR_ERR(umem);
                return err;

diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index 2a5812a4c3bba5b08645279e34d37d0bffb1f399..9d0a18cf9e5ebd28806dcd250d7b1c3903b574aa 100644 (file)
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -2134,7 +2134,7 @@ static int devx_umem_get(struct mlx5_ib_dev *dev, struct ib_ucontext *ucontext,
        if (err)
                return err;
 
-       obj->umem = ib_umem_get(&attrs->driver_udata, addr, size, access, 0);
+       obj->umem = ib_umem_get(&attrs->driver_udata, addr, size, access);
        if (IS_ERR(obj->umem))
                return PTR_ERR(obj->umem);
 

diff --git a/drivers/infiniband/hw/mlx5/doorbell.c b/drivers/infiniband/hw/mlx5/doorbell.c
index 8f4e5f22b84c30c062f058a767277aaad13c2d7f..12737c509aa20ef55c9893af95f50dcf140e97b4 100644 (file)
--- a/drivers/infiniband/hw/mlx5/doorbell.c
+++ b/drivers/infiniband/hw/mlx5/doorbell.c
@@ -64,7 +64,7 @@ int mlx5_ib_db_map_user(struct mlx5_ib_ucontext *context,
 
        page->user_virt = (virt & PAGE_MASK);
        page->refcnt    = 0;
-       page->umem = ib_umem_get(udata, virt & PAGE_MASK, PAGE_SIZE, 0, 0);
+       page->umem = ib_umem_get(udata, virt & PAGE_MASK, PAGE_SIZE, 0);
        if (IS_ERR(page->umem)) {
                err = PTR_ERR(page->umem);
                kfree(page);

diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index 077ca10d9ed90d58c3f5927b8c6acec0ff1592c8..60d39b9ec41cae30d2f11f5a1beab14a63d3b21c 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -764,7 +764,7 @@ static int mr_umem_get(struct mlx5_ib_dev *dev, struct ib_udata *udata,
                if (order)
                        *order = ilog2(roundup_pow_of_two(*ncont));
        } else {
-               u = ib_umem_get(udata, start, length, access_flags, 0);
+               u = ib_umem_get(udata, start, length, access_flags);
                if (IS_ERR(u)) {
                        mlx5_ib_dbg(dev, "umem get failed (%ld)\n", PTR_ERR(u));
                        return PTR_ERR(u);

diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index c831b455ffa883a604d956c096e81f92c295c255..26fb0227a51408c2eabddeccb4ae98f66490f621 100644 (file)
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -749,7 +749,7 @@ static int mlx5_ib_umem_get(struct mlx5_ib_dev *dev, struct ib_udata *udata,
 {
        int err;
 
-       *umem = ib_umem_get(udata, addr, size, 0, 0);
+       *umem = ib_umem_get(udata, addr, size, 0);
        if (IS_ERR(*umem)) {
                mlx5_ib_dbg(dev, "umem_get failed\n");
                return PTR_ERR(*umem);
@@ -806,7 +806,7 @@ static int create_user_rq(struct mlx5_ib_dev *dev, struct ib_pd *pd,
        if (!ucmd->buf_addr)
                return -EINVAL;
 
-       rwq->umem = ib_umem_get(udata, ucmd->buf_addr, rwq->buf_size, 0, 0);
+       rwq->umem = ib_umem_get(udata, ucmd->buf_addr, rwq->buf_size, 0);
        if (IS_ERR(rwq->umem)) {
                mlx5_ib_dbg(dev, "umem_get failed\n");
                err = PTR_ERR(rwq->umem);

diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index 4e7fde86c96b311708ddcdfdc5d8a58b678fc882..62939df3c692a5e7a34540ddecb94fdb4f5c5399 100644 (file)
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -80,7 +80,7 @@ static int create_srq_user(struct ib_pd *pd, struct mlx5_ib_srq *srq,
 
        srq->wq_sig = !!(ucmd.flags & MLX5_SRQ_FLAG_SIGNATURE);
 
-       srq->umem = ib_umem_get(udata, ucmd.buf_addr, buf_size, 0, 0);
+       srq->umem = ib_umem_get(udata, ucmd.buf_addr, buf_size, 0);
        if (IS_ERR(srq->umem)) {
                mlx5_ib_dbg(dev, "failed umem get, size %d\n", buf_size);
                err = PTR_ERR(srq->umem);

diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index 23554d8bf2419441c63b5c2b062bd069225e42b8..33002530fee709aabd208d5c4c33088e45a36965 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -880,9 +880,7 @@ static struct ib_mr *mthca_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
        if (!mr)
                return ERR_PTR(-ENOMEM);
 
-       mr->umem = ib_umem_get(udata, start, length, acc,
-                              ucmd.mr_attrs & MTHCA_MR_DMASYNC);
-
+       mr->umem = ib_umem_get(udata, start, length, acc);
        if (IS_ERR(mr->umem)) {
                err = PTR_ERR(mr->umem);
                goto err;

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index e72050de573415dad2c450a1e2190f65b438d8bc..9bc1ca6f6f9e60e4246e864b310d4f28c5f1646f 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -869,7 +869,7 @@ struct ib_mr *ocrdma_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 len,
        mr = kzalloc(sizeof(*mr), GFP_KERNEL);
        if (!mr)
                return ERR_PTR(status);
-       mr->umem = ib_umem_get(udata, start, len, acc, 0);
+       mr->umem = ib_umem_get(udata, start, len, acc);
        if (IS_ERR(mr->umem)) {
                status = -EFAULT;
                goto umem_err;

diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c
index fea95faa3b219023997eb923ad973ebcd792bd8f..55b77d753d124de58f13bdc1ee0e99270b0d52a3 100644 (file)
--- a/drivers/infiniband/hw/qedr/verbs.c
+++ b/drivers/infiniband/hw/qedr/verbs.c
@@ -762,7 +762,7 @@ static inline int qedr_init_user_queue(struct ib_udata *udata,
                                       struct qedr_dev *dev,
                                       struct qedr_userq *q, u64 buf_addr,
                                       size_t buf_len, bool requires_db_rec,
-                                      int access, int dmasync,
+                                      int access,
                                       int alloc_and_init)
 {
        u32 fw_pages;
@@ -770,7 +770,7 @@ static inline int qedr_init_user_queue(struct ib_udata *udata,
 
        q->buf_addr = buf_addr;
        q->buf_len = buf_len;
-       q->umem = ib_umem_get(udata, q->buf_addr, q->buf_len, access, dmasync);
+       q->umem = ib_umem_get(udata, q->buf_addr, q->buf_len, access);
        if (IS_ERR(q->umem)) {
                DP_ERR(dev, "create user queue: failed ib_umem_get, got %ld\n",
                       PTR_ERR(q->umem));
@@ -927,9 +927,8 @@ int qedr_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
                cq->cq_type = QEDR_CQ_TYPE_USER;
 
                rc = qedr_init_user_queue(udata, dev, &cq->q, ureq.addr,
-                                         ureq.len, true,
-                                         IB_ACCESS_LOCAL_WRITE,
-                                         1, 1);
+                                         ureq.len, true, IB_ACCESS_LOCAL_WRITE,
+                                         1);
                if (rc)
                        goto err0;
 
@@ -1401,19 +1400,19 @@ static void qedr_free_srq_kernel_params(struct qedr_srq *srq)
 static int qedr_init_srq_user_params(struct ib_udata *udata,
                                     struct qedr_srq *srq,
                                     struct qedr_create_srq_ureq *ureq,
-                                    int access, int dmasync)
+                                    int access)
 {
        struct scatterlist *sg;
        int rc;
 
        rc = qedr_init_user_queue(udata, srq->dev, &srq->usrq, ureq->srq_addr,
-                                 ureq->srq_len, false, access, dmasync, 1);
+                                 ureq->srq_len, false, access, 1);
        if (rc)
                return rc;
 
        srq->prod_umem =
                ib_umem_get(udata, ureq->prod_pair_addr,
-                           sizeof(struct rdma_srq_producers), access, dmasync);
+                           sizeof(struct rdma_srq_producers), access);
        if (IS_ERR(srq->prod_umem)) {
                qedr_free_pbl(srq->dev, &srq->usrq.pbl_info, srq->usrq.pbl_tbl);
                ib_umem_release(srq->usrq.umem);
@@ -1510,7 +1509,7 @@ int qedr_create_srq(struct ib_srq *ibsrq, struct ib_srq_init_attr *init_attr,
                        goto err0;
                }
 
-               rc = qedr_init_srq_user_params(udata, srq, &ureq, 0, 0);
+               rc = qedr_init_srq_user_params(udata, srq, &ureq, 0);
                if (rc)
                        goto err0;
 
@@ -1751,18 +1750,16 @@ static int qedr_create_user_qp(struct qedr_dev *dev,
                return rc;
        }
 
-       /* SQ - read access only (0), dma sync not required (0) */
+       /* SQ - read access only (0) */
        rc = qedr_init_user_queue(udata, dev, &qp->usq, ureq.sq_addr,
-                                 ureq.sq_len, true, 0, 0,
-                                 alloc_and_init);
+                                 ureq.sq_len, true, 0, alloc_and_init);
        if (rc)
                return rc;
 
        if (!qp->srq) {
-               /* RQ - read access only (0), dma sync not required (0) */
+               /* RQ - read access only (0) */
                rc = qedr_init_user_queue(udata, dev, &qp->urq, ureq.rq_addr,
-                                         ureq.rq_len, true,
-                                         0, 0, alloc_and_init);
+                                         ureq.rq_len, true, 0, alloc_and_init);
                if (rc)
                        return rc;
        }
@@ -2837,7 +2834,7 @@ struct ib_mr *qedr_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 len,
 
        mr->type = QEDR_MR_USER;
 
-       mr->umem = ib_umem_get(udata, start, len, acc, 0);
+       mr->umem = ib_umem_get(udata, start, len, acc);
        if (IS_ERR(mr->umem)) {
                rc = -EFAULT;
                goto err0;

diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c
index 7800e6930502de7da27e9cf7207fce03a2825125..a26a4fd86bf4a75d74963a069304d3ee25b263d3 100644 (file)
--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c
@@ -136,7 +136,7 @@ int pvrdma_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
                }
 
                cq->umem = ib_umem_get(udata, ucmd.buf_addr, ucmd.buf_size,
-                                      IB_ACCESS_LOCAL_WRITE, 1);
+                                      IB_ACCESS_LOCAL_WRITE);
                if (IS_ERR(cq->umem)) {
                        ret = PTR_ERR(cq->umem);
                        goto err_cq;

diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c
index f3a3d22ee8d7343bd634f4c8cc60c36e7410c456..c61e665ff26151aa9070af28aff0680e06687bf0 100644 (file)
--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c
@@ -126,7 +126,7 @@ struct ib_mr *pvrdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
                return ERR_PTR(-EINVAL);
        }
 
-       umem = ib_umem_get(udata, start, length, access_flags, 0);
+       umem = ib_umem_get(udata, start, length, access_flags);
        if (IS_ERR(umem)) {
                dev_warn(&dev->pdev->dev,
                         "could not get umem for mem region\n");

diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c
index 22daf2389d95692b8d6bc5781be2c06f6f003e33..f15809c28f67342048550a730a4d86e85ec44bc7 100644 (file)
--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c
@@ -277,7 +277,7 @@ struct ib_qp *pvrdma_create_qp(struct ib_pd *pd,
                        if (!is_srq) {
                                /* set qp->sq.wqe_cnt, shift, buf_size.. */
                                qp->rumem = ib_umem_get(udata, ucmd.rbuf_addr,
-                                                       ucmd.rbuf_size, 0, 0);
+                                                       ucmd.rbuf_size, 0);
                                if (IS_ERR(qp->rumem)) {
                                        ret = PTR_ERR(qp->rumem);
                                        goto err_qp;
@@ -289,7 +289,7 @@ struct ib_qp *pvrdma_create_qp(struct ib_pd *pd,
                        }
 
                        qp->sumem = ib_umem_get(udata, ucmd.sbuf_addr,
-                                               ucmd.sbuf_size, 0, 0);
+                                               ucmd.sbuf_size, 0);
                        if (IS_ERR(qp->sumem)) {
                                if (!is_srq)
                                        ib_umem_release(qp->rumem);

diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c
index 36cdfbdbd32568ad5ae48c795d3736a24e982d55..98c8be71d91de5bb661ca53a3c28750381954bbe 100644 (file)
--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c
@@ -146,7 +146,7 @@ int pvrdma_create_srq(struct ib_srq *ibsrq, struct ib_srq_init_attr *init_attr,
                goto err_srq;
        }
 
-       srq->umem = ib_umem_get(udata, ucmd.buf_addr, ucmd.buf_size, 0, 0);
+       srq->umem = ib_umem_get(udata, ucmd.buf_addr, ucmd.buf_size, 0);
        if (IS_ERR(srq->umem)) {
                ret = PTR_ERR(srq->umem);
                goto err_srq;

diff --git a/drivers/infiniband/sw/rdmavt/mr.c b/drivers/infiniband/sw/rdmavt/mr.c
index a6a39f01dca37112af1acdadc6bfd050d81c9b38..b9a76bf74857440c4218dcb59a8e33cc5bf02006 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/mr.c
+++ b/drivers/infiniband/sw/rdmavt/mr.c
@@ -390,7 +390,7 @@ struct ib_mr *rvt_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
        if (length == 0)
                return ERR_PTR(-EINVAL);
 
-       umem = ib_umem_get(udata, start, length, mr_access_flags, 0);
+       umem = ib_umem_get(udata, start, length, mr_access_flags);
        if (IS_ERR(umem))
                return (void *)umem;
 

diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
index ea6a819b716750869087c82f56fe86467579a2dd..35a2baf2f36453d3a2552ba94e2259a76822431b 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_mr.c
+++ b/drivers/infiniband/sw/rxe/rxe_mr.c
@@ -169,7 +169,7 @@ int rxe_mem_init_user(struct rxe_pd *pd, u64 start,
        void                    *vaddr;
        int err;
 
-       umem = ib_umem_get(udata, start, length, access, 0);
+       umem = ib_umem_get(udata, start, length, access);
        if (IS_ERR(umem)) {
                pr_warn("err %d from rxe_umem_get\n",
                        (int)PTR_ERR(umem));

diff --git a/include/rdma/ib_umem.h b/include/rdma/ib_umem.h
index a91b2af64ec47bd6bc468ff4026eadc268a56658..753f54e17e0af940899931a8e18017d9d0c347de 100644 (file)
--- a/include/rdma/ib_umem.h
+++ b/include/rdma/ib_umem.h
@@ -70,7 +70,7 @@ static inline size_t ib_umem_num_pages(struct ib_umem *umem)
 #ifdef CONFIG_INFINIBAND_USER_MEM
 
 struct ib_umem *ib_umem_get(struct ib_udata *udata, unsigned long addr,
-                           size_t size, int access, int dmasync);
+                           size_t size, int access);
 void ib_umem_release(struct ib_umem *umem);
 int ib_umem_page_count(struct ib_umem *umem);
 int ib_umem_copy_from(void *dst, struct ib_umem *umem, size_t offset,
@@ -85,7 +85,7 @@ unsigned long ib_umem_find_best_pgsz(struct ib_umem *umem,
 
 static inline struct ib_umem *ib_umem_get(struct ib_udata *udata,
                                          unsigned long addr, size_t size,
-                                         int access, int dmasync)
+                                         int access)
 {
        return ERR_PTR(-EINVAL);
 }