Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (46 commits)
  IB/uverbs: Don't serialize with ib_uverbs_idr_mutex
  IB/mthca: Make all device methods truly reentrant
  IB/mthca: Fix memory leak on modify_qp error paths
  IB/uverbs: Factor out common idr code
  IB/uverbs: Don't decrement usecnt on error paths
  IB/uverbs: Release lock on error path
  IB/cm: Use address handle helpers
  IB/sa: Add ib_init_ah_from_path()
  IB: Add ib_init_ah_from_wc()
  IB/ucm: Get rid of duplicate P_Key parameter
  IB/srp: Factor out common request reset code
  IB/srp: Support SRP rev. 10 targets
  [SCSI] srp.h: Add I/O Class values
  IB/fmr: Use device's max_map_map_per_fmr attribute in FMR pool.
  IB/mthca: Fill in max_map_per_fmr device attribute
  IB/ipath: Add client reregister event generation
  IB/mthca: Add client reregister event generation
  IB: Move struct port_info from ipath to <rdma/ib_smi.h>
  IPoIB: Handle client reregister events
  IB: Add client reregister event type
  ...

1 files changed, 26 insertions, 7 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index a2eae8a30167..230ae21db8fd 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -115,6 +115,16 @@ static int mthca_query_device(struct ib_device *ibdev,
         props->max_mcast_qp_attach = MTHCA_QP_PER_MGM;
         props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
                                            props->max_mcast_grp;
+        /*
+         * If Sinai memory key optimization is being used, then only
+         * the 8-bit key portion will change.  For other HCAs, the
+         * unused index bits will also be used for FMR remapping.
+         */
+        if (mdev->mthca_flags & MTHCA_FLAG_SINAI_OPT)
+                props->max_map_per_fmr = 255;
+        else
+                props->max_map_per_fmr =
+                        (1 << (32 - long_log2(mdev->limits.num_mpts))) - 1;
 
         err = 0;
  out:
@@ -783,18 +793,24 @@ static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *uda
         if (entries < 1 || entries > dev->limits.max_cqes)
                 return -EINVAL;
 
+        mutex_lock(&cq->mutex);
+
         entries = roundup_pow_of_two(entries + 1);
-        if (entries == ibcq->cqe + 1)
-                return 0;
+        if (entries == ibcq->cqe + 1) {
+                ret = 0;
+                goto out;
+        }
 
         if (cq->is_kernel) {
                 ret = mthca_alloc_resize_buf(dev, cq, entries);
                 if (ret)
-                        return ret;
+                        goto out;
                 lkey = cq->resize_buf->buf.mr.ibmr.lkey;
         } else {
-                if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd))
-                        return -EFAULT;
+                if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd)) {
+                        ret = -EFAULT;
+                        goto out;
+                }
                 lkey = ucmd.lkey;
         }
 
@@ -811,7 +827,7 @@ static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *uda
                         cq->resize_buf = NULL;
                         spin_unlock_irq(&cq->lock);
                 }
-                return ret;
+                goto out;
         }
 
         if (cq->is_kernel) {
@@ -838,7 +854,10 @@ static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *uda
         } else
                 ibcq->cqe = entries - 1;
 
-        return 0;
+out:
+        mutex_unlock(&cq->mutex);
+
+        return ret;
 }
 
 static int mthca_destroy_cq(struct ib_cq *cq)