13 files changed, 40 insertions, 17 deletions

diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index 4e3128ff73c1..fe78f7d25099 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -38,6 +38,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/sched.h>
 #include <linux/hugetlb.h>
+#include <linux/dma-attrs.h>
 
 #include "uverbs.h"
 
@@ -72,9 +73,10 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int d
  * @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_ucontext *context, unsigned long addr,
-                            size_t size, int access)
+                            size_t size, int access, int dmasync)
 {
         struct ib_umem *umem;
         struct page **page_list;
@@ -87,6 +89,10 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
         int ret;
         int off;
         int i;
+        DEFINE_DMA_ATTRS(attrs);
+
+        if (dmasync)
+                dma_set_attr(DMA_ATTR_WRITE_BARRIER, &attrs);
 
         if (!can_do_mlock())
                 return ERR_PTR(-EPERM);
@@ -174,10 +180,11 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
                                 sg_set_page(&chunk->page_list[i], page_list[i + off], PAGE_SIZE, 0);
                         }
 
-                        chunk->nmap = ib_dma_map_sg(context->device,
-                                                    &chunk->page_list[0],
-                                                    chunk->nents,
-                                                    DMA_BIDIRECTIONAL);
+                        chunk->nmap = ib_dma_map_sg_attrs(context->device,
+                                                          &chunk->page_list[0],
+                                                          chunk->nents,
+                                                          DMA_BIDIRECTIONAL,
+                                                          &attrs);
                         if (chunk->nmap <= 0) {
                                 for (i = 0; i < chunk->nents; ++i)
                                         put_page(sg_page(&chunk->page_list[i]));
diff --git a/drivers/infiniband/hw/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c
index 6af2c0f79a67..2acf9b62cf99 100644
--- a/drivers/infiniband/hw/amso1100/c2_provider.c
+++ b/drivers/infiniband/hw/amso1100/c2_provider.c
@@ -452,7 +452,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);
diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
index ab4695c1dd56..e343e9e64844 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -602,7 +602,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);
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c
index 46ae4eb2c4e1..f974367cad40 100644
--- a/drivers/infiniband/hw/ehca/ehca_mrmw.c
+++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c
@@ -323,7 +323,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;
diff --git a/drivers/infiniband/hw/ipath/ipath_mr.c b/drivers/infiniband/hw/ipath/ipath_mr.c
index db4ba92f79fc..9d343b7c2f3b 100644
--- a/drivers/infiniband/hw/ipath/ipath_mr.c
+++ b/drivers/infiniband/hw/ipath/ipath_mr.c
@@ -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;
 
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index 5e570bb0bb6f..e3dddfc687f9 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -137,7 +137,7 @@ static int mlx4_ib_get_cq_umem(struct mlx4_ib_dev *dev, struct ib_ucontext *cont
         int err;
 
         *umem = ib_umem_get(context, buf_addr, cqe * sizeof (struct mlx4_cqe),
-                            IB_ACCESS_LOCAL_WRITE);
+                            IB_ACCESS_LOCAL_WRITE, 1);
         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 8e342cc9baec..8aee4233b388 100644
--- a/drivers/infiniband/hw/mlx4/doorbell.c
+++ b/drivers/infiniband/hw/mlx4/doorbell.c
@@ -63,7 +63,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);
diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c
index fe2c2e94a5f8..68e92485fc76 100644
--- a/drivers/infiniband/hw/mlx4/mr.c
+++ b/drivers/infiniband/hw/mlx4/mr.c
@@ -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;
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 80ea8b9e7761..8e02ecfec188 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -482,7 +482,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;
diff --git a/drivers/infiniband/hw/mlx4/srq.c b/drivers/infiniband/hw/mlx4/srq.c
index 204619702f9d..12d6bc6f8007 100644
--- a/drivers/infiniband/hw/mlx4/srq.c
+++ b/drivers/infiniband/hw/mlx4/srq.c
@@ -109,7 +109,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;
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index 696e1f302332..2a9f460cf061 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -1006,17 +1006,23 @@ static struct ib_mr *mthca_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
         struct mthca_dev *dev = to_mdev(pd->device);
         struct ib_umem_chunk *chunk;
         struct mthca_mr *mr;
+        struct mthca_reg_mr ucmd;
         u64 *pages;
         int shift, n, len;
         int i, j, k;
         int err = 0;
         int write_mtt_size;
 
+        if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd))
+                return ERR_PTR(-EFAULT);
+
         mr = kmalloc(sizeof *mr, GFP_KERNEL);
         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,
+                               ucmd.mr_attrs & MTHCA_MR_DMASYNC);
+
         if (IS_ERR(mr->umem)) {
                 err = PTR_ERR(mr->umem);
                 goto err;
diff --git a/drivers/infiniband/hw/mthca/mthca_user.h b/drivers/infiniband/hw/mthca/mthca_user.h
index 02cc0a766f3a..f8cb3b664d37 100644
--- a/drivers/infiniband/hw/mthca/mthca_user.h
+++ b/drivers/infiniband/hw/mthca/mthca_user.h
@@ -41,7 +41,7 @@
  * Increment this value if any changes that break userspace ABI
  * compatibility are made.
  */
-#define MTHCA_UVERBS_ABI_VERSION        1
+#define MTHCA_UVERBS_ABI_VERSION        2
 
 /*
  * Make sure that all structs defined in this file remain laid out so
@@ -61,6 +61,14 @@ struct mthca_alloc_pd_resp {
         __u32 reserved;
 };
 
+struct mthca_reg_mr {
+        __u32 mr_attrs;
+#define MTHCA_MR_DMASYNC 0x1
+/* mark the memory region with a DMA attribute that causes
+ * in-flight DMA to be flushed when the region is written to */
+        __u32 reserved;
+};
+
 struct mthca_create_cq {
         __u32 lkey;
         __u32 pdn;
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index ee74f7c7a6da..9ae397a0ff7e 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -2377,7 +2377,7 @@ static struct ib_mr *nes_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
         u8 single_page = 1;
         u8 stag_key;
 
-        region = ib_umem_get(pd->uobject->context, start, length, acc);
+        region = ib_umem_get(pd->uobject->context, start, length, acc, 0);
         if (IS_ERR(region)) {
                 return (struct ib_mr *)region;
         }