IB: add dmabarrier to ib_umem_get() prototype
Subsystems (2)
PATCH 3/4 IB: add dmabarrier to ib_umem_get() prototype
Add a new parameter, dmabarrier, to the ib_umem_get() prototype.
Signed-off-by Arthur Kepner <[email protected]>
Signature · 13 lines
drivers/infiniband/core/umem.c | 2 +- drivers/infiniband/hw/amso1100/c2_provider.c | 2 +- drivers/infiniband/hw/cxgb3/iwch_provider.c | 2 +- drivers/infiniband/hw/ehca/ehca_mrmw.c | 2 +- drivers/infiniband/hw/ipath/ipath_mr.c | 3 ++- drivers/infiniband/hw/mlx4/cq.c | 2 +- drivers/infiniband/hw/mlx4/doorbell.c | 2 +- drivers/infiniband/hw/mlx4/mr.c | 3 ++- drivers/infiniband/hw/mlx4/qp.c | 2 +- drivers/infiniband/hw/mlx4/srq.c | 2 +- drivers/infiniband/hw/mthca/mthca_provider.c | 3 ++- include/rdma/ib_umem.h | 4 ++-- 12 files changed, 16 insertions(+), 13 deletions(-)
drivers/infiniband/core/umem.c +1 -1
@@ -74,7 +74,7 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int d* @access: IB_ACCESS_xxx flags for memory being pinned */ struct ib_umem *ib_umem_get (struct ib_ucontext *context,unsigned long addr, -size_t size,int access) +size_t size,int access,int dmabarrier) {struct ib_umem *umem;struct page **page_list;
drivers/infiniband/hw/amso1100/c2_provider.c +1 -1
@@ -449,7 +449,7 @@ static struct ib_mr *c2_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,return ERR_PTR (-ENOMEM ); c2mr->pd = c2pd; - c2mr->umem =ib_umem_get (pd->uobject->context, start, length, acc); + c2mr->umem =ib_umem_get (pd->uobject->context, start, length, acc,0 );if (IS_ERR (c2mr->umem)) { err =PTR_ERR (c2mr->umem);kfree (c2mr);
drivers/infiniband/hw/cxgb3/iwch_provider.c +1 -1
@@ -601,7 +601,7 @@ static struct ib_mr *iwch_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,if (!mhp)return ERR_PTR (-ENOMEM ); - mhp->umem =ib_umem_get (pd->uobject->context, start, length, acc); + mhp->umem =ib_umem_get (pd->uobject->context, start, length, acc,0 );if (IS_ERR (mhp->umem)) { err =PTR_ERR (mhp->umem);kfree (mhp);
drivers/infiniband/hw/ehca/ehca_mrmw.c +1 -1
@@ -325,7 +325,7 @@ struct ib_mr *ehca_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, } e_mr->umem =ib_umem_get (pd->uobject->context, start, length, - mr_access_flags); + mr_access_flags,0 );if (IS_ERR (e_mr->umem)) { ib_mr = (void *)e_mr->umem; goto reg_user_mr_exit1;
drivers/infiniband/hw/ipath/ipath_mr.c +2 -1
@@ -195,7 +195,8 @@ struct ib_mr *ipath_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, goto bail; } - umem =ib_umem_get (pd->uobject->context, start, length, mr_access_flags); + umem =ib_umem_get (pd->uobject->context, start, length, + mr_access_flags,0 );if (IS_ERR (umem))return (void *) umem;
drivers/infiniband/hw/mlx4/cq.c +1 -1
@@ -122,7 +122,7 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev, int entries, int vector } cq->umem =ib_umem_get (context, ucmd.buf_addr, buf_size, -IB_ACCESS_LOCAL_WRITE ); +IB_ACCESS_LOCAL_WRITE ,0 );if (IS_ERR (cq->umem)) { err =PTR_ERR (cq->umem); goto err_cq;
drivers/infiniband/hw/mlx4/doorbell.c +1 -1
@@ -181,7 +181,7 @@ int mlx4_ib_db_map_user(struct mlx4_ib_ucontext *context, unsigned long virt, page->user_virt = (virt &PAGE_MASK ); page->refcnt =0 ; page->umem =ib_umem_get (&context->ibucontext, virt &PAGE_MASK , -PAGE_SIZE ,0 ); +PAGE_SIZE ,0 ,0 );if (IS_ERR (page->umem)) { err =PTR_ERR (page->umem);kfree (page);
drivers/infiniband/hw/mlx4/mr.c +2 -1
@@ -132,7 +132,8 @@ struct ib_mr *mlx4_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,if (!mr)return ERR_PTR (-ENOMEM ); - mr->umem =ib_umem_get (pd->uobject->context, start, length, access_flags); + mr->umem =ib_umem_get (pd->uobject->context, start, length, + access_flags,0 );if (IS_ERR (mr->umem)) { err =PTR_ERR (mr->umem); goto err_free;
drivers/infiniband/hw/mlx4/qp.c +1 -1
@@ -347,7 +347,7 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd, goto err; qp->umem =ib_umem_get (pd->uobject->context, ucmd.buf_addr, - qp->buf_size,0 ); + qp->buf_size,0 ,0 );if (IS_ERR (qp->umem)) { err =PTR_ERR (qp->umem); goto err;
drivers/infiniband/hw/mlx4/srq.c +1 -1
@@ -115,7 +115,7 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd, } srq->umem =ib_umem_get (pd->uobject->context, ucmd.buf_addr, - buf_size,0 ); + buf_size,0 ,0 );if (IS_ERR (srq->umem)) { err =PTR_ERR (srq->umem); goto err_srq;
drivers/infiniband/hw/mthca/mthca_provider.c +2 -1
@@ -1027,7 +1027,8 @@ 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 (pd->uobject->context, start, length, acc); + mr->umem =ib_umem_get (pd->uobject->context, start, length, acc,0 ); +if (IS_ERR (mr->umem)) { err =PTR_ERR (mr->umem); goto err;
include/rdma/ib_umem.h +2 -2
@@ -62,7 +62,7 @@ struct ib_umem_chunk {#ifdef CONFIG_INFINIBAND_USER_MEM struct ib_umem *ib_umem_get (struct ib_ucontext *context,unsigned long addr, -size_t size,int access); +size_t size,int access,int dmabarrier);void ib_umem_release (struct ib_umem *umem);int ib_umem_page_count (struct ib_umem *umem);
@@ -72,7 +72,7 @@ int ib_umem_page_count(struct ib_umem *umem);static inline struct ib_umem *ib_umem_get (struct ib_ucontext *context,unsigned long addr,size_t size, -int access) { +int access,int dmabarrier) {return ERR_PTR (-EINVAL ); }static inline void ib_umem_release (struct ib_umem *umem) { }
drivers/infiniband/core/umem.c static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int d · line 80
Quoted 13 lines
drivers/infiniband/core/umem.c +1
-1@@ -74,7 +74,7 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int d* @access: IB_ACCESS_xxx flags for memory being pinned */ struct ib_umem *ib_umem_get (struct ib_ucontext *context,unsigned long addr, -size_t size,int access) +size_t size,int access,int dmabarrier) {struct ib_umem *umem;struct page **page_list;
Two problems here, one major: this doesn't actually do anything with the dmabarrier parameter, and one minor: it also doesn't add any documentation for the parameter to the comment before the function.
- R.