Merge tag 'rdma-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

Pull InfiniBand/RDMA changes from Roland Dreier:
 - Add ocrdma hardware driver for Emulex IB-over-Ethernet adapters
 - Add generic and mlx4 support for "raw" QPs: allow suitably privileged
   applications to send and receive arbitrary packets directly to/from
   the hardware
 - Add "doorbell drop" handling to the cxgb4 driver
 - A fairly large batch of qib hardware driver changes
 - A few fixes for lockdep-detected issues
 - A few other miscellaneous fixes and cleanups

Fix up trivial conflict in drivers/net/ethernet/emulex/benet/be.h.

* tag 'rdma-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (53 commits)
  RDMA/cxgb4: Include vmalloc.h for vmalloc and vfree
  IB/mlx4: Fix mlx4_ib_add() error flow
  IB/core: Fix IB_SA_COMP_MASK macro
  IB/iser: Fix error flow in iser ep connection establishment
  IB/mlx4: Increase the number of vectors (EQs) available for ULPs
  RDMA/cxgb4: Add query_qp support
  RDMA/cxgb4: Remove kfifo usage
  RDMA/cxgb4: Use vmalloc() for debugfs QP dump
  RDMA/cxgb4: DB Drop Recovery for RDMA and LLD queues
  RDMA/cxgb4: Disable interrupts in c4iw_ev_dispatch()
  RDMA/cxgb4: Add DB Overflow Avoidance
  RDMA/cxgb4: Add debugfs RDMA memory stats
  cxgb4: DB Drop Recovery for RDMA and LLD queues
  cxgb4: Common platform specific changes for DB Drop Recovery
  cxgb4: Detect DB FULL events and notify RDMA ULD
  RDMA/cxgb4: Drop peer_abort when no endpoint found
  RDMA/cxgb4: Always wake up waiters in c4iw_peer_abort_intr()
  mlx4_core: Change bitmap allocator to work in round-robin fashion
  RDMA/nes: Don't call event handler if pointer is NULL
  RDMA/nes: Fix for the ORD value of the connecting peer
  ...

1 files changed, 13 insertions, 6 deletions

diff --git a/drivers/infiniband/hw/cxgb4/provider.c b/drivers/infiniband/hw/cxgb4/provider.c
index be1c18f44400..e084fdc6da7f 100644
--- a/drivers/infiniband/hw/cxgb4/provider.c
+++ b/drivers/infiniband/hw/cxgb4/provider.c
@@ -188,8 +188,10 @@ static int c4iw_deallocate_pd(struct ib_pd *pd)
         php = to_c4iw_pd(pd);
         rhp = php->rhp;
         PDBG("%s ibpd %p pdid 0x%x\n", __func__, pd, php->pdid);
-        c4iw_put_resource(&rhp->rdev.resource.pdid_fifo, php->pdid,
-                          &rhp->rdev.resource.pdid_fifo_lock);
+        c4iw_put_resource(&rhp->rdev.resource.pdid_table, php->pdid);
+        mutex_lock(&rhp->rdev.stats.lock);
+        rhp->rdev.stats.pd.cur--;
+        mutex_unlock(&rhp->rdev.stats.lock);
         kfree(php);
         return 0;
 }
@@ -204,14 +206,12 @@ static struct ib_pd *c4iw_allocate_pd(struct ib_device *ibdev,
 
         PDBG("%s ibdev %p\n", __func__, ibdev);
         rhp = (struct c4iw_dev *) ibdev;
-        pdid =  c4iw_get_resource(&rhp->rdev.resource.pdid_fifo,
-                                  &rhp->rdev.resource.pdid_fifo_lock);
+        pdid =  c4iw_get_resource(&rhp->rdev.resource.pdid_table);
         if (!pdid)
                 return ERR_PTR(-EINVAL);
         php = kzalloc(sizeof(*php), GFP_KERNEL);
         if (!php) {
-                c4iw_put_resource(&rhp->rdev.resource.pdid_fifo, pdid,
-                                  &rhp->rdev.resource.pdid_fifo_lock);
+                c4iw_put_resource(&rhp->rdev.resource.pdid_table, pdid);
                 return ERR_PTR(-ENOMEM);
         }
         php->pdid = pdid;
@@ -222,6 +222,11 @@ static struct ib_pd *c4iw_allocate_pd(struct ib_device *ibdev,
                         return ERR_PTR(-EFAULT);
                 }
         }
+        mutex_lock(&rhp->rdev.stats.lock);
+        rhp->rdev.stats.pd.cur++;
+        if (rhp->rdev.stats.pd.cur > rhp->rdev.stats.pd.max)
+                rhp->rdev.stats.pd.max = rhp->rdev.stats.pd.cur;
+        mutex_unlock(&rhp->rdev.stats.lock);
         PDBG("%s pdid 0x%0x ptr 0x%p\n", __func__, pdid, php);
         return &php->ibpd;
 }
@@ -438,6 +443,7 @@ int c4iw_register_device(struct c4iw_dev *dev)
             (1ull << IB_USER_VERBS_CMD_REQ_NOTIFY_CQ) |
             (1ull << IB_USER_VERBS_CMD_CREATE_QP) |
             (1ull << IB_USER_VERBS_CMD_MODIFY_QP) |
+            (1ull << IB_USER_VERBS_CMD_QUERY_QP) |
             (1ull << IB_USER_VERBS_CMD_POLL_CQ) |
             (1ull << IB_USER_VERBS_CMD_DESTROY_QP) |
             (1ull << IB_USER_VERBS_CMD_POST_SEND) |
@@ -460,6 +466,7 @@ int c4iw_register_device(struct c4iw_dev *dev)
         dev->ibdev.destroy_ah = c4iw_ah_destroy;
         dev->ibdev.create_qp = c4iw_create_qp;
         dev->ibdev.modify_qp = c4iw_ib_modify_qp;
+        dev->ibdev.query_qp = c4iw_ib_query_qp;
         dev->ibdev.destroy_qp = c4iw_destroy_qp;
         dev->ibdev.create_cq = c4iw_create_cq;
         dev->ibdev.destroy_cq = c4iw_destroy_cq;