Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

Pull inifiniband/rdma updates from Doug Ledford:
 "This is a fairly sizeable set of changes.  I've put them through a
  decent amount of testing prior to sending the pull request due to
  that.

  There are still a few fixups that I know are coming, but I wanted to
  go ahead and get the big, sizable chunk into your hands sooner rather
  than waiting for those last few fixups.

  Of note is the fact that this creates what is intended to be a
  temporary area in the drivers/staging tree specifically for some
  cleanups and additions that are coming for the RDMA stack.  We
  deprecated two drivers (ipath and amso1100) and are waiting to hear
  back if we can deprecate another one (ehca).  We also put Intel's new
  hfi1 driver into this area because it needs to be refactored and a
  transfer library created out of the factored out code, and then it and
  the qib driver and the soft-roce driver should all be modified to use
  that library.

  I expect drivers/staging/rdma to be around for three or four kernel
  releases and then to go away as all of the work is completed and final
  deletions of deprecated drivers are done.

  Summary of changes for 4.3:

   - Create drivers/staging/rdma
   - Move amso1100 driver to staging/rdma and schedule for deletion
   - Move ipath driver to staging/rdma and schedule for deletion
   - Add hfi1 driver to staging/rdma and set TODO for move to regular
     tree
   - Initial support for namespaces to be used on RDMA devices
   - Add RoCE GID table handling to the RDMA core caching code
   - Infrastructure to support handling of devices with differing read
     and write scatter gather capabilities
   - Various iSER updates
   - Kill off unsafe usage of global mr registrations
   - Update SRP driver
   - Misc  mlx4 driver updates
   - Support for the mr_alloc verb
   - Support for a netlink interface between kernel and user space cache
     daemon to speed path record queries and route resolution
   - Ininitial support for safe hot removal of verbs devices"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (136 commits)
  IB/ipoib: Suppress warning for send only join failures
  IB/ipoib: Clean up send-only multicast joins
  IB/srp: Fix possible protection fault
  IB/core: Move SM class defines from ib_mad.h to ib_smi.h
  IB/core: Remove unnecessary defines from ib_mad.h
  IB/hfi1: Add PSM2 user space header to header_install
  IB/hfi1: Add CSRs for CONFIG_SDMA_VERBOSITY
  mlx5: Fix incorrect wc pkey_index assignment for GSI messages
  IB/mlx5: avoid destroying a NULL mr in reg_user_mr error flow
  IB/uverbs: reject invalid or unknown opcodes
  IB/cxgb4: Fix if statement in pick_local_ip6adddrs
  IB/sa: Fix rdma netlink message flags
  IB/ucma: HW Device hot-removal support
  IB/mlx4_ib: Disassociate support
  IB/uverbs: Enable device removal when there are active user space applications
  IB/uverbs: Explicitly pass ib_dev to uverbs commands
  IB/uverbs: Fix race between ib_uverbs_open and remove_one
  IB/uverbs: Fix reference counting usage of event files
  IB/core: Make ib_dealloc_pd return void
  IB/srp: Create an insecure all physical rkey only if needed
  ...

8 files changed, 19 insertions, 34 deletions

diff --git a/net/rds/ib.c b/net/rds/ib.c
index d020fade312c..2d3f2ab475df 100644
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -99,8 +99,6 @@ static void rds_ib_dev_free(struct work_struct *work)
 
         if (rds_ibdev->mr_pool)
                 rds_ib_destroy_mr_pool(rds_ibdev->mr_pool);
-        if (rds_ibdev->mr)
-                ib_dereg_mr(rds_ibdev->mr);
         if (rds_ibdev->pd)
                 ib_dealloc_pd(rds_ibdev->pd);
 
@@ -164,12 +162,6 @@ static void rds_ib_add_one(struct ib_device *device)
                 goto put_dev;
         }
 
-        rds_ibdev->mr = ib_get_dma_mr(rds_ibdev->pd, IB_ACCESS_LOCAL_WRITE);
-        if (IS_ERR(rds_ibdev->mr)) {
-                rds_ibdev->mr = NULL;
-                goto put_dev;
-        }
-
         rds_ibdev->mr_pool = rds_ib_create_mr_pool(rds_ibdev);
         if (IS_ERR(rds_ibdev->mr_pool)) {
                 rds_ibdev->mr_pool = NULL;
@@ -230,11 +222,10 @@ struct rds_ib_device *rds_ib_get_client_data(struct ib_device *device)
  *
  * This can be called at any time and can be racing with any other RDS path.
  */
-static void rds_ib_remove_one(struct ib_device *device)
+static void rds_ib_remove_one(struct ib_device *device, void *client_data)
 {
-        struct rds_ib_device *rds_ibdev;
+        struct rds_ib_device *rds_ibdev = client_data;
 
-        rds_ibdev = ib_get_client_data(device, &rds_ib_client);
         if (!rds_ibdev)
                 return;
 
diff --git a/net/rds/ib.h b/net/rds/ib.h
index 9fc95e38659a..aae60fda77f6 100644
--- a/net/rds/ib.h
+++ b/net/rds/ib.h
@@ -100,7 +100,6 @@ struct rds_ib_connection {
         /* alphabet soup, IBTA style */
         struct rdma_cm_id       *i_cm_id;
         struct ib_pd            *i_pd;
-        struct ib_mr            *i_mr;
         struct ib_cq            *i_send_cq;
         struct ib_cq            *i_recv_cq;
 
@@ -173,7 +172,6 @@ struct rds_ib_device {
         struct list_head        conn_list;
         struct ib_device        *dev;
         struct ib_pd            *pd;
-        struct ib_mr            *mr;
         struct rds_ib_mr_pool   *mr_pool;
         unsigned int            fmr_max_remaps;
         unsigned int            max_fmrs;
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index d150bb4aa3cb..9043f5c04787 100644
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -269,7 +269,6 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
 
         /* Protection domain and memory range */
         ic->i_pd = rds_ibdev->pd;
-        ic->i_mr = rds_ibdev->mr;
 
         cq_attr.cqe = ic->i_send_ring.w_nr + 1;
         ic->i_send_cq = ib_create_cq(dev, rds_ib_send_cq_comp_handler,
@@ -375,7 +374,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
 
         rds_ib_recv_init_ack(ic);
 
-        rdsdebug("conn %p pd %p mr %p cq %p %p\n", conn, ic->i_pd, ic->i_mr,
+        rdsdebug("conn %p pd %p cq %p %p\n", conn, ic->i_pd,
                  ic->i_send_cq, ic->i_recv_cq);
 
 out:
@@ -682,7 +681,6 @@ void rds_ib_conn_shutdown(struct rds_connection *conn)
 
                 ic->i_cm_id = NULL;
                 ic->i_pd = NULL;
-                ic->i_mr = NULL;
                 ic->i_send_cq = NULL;
                 ic->i_recv_cq = NULL;
                 ic->i_send_hdrs = NULL;
diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index 6bbe62060060..f43831e4186a 100644
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -62,12 +62,12 @@ void rds_ib_recv_init_ring(struct rds_ib_connection *ic)
                 sge = &recv->r_sge[0];
                 sge->addr = ic->i_recv_hdrs_dma + (i * sizeof(struct rds_header));
                 sge->length = sizeof(struct rds_header);
-                sge->lkey = ic->i_mr->lkey;
+                sge->lkey = ic->i_pd->local_dma_lkey;
 
                 sge = &recv->r_sge[1];
                 sge->addr = 0;
                 sge->length = RDS_FRAG_SIZE;
-                sge->lkey = ic->i_mr->lkey;
+                sge->lkey = ic->i_pd->local_dma_lkey;
         }
 }
 
@@ -564,7 +564,7 @@ void rds_ib_recv_init_ack(struct rds_ib_connection *ic)
 
         sge->addr = ic->i_ack_dma;
         sge->length = sizeof(struct rds_header);
-        sge->lkey = ic->i_mr->lkey;
+        sge->lkey = ic->i_pd->local_dma_lkey;
 
         wr->sg_list = sge;
         wr->num_sge = 1;
diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c
index c576ebeb4115..4e88047086b6 100644
--- a/net/rds/ib_send.c
+++ b/net/rds/ib_send.c
@@ -202,9 +202,9 @@ void rds_ib_send_init_ring(struct rds_ib_connection *ic)
                 sge = &send->s_sge[0];
                 sge->addr = ic->i_send_hdrs_dma + (i * sizeof(struct rds_header));
                 sge->length = sizeof(struct rds_header);
-                sge->lkey = ic->i_mr->lkey;
+                sge->lkey = ic->i_pd->local_dma_lkey;
 
-                send->s_sge[1].lkey = ic->i_mr->lkey;
+                send->s_sge[1].lkey = ic->i_pd->local_dma_lkey;
         }
 }
 
@@ -818,7 +818,7 @@ int rds_ib_xmit_atomic(struct rds_connection *conn, struct rm_atomic_op *op)
         /* Convert our struct scatterlist to struct ib_sge */
         send->s_sge[0].addr = ib_sg_dma_address(ic->i_cm_id->device, op->op_sg);
         send->s_sge[0].length = ib_sg_dma_len(ic->i_cm_id->device, op->op_sg);
-        send->s_sge[0].lkey = ic->i_mr->lkey;
+        send->s_sge[0].lkey = ic->i_pd->local_dma_lkey;
 
         rdsdebug("rva %Lx rpa %Lx len %u\n", op->op_remote_addr,
                  send->s_sge[0].addr, send->s_sge[0].length);
@@ -932,7 +932,7 @@ int rds_ib_xmit_rdma(struct rds_connection *conn, struct rm_rdma_op *op)
                         send->s_sge[j].addr =
                                  ib_sg_dma_address(ic->i_cm_id->device, scat);
                         send->s_sge[j].length = len;
-                        send->s_sge[j].lkey = ic->i_mr->lkey;
+                        send->s_sge[j].lkey = ic->i_pd->local_dma_lkey;
 
                         sent += len;
                         rdsdebug("ic %p sent %d remote_addr %llu\n", ic, sent, remote_addr);
diff --git a/net/rds/iw.c b/net/rds/iw.c
index 5d5a9d258658..3df0295c6659 100644
--- a/net/rds/iw.c
+++ b/net/rds/iw.c
@@ -125,12 +125,11 @@ free_attr:
         kfree(dev_attr);
 }
 
-static void rds_iw_remove_one(struct ib_device *device)
+static void rds_iw_remove_one(struct ib_device *device, void *client_data)
 {
-        struct rds_iw_device *rds_iwdev;
+        struct rds_iw_device *rds_iwdev = client_data;
         struct rds_iw_cm_id *i_cm_id, *next;
 
-        rds_iwdev = ib_get_client_data(device, &rds_iw_client);
         if (!rds_iwdev)
                 return;
 
@@ -149,10 +148,7 @@ static void rds_iw_remove_one(struct ib_device *device)
         if (rds_iwdev->mr)
                 ib_dereg_mr(rds_iwdev->mr);
 
-        while (ib_dealloc_pd(rds_iwdev->pd)) {
-                rdsdebug("Failed to dealloc pd %p\n", rds_iwdev->pd);
-                msleep(1);
-        }
+        ib_dealloc_pd(rds_iwdev->pd);
 
         list_del(&rds_iwdev->list);
         kfree(rds_iwdev);
diff --git a/net/rds/iw_rdma.c b/net/rds/iw_rdma.c
index dba8d0864f18..6a8fbd6e69e7 100644
--- a/net/rds/iw_rdma.c
+++ b/net/rds/iw_rdma.c
@@ -667,11 +667,12 @@ static int rds_iw_init_fastreg(struct rds_iw_mr_pool *pool,
         struct ib_mr *mr;
         int err;
 
-        mr = ib_alloc_fast_reg_mr(rds_iwdev->pd, pool->max_message_size);
+        mr = ib_alloc_mr(rds_iwdev->pd, IB_MR_TYPE_MEM_REG,
+                         pool->max_message_size);
         if (IS_ERR(mr)) {
                 err = PTR_ERR(mr);
 
-                printk(KERN_WARNING "RDS/IW: ib_alloc_fast_reg_mr failed (err=%d)\n", err);
+                printk(KERN_WARNING "RDS/IW: ib_alloc_mr failed (err=%d)\n", err);
                 return err;
         }
 
diff --git a/net/rds/iw_send.c b/net/rds/iw_send.c
index 334fe98c5084..86152ec3b887 100644
--- a/net/rds/iw_send.c
+++ b/net/rds/iw_send.c
@@ -153,9 +153,10 @@ void rds_iw_send_init_ring(struct rds_iw_connection *ic)
                 sge->length = sizeof(struct rds_header);
                 sge->lkey = 0;
 
-                send->s_mr = ib_alloc_fast_reg_mr(ic->i_pd, fastreg_message_size);
+                send->s_mr = ib_alloc_mr(ic->i_pd, IB_MR_TYPE_MEM_REG,
+                                         fastreg_message_size);
                 if (IS_ERR(send->s_mr)) {
-                        printk(KERN_WARNING "RDS/IW: ib_alloc_fast_reg_mr failed\n");
+                        printk(KERN_WARNING "RDS/IW: ib_alloc_mr failed\n");
                         break;
                 }