IB/umem: remove the dmasync argument to ib_umem_get (72b894b0) · Commits · 戴 / test

drivers/infiniband/core/umem.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -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;

drivers/infiniband/hw/cxgb4/mem.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/infiniband/hw/efa/efa_verbs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,

drivers/infiniband/hw/hns/hns_roce_cq.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message