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

infiniband changes for 3.3 merge window

* tag 'infiniband-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  rdma/core: Fix sparse warnings
  RDMA/cma: Fix endianness bugs
  RDMA/nes: Fix terminate during AE
  RDMA/nes: Make unnecessarily global nes_set_pau() static
  RDMA/nes: Change MDIO bus clock to 2.5MHz
  IB/cm: Fix layout of APR message
  IB/mlx4: Fix SL to 802.1Q priority-bits mapping for IBoE
  IB/qib: Default some module parameters optimally
  IB/qib: Optimize locking for get_txreq()
  IB/qib: Fix a possible data corruption when receiving packets
  IB/qib: Eliminate 64-bit jiffies use
  IB/qib: Fix style issues
  IB/uverbs: Protect QP multicast list

4 files changed, 24 insertions, 13 deletions

diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h
index 505db2a59e7..7da9b210234 100644
--- a/drivers/infiniband/core/cm_msgs.h
+++ b/drivers/infiniband/core/cm_msgs.h
@@ -799,6 +799,7 @@ struct cm_apr_msg {
 
         u8 info_length;
         u8 ap_status;
+        __be16 rsvd;
         u8 info[IB_CM_APR_INFO_LENGTH];
 
         u8 private_data[IB_CM_APR_PRIVATE_DATA_SIZE];
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 236a88c1ca8..e3e470fecaa 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1110,7 +1110,7 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id,
         if (cma_any_addr((struct sockaddr *) &rt->addr.src_addr)) {
                 rt->addr.dev_addr.dev_type = ARPHRD_INFINIBAND;
                 rdma_addr_set_sgid(&rt->addr.dev_addr, &rt->path_rec[0].sgid);
-                ib_addr_set_pkey(&rt->addr.dev_addr, rt->path_rec[0].pkey);
+                ib_addr_set_pkey(&rt->addr.dev_addr, be16_to_cpu(rt->path_rec[0].pkey));
         } else {
                 ret = rdma_translate_ip((struct sockaddr *) &rt->addr.src_addr,
                                         &rt->addr.dev_addr);
@@ -2926,7 +2926,7 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
         mutex_lock(&id_priv->qp_mutex);
         if (!status && id_priv->id.qp)
                 status = ib_attach_mcast(id_priv->id.qp, &multicast->rec.mgid,
-                                         multicast->rec.mlid);
+                                         be16_to_cpu(multicast->rec.mlid));
         mutex_unlock(&id_priv->qp_mutex);
 
         memset(&event, 0, sizeof event);
@@ -3187,7 +3187,7 @@ void rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr)
                         if (id->qp)
                                 ib_detach_mcast(id->qp,
                                                 &mc->multicast.ib->rec.mgid,
-                                                mc->multicast.ib->rec.mlid);
+                                                be16_to_cpu(mc->multicast.ib->rec.mlid));
                         if (rdma_node_get_transport(id_priv->cma_dev->device->node_type) == RDMA_TRANSPORT_IB) {
                                 switch (rdma_port_get_link_layer(id->device, id->port_num)) {
                                 case IB_LINK_LAYER_INFINIBAND:
diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
index b8a0b4a7811..06f08713f48 100644
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -106,9 +106,6 @@ enum {
         IB_UCM_MAX_DEVICES = 32
 };
 
-/* ib_cm and ib_user_cm modules share /sys/class/infiniband_cm */
-extern struct class cm_class;
-
 #define IB_UCM_BASE_DEV MKDEV(IB_UCM_MAJOR, IB_UCM_BASE_MINOR)
 
 static void ib_ucm_add_one(struct ib_device *device);
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 254f1649c73..b930da4c0c6 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -241,11 +241,24 @@ static struct ib_qp *idr_read_qp(int qp_handle, struct ib_ucontext *context)
         return idr_read_obj(&ib_uverbs_qp_idr, qp_handle, context, 0);
 }
 
+static struct ib_qp *idr_write_qp(int qp_handle, struct ib_ucontext *context)
+{
+        struct ib_uobject *uobj;
+
+        uobj = idr_write_uobj(&ib_uverbs_qp_idr, qp_handle, context);
+        return uobj ? uobj->object : NULL;
+}
+
 static void put_qp_read(struct ib_qp *qp)
 {
         put_uobj_read(qp->uobject);
 }
 
+static void put_qp_write(struct ib_qp *qp)
+{
+        put_uobj_write(qp->uobject);
+}
+
 static struct ib_srq *idr_read_srq(int srq_handle, struct ib_ucontext *context)
 {
         return idr_read_obj(&ib_uverbs_srq_idr, srq_handle, context, 0);
@@ -2375,7 +2388,7 @@ ssize_t ib_uverbs_attach_mcast(struct ib_uverbs_file *file,
         if (copy_from_user(&cmd, buf, sizeof cmd))
                 return -EFAULT;
 
-        qp = idr_read_qp(cmd.qp_handle, file->ucontext);
+        qp = idr_write_qp(cmd.qp_handle, file->ucontext);
         if (!qp)
                 return -EINVAL;
 
@@ -2404,7 +2417,7 @@ ssize_t ib_uverbs_attach_mcast(struct ib_uverbs_file *file,
                 kfree(mcast);
 
 out_put:
-        put_qp_read(qp);
+        put_qp_write(qp);
 
         return ret ? ret : in_len;
 }
@@ -2422,7 +2435,7 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file,
         if (copy_from_user(&cmd, buf, sizeof cmd))
                 return -EFAULT;
 
-        qp = idr_read_qp(cmd.qp_handle, file->ucontext);
+        qp = idr_write_qp(cmd.qp_handle, file->ucontext);
         if (!qp)
                 return -EINVAL;
 
@@ -2441,14 +2454,14 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file,
                 }
 
 out_put:
-        put_qp_read(qp);
+        put_qp_write(qp);
 
         return ret ? ret : in_len;
 }
 
-int __uverbs_create_xsrq(struct ib_uverbs_file *file,
-                         struct ib_uverbs_create_xsrq *cmd,
-                         struct ib_udata *udata)
+static int __uverbs_create_xsrq(struct ib_uverbs_file *file,
+                                struct ib_uverbs_create_xsrq *cmd,
+                                struct ib_udata *udata)
 {
         struct ib_uverbs_create_srq_resp resp;
         struct ib_usrq_object           *obj;