remove DMA_ATTR_WRITE_BARRIER
Subsystems (14)
There is no implementation of the DMA_ATTR_WRITE_BARRIER flag left now that the ia64 sn2 code has been removed. Drop the flag and the calling convention to set it in the RDMA code.
PATCH 1/2 dma-mapping: remove the DMA_ATTR_WRITE_BARRIER flag
This flag is not implemented by any backend and only set by the ib_umem module in a single instance.
--- Documentation/DMA-attributes.txt | 18 ------------------ drivers/infiniband/core/umem.c | 9 ++------- include/linux/dma-mapping.h | 5 +---- 3 files changed, 3 insertions(+), 29 deletions(-)
Documentation/DMA-attributes.txt +0 -18
@@ -5,24 +5,6 @@ DMA attributes This document describes the semantics of the DMA attributes that are defined in linux/dma-mapping.h. -DMA_ATTR_WRITE_BARRIER ----------------------- - -DMA_ATTR_WRITE_BARRIER is a (write) barrier attribute for DMA. DMA -to a memory region with the DMA_ATTR_WRITE_BARRIER attribute forces -all pending DMA writes to complete, and thus provides a mechanism to -strictly order DMA from a device across all intervening busses and -bridges. This barrier is not specific to a particular type of -interconnect, it applies to the system as a whole, and so its -implementation must account for the idiosyncrasies of the system all -the way from the DMA device to memory. - -As an example of a situation where DMA_ATTR_WRITE_BARRIER would be -useful, suppose that a device does a DMA write to indicate that data is -ready and available in memory. The DMA of the "completion indication" -could race with data DMA. Mapping the memory used for completion -indications with DMA_ATTR_WRITE_BARRIER would prevent the race. - DMA_ATTR_WEAK_ORDERING ----------------------
drivers/infiniband/core/umem.c +2 -7
@@ -199,7 +199,6 @@ struct ib_umem *ib_umem_get(struct ib_udata *udata, unsigned long addr,struct mm_struct *mm;unsigned long npages;int ret; -unsigned long dma_attrs =0 ;struct scatterlist *sg;unsigned int gup_flags =FOLL_WRITE ;
@@ -211,9 +210,6 @@ struct ib_umem *ib_umem_get(struct ib_udata *udata, unsigned long addr,if (!context)return ERR_PTR (-EIO ); -if (dmasync) - dma_attrs |=DMA_ATTR_WRITE_BARRIER ; -/* * If the combination of the addr and size requested for this memory * region causes an integer overflow, return error.
@@ -294,11 +290,10 @@ struct ib_umem *ib_umem_get(struct ib_udata *udata, unsigned long addr,sg_mark_end (sg); - umem->nmap =ib_dma_map_sg_attrs (context->device, + umem->nmap =ib_dma_map_sg (context->device, umem->sg_head.sgl, umem->sg_nents, -DMA_BIDIRECTIONAL , - dma_attrs); +DMA_BIDIRECTIONAL );if (!umem->nmap) { ret = -ENOMEM ;
include/linux/dma-mapping.h +1 -4
@@ -15,11 +15,8 @@/** * List of possible attributes associated with a DMA mapping. The semantics * of each attribute should be defined in Documentation/DMA-attributes.txt. -* -* DMA_ATTR_WRITE_BARRIER: DMA to a memory region with this attribute -* forces all pending DMA writes to complete. */ -#define DMA_ATTR_WRITE_BARRIER (1UL << 0) +/* * DMA_ATTR_WEAK_ORDERING: Specifies that reads and writes to the mapping * may be weakly ordered, that is that reads and writes may pass each other.
Signature · 1 line
2.20.1
PATCH 2/2 IB/umem: remove the dmasync argument to ib_umem_get
In reply to Christoph HellwigThe argument is always ignored, so remove it.
--- drivers/infiniband/core/umem.c | 3 +-- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 10 ++++----- drivers/infiniband/hw/cxgb3/iwch_provider.c | 2 +- drivers/infiniband/hw/cxgb4/mem.c | 2 +- drivers/infiniband/hw/efa/efa_verbs.c | 2 +- drivers/infiniband/hw/hns/hns_roce_cq.c | 2 +- drivers/infiniband/hw/hns/hns_roce_db.c | 2 +- drivers/infiniband/hw/hns/hns_roce_mr.c | 4 ++-- drivers/infiniband/hw/hns/hns_roce_qp.c | 2 +- drivers/infiniband/hw/hns/hns_roce_srq.c | 4 ++-- drivers/infiniband/hw/i40iw/i40iw_verbs.c | 2 +- drivers/infiniband/hw/mlx4/cq.c | 2 +- drivers/infiniband/hw/mlx4/doorbell.c | 2 +- drivers/infiniband/hw/mlx4/mr.c | 2 +- drivers/infiniband/hw/mlx4/qp.c | 5 ++--- drivers/infiniband/hw/mlx4/srq.c | 2 +- drivers/infiniband/hw/mlx5/cq.c | 4 ++-- drivers/infiniband/hw/mlx5/devx.c | 2 +- drivers/infiniband/hw/mlx5/doorbell.c | 2 +- drivers/infiniband/hw/mlx5/mr.c | 2 +- drivers/infiniband/hw/mlx5/qp.c | 4 ++-- drivers/infiniband/hw/mlx5/srq.c | 2 +- drivers/infiniband/hw/mthca/mthca_provider.c | 4 +--- drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- drivers/infiniband/hw/qedr/verbs.c | 21 +++++++++---------- drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 2 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c | 2 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 4 ++-- drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 2 +- drivers/infiniband/sw/rdmavt/mr.c | 2 +- drivers/infiniband/sw/rxe/rxe_mr.c | 2 +- include/rdma/ib_umem.h | 4 ++-- 32 files changed, 52 insertions(+), 57 deletions(-)
drivers/infiniband/core/umem.c +1 -2
@@ -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
@@ -855,7 +855,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);
@@ -869,7 +869,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;
@@ -1322,7 +1322,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);
@@ -2565,7 +2565,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;
@@ -3530,7 +3530,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/cxgb3/iwch_provider.c +1 -1
@@ -451,7 +451,7 @@ static struct ib_mr *iwch_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)) { err =PTR_ERR (mhp->umem);kfree (mhp);
drivers/infiniband/hw/cxgb4/mem.c +1 -1
@@ -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
@@ -1423,7 +1423,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
@@ -214,7 +214,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);
drivers/infiniband/hw/hns/hns_roce_db.c +1 -1
@@ -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);
drivers/infiniband/hw/hns/hns_roce_mr.c +2 -2
@@ -1143,7 +1143,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;
@@ -1228,7 +1228,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 ;
drivers/infiniband/hw/hns/hns_roce_qp.c +1 -1
@@ -743,7 +743,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);
drivers/infiniband/hw/hns/hns_roce_srq.c +2 -2
@@ -187,7 +187,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);
@@ -205,7 +205,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);
drivers/infiniband/hw/i40iw/i40iw_verbs.c +1 -1
@@ -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;
drivers/infiniband/hw/mlx4/cq.c +1 -1
@@ -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);
drivers/infiniband/hw/mlx4/doorbell.c +1 -1
@@ -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);
drivers/infiniband/hw/mlx4/mr.c +1 -1
@@ -398,7 +398,7 @@ static struct ib_umem *mlx4_get_umem_mr(struct ib_udata *udata, u64 start,up_read (¤t->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,
drivers/infiniband/hw/mlx4/qp.c +2 -3
@@ -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;
drivers/infiniband/hw/mlx4/srq.c +1 -1
@@ -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);
drivers/infiniband/hw/mlx5/cq.c +2 -2
@@ -710,7 +710,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;
@@ -1111,7 +1111,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;
drivers/infiniband/hw/mlx5/devx.c +1 -1
@@ -2121,7 +2121,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);
drivers/infiniband/hw/mlx5/doorbell.c +1 -1
@@ -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);
drivers/infiniband/hw/mlx5/mr.c +1 -1
@@ -779,7 +779,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);
drivers/infiniband/hw/mlx5/qp.c +2 -2
@@ -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);
drivers/infiniband/hw/mlx5/srq.c +1 -1
@@ -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);
drivers/infiniband/hw/mthca/mthca_provider.c +1 -3
@@ -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;
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +1 -1
@@ -875,7 +875,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;
drivers/infiniband/hw/qedr/verbs.c +10 -11
@@ -697,7 +697,7 @@ static inline int qedr_align_cq_entries(int entries)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,int access,int dmasync, +size_t buf_len,int access,int alloc_and_init) {u32 fw_pages;
@@ -705,7 +705,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));
@@ -856,8 +856,7 @@ 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,IB_ACCESS_LOCAL_WRITE ,1 , -1 ); + ureq.len,IB_ACCESS_LOCAL_WRITE ,1 );if (rc) goto err0;
@@ -1279,19 +1278,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, access, dmasync,1 ); + ureq->srq_len, 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);
@@ -1387,7 +1386,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;
@@ -1601,14 +1600,14 @@ static int qedr_create_user_qp(struct qedr_dev *dev,/* SQ - read access only (0), dma sync not required (0) */ rc =qedr_init_user_queue (udata, dev, &qp->usq, ureq.sq_addr, - ureq.sq_len,0 ,0 , alloc_and_init); + ureq.sq_len,0 , alloc_and_init);if (rc)return rc;if (!qp->srq) {/* RQ - read access only (0), dma sync not required (0) */ rc =qedr_init_user_queue (udata, dev, &qp->urq, ureq.rq_addr, - ureq.rq_len,0 ,0 , alloc_and_init); + ureq.rq_len,0 , alloc_and_init);if (rc)return rc; }
@@ -2597,7 +2596,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;
drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c +1 -1
@@ -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;
drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c +1 -1
@@ -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" );
drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c +2 -2
@@ -263,7 +263,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;
@@ -275,7 +275,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);
drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c +1 -1
@@ -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;
drivers/infiniband/sw/rdmavt/mr.c +1 -1
@@ -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;
drivers/infiniband/sw/rxe/rxe_mr.c +1 -1
@@ -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));
include/rdma/ib_umem.h +2 -2
@@ -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 ); }
Signature · 6 lines
2.20.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 3 lines · Christoph Hellwig
There is no implementation of the
DMA_ATTR_WRITE_BARRIERflag left now that the ia64 sn2 code has been removed. Drop the flag and the calling convention to set it in the RDMA code.
This looks OK, do you want it to go through the RDMA tree?
Thanks,
Jason
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 6 lines · Jason Gunthorpe
Quoted 3 lines · Christoph Hellwig
There is no implementation of the
DMA_ATTR_WRITE_BARRIERflag left now that the ia64 sn2 code has been removed. Drop the flag and the calling convention to set it in the RDMA code.This looks OK, do you want it to go through the RDMA tree?
Either the dma-mapping or rdma tree is fine with me. I guess there are more potential conflicts with rdma changes, so tht might be the better choice.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Jason Gunthorpe
AppliedQuoted 3 lines · Christoph Hellwig
There is no implementation of the
DMA_ATTR_WRITE_BARRIERflag left now that the ia64 sn2 code has been removed. Drop the flag and the calling convention to set it in the RDMA code.
Applied to rdma.git for-next
There were a number of conflicts in qedr, I fixed them up, but Michal probably should check it.
Thanks,
Jason
Quoted 9 lines
From: Jason Gunthorpe <[email protected]>
Sent: Thursday, November 14, 2019 8:23 PMExternal Email
----------------------------------------------------------------------
Quoted 1 line · Christoph Hellwig
There is no implementation of the
DMA_ATTR_WRITE_BARRIERflag left
Quoted 8 lines
now
Quoted 2 lines
that the ia64 sn2 code has been removed. Drop the flag and the calling convention to set it in the RDMA code.
Applied to rdma.git for-next
There were a number of conflicts in qedr, I fixed them up, but Michal probably should check it.
Thanks,
Quoted 3 lines
Thanks,
Jason