16 files changed, 97 insertions, 63 deletions

diff --git a/drivers/infiniband/core/iwcm.c b/drivers/infiniband/core/iwcm.c
index 0bb99bb38809..c47c2034ca71 100644
--- a/drivers/infiniband/core/iwcm.c
+++ b/drivers/infiniband/core/iwcm.c
@@ -878,6 +878,8 @@ static void cm_work_handler(struct work_struct *_work)
                         }
                         return;
                 }
+                if (empty)
+                        return;
                 spin_lock_irqsave(&cm_id_priv->lock, flags);
         }
         spin_unlock_irqrestore(&cm_id_priv->lock, flags);
diff --git a/drivers/infiniband/hw/cxgb3/cxio_resource.c b/drivers/infiniband/hw/cxgb3/cxio_resource.c
index 31f9201b2980..c40088ecf9f3 100644
--- a/drivers/infiniband/hw/cxgb3/cxio_resource.c
+++ b/drivers/infiniband/hw/cxgb3/cxio_resource.c
@@ -62,13 +62,13 @@ static int __cxio_init_resource_fifo(struct kfifo *fifo,
                 kfifo_in(fifo, (unsigned char *) &entry, sizeof(u32));
         if (random) {
                 j = 0;
-                random_bytes = random32();
+                random_bytes = prandom_u32();
                 for (i = 0; i < RANDOM_SIZE; i++)
                         rarray[i] = i + skip_low;
                 for (i = skip_low + RANDOM_SIZE; i < nr - skip_high; i++) {
                         if (j >= RANDOM_SIZE) {
                                 j = 0;
-                                random_bytes = random32();
+                                random_bytes = prandom_u32();
                         }
                         idx = (random_bytes >> (j * 2)) & 0xF;
                         kfifo_in(fifo,
diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
index 9c12da0cbd32..e87f2201b220 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -559,7 +559,7 @@ static int iwch_reregister_phys_mem(struct ib_mr *mr,
         __be64 *page_list = NULL;
         int shift = 0;
         u64 total_size;
-        int npages;
+        int npages = 0;
         int ret;
 
         PDBG("%s ib_mr %p ib_pd %p\n", __func__, mr, pd);
diff --git a/drivers/infiniband/hw/cxgb4/id_table.c b/drivers/infiniband/hw/cxgb4/id_table.c
index f95e5df30db2..0161ae6ad629 100644
--- a/drivers/infiniband/hw/cxgb4/id_table.c
+++ b/drivers/infiniband/hw/cxgb4/id_table.c
@@ -54,7 +54,7 @@ u32 c4iw_id_alloc(struct c4iw_id_table *alloc)
 
         if (obj < alloc->max) {
                 if (alloc->flags & C4IW_ID_TABLE_F_RANDOM)
-                        alloc->last += random32() % RANDOM_SKIP;
+                        alloc->last += prandom_u32() % RANDOM_SKIP;
                 else
                         alloc->last = obj + 1;
                 if (alloc->last >= alloc->max)
@@ -88,7 +88,7 @@ int c4iw_id_table_alloc(struct c4iw_id_table *alloc, u32 start, u32 num,
         alloc->start = start;
         alloc->flags = flags;
         if (flags & C4IW_ID_TABLE_F_RANDOM)
-                alloc->last = random32() % RANDOM_SKIP;
+                alloc->last = prandom_u32() % RANDOM_SKIP;
         else
                 alloc->last = 0;
         alloc->max  = num;
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index 70b1808a08f4..ed49ab345b6e 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -100,6 +100,16 @@ static int alloc_host_sq(struct c4iw_rdev *rdev, struct t4_sq *sq)
         return 0;
 }
 
+static int alloc_sq(struct c4iw_rdev *rdev, struct t4_sq *sq, int user)
+{
+        int ret = -ENOSYS;
+        if (user)
+                ret = alloc_oc_sq(rdev, sq);
+        if (ret)
+                ret = alloc_host_sq(rdev, sq);
+        return ret;
+}
+
 static int destroy_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
                       struct c4iw_dev_ucontext *uctx)
 {
@@ -168,18 +178,9 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
                 goto free_sw_rq;
         }
 
-        if (user) {
-                ret = alloc_oc_sq(rdev, &wq->sq);
-                if (ret)
-                        goto free_hwaddr;
-
-                ret = alloc_host_sq(rdev, &wq->sq);
-                if (ret)
-                        goto free_sq;
-        } else
-                ret = alloc_host_sq(rdev, &wq->sq);
-                if (ret)
-                        goto free_hwaddr;
+        ret = alloc_sq(rdev, &wq->sq, user);
+        if (ret)
+                goto free_hwaddr;
         memset(wq->sq.queue, 0, wq->sq.memsize);
         dma_unmap_addr_set(&wq->sq, mapping, wq->sq.dma_addr);
 
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index ea93870266eb..44ea9390417c 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -2187,7 +2187,8 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
         if (ret)
                 goto err_reg;
 
-        if (ipath_verbs_register_sysfs(dev))
+        ret = ipath_verbs_register_sysfs(dev);
+        if (ret)
                 goto err_class;
 
         enable_timer(dd);
@@ -2327,15 +2328,15 @@ static int ipath_verbs_register_sysfs(struct ib_device *dev)
         int i;
         int ret;
 
-        for (i = 0; i < ARRAY_SIZE(ipath_class_attributes); ++i)
-                if (device_create_file(&dev->dev,
-                                       ipath_class_attributes[i])) {
-                        ret = 1;
+        for (i = 0; i < ARRAY_SIZE(ipath_class_attributes); ++i) {
+                ret = device_create_file(&dev->dev,
+                                       ipath_class_attributes[i]);
+                if (ret)
                         goto bail;
-                }
-
-        ret = 0;
-
+        }
+        return 0;
 bail:
+        for (i = 0; i < ARRAY_SIZE(ipath_class_attributes); ++i)
+                device_remove_file(&dev->dev, ipath_class_attributes[i]);
         return ret;
 }
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 934792c477bc..4d599cedbb0b 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -93,7 +93,7 @@ static void __propagate_pkey_ev(struct mlx4_ib_dev *dev, int port_num,
 __be64 mlx4_ib_gen_node_guid(void)
 {
 #define NODE_GUID_HI    ((u64) (((u64)IB_OPENIB_OUI) << 40))
-        return cpu_to_be64(NODE_GUID_HI | random32());
+        return cpu_to_be64(NODE_GUID_HI | prandom_u32());
 }
 
 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
diff --git a/drivers/infiniband/hw/qib/qib_sysfs.c b/drivers/infiniband/hw/qib/qib_sysfs.c
index 034cc821de5c..3c8e4e3caca6 100644
--- a/drivers/infiniband/hw/qib/qib_sysfs.c
+++ b/drivers/infiniband/hw/qib/qib_sysfs.c
@@ -808,10 +808,14 @@ int qib_verbs_register_sysfs(struct qib_devdata *dd)
         for (i = 0; i < ARRAY_SIZE(qib_attributes); ++i) {
                 ret = device_create_file(&dev->dev, qib_attributes[i]);
                 if (ret)
-                        return ret;
+                        goto bail;
         }
 
         return 0;
+bail:
+        for (i = 0; i < ARRAY_SIZE(qib_attributes); ++i)
+                device_remove_file(&dev->dev, qib_attributes[i]);
+        return ret;
 }
 
 /*
diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c
index 7c0ab16a2fe2..904c384aa361 100644
--- a/drivers/infiniband/hw/qib/qib_verbs.c
+++ b/drivers/infiniband/hw/qib/qib_verbs.c
@@ -2234,7 +2234,8 @@ int qib_register_ib_device(struct qib_devdata *dd)
         if (ret)
                 goto err_agents;
 
-        if (qib_verbs_register_sysfs(dd))
+        ret = qib_verbs_register_sysfs(dd);
+        if (ret)
                 goto err_class;
 
         goto bail;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 1ef880de3a41..3eceb61e3532 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -460,7 +460,7 @@ static int ipoib_cm_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *even
                 goto err_qp;
         }
 
-        psn = random32() & 0xffffff;
+        psn = prandom_u32() & 0xffffff;
         ret = ipoib_cm_modify_rx_qp(dev, cm_id, p->qp, psn);
         if (ret)
                 goto err_modify;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 8534afd04e7c..31dd2a7a880f 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -828,7 +828,7 @@ static int ipoib_hard_header(struct sk_buff *skb,
          */
         memcpy(cb->hwaddr, daddr, INFINIBAND_ALEN);
 
-        return 0;
+        return sizeof *header;
 }
 
 static void ipoib_set_mcast_list(struct net_device *dev)
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 0ab8c9cc3a78..f19b0998a53c 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -82,10 +82,10 @@ module_param_named(max_lun, iscsi_max_lun, uint, S_IRUGO);
 
 int iser_debug_level = 0;
 
-MODULE_DESCRIPTION("iSER (iSCSI Extensions for RDMA) Datamover "
-                   "v" DRV_VER " (" DRV_DATE ")");
+MODULE_DESCRIPTION("iSER (iSCSI Extensions for RDMA) Datamover");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Alex Nezhinsky, Dan Bar Dov, Or Gerlitz");
+MODULE_VERSION(DRV_VER);
 
 module_param_named(debug_level, iser_debug_level, int, 0644);
 MODULE_PARM_DESC(debug_level, "Enable debug tracing if > 0 (default:disabled)");
@@ -370,8 +370,8 @@ iscsi_iser_conn_bind(struct iscsi_cls_session *cls_session,
         /* binds the iSER connection retrieved from the previously
          * connected ep_handle to the iSCSI layer connection. exchanges
          * connection pointers */
-        iser_err("binding iscsi/iser conn %p %p to ib_conn %p\n",
-                                        conn, conn->dd_data, ib_conn);
+        iser_info("binding iscsi/iser conn %p %p to ib_conn %p\n",
+                  conn, conn->dd_data, ib_conn);
         iser_conn = conn->dd_data;
         ib_conn->iser_conn = iser_conn;
         iser_conn->ib_conn  = ib_conn;
@@ -475,28 +475,28 @@ iscsi_iser_set_param(struct iscsi_cls_conn *cls_conn,
         case ISCSI_PARAM_HDRDGST_EN:
                 sscanf(buf, "%d", &value);
                 if (value) {
-                        printk(KERN_ERR "DataDigest wasn't negotiated to None");
+                        iser_err("DataDigest wasn't negotiated to None");
                         return -EPROTO;
                 }
                 break;
         case ISCSI_PARAM_DATADGST_EN:
                 sscanf(buf, "%d", &value);
                 if (value) {
-                        printk(KERN_ERR "DataDigest wasn't negotiated to None");
+                        iser_err("DataDigest wasn't negotiated to None");
                         return -EPROTO;
                 }
                 break;
         case ISCSI_PARAM_IFMARKER_EN:
                 sscanf(buf, "%d", &value);
                 if (value) {
-                        printk(KERN_ERR "IFMarker wasn't negotiated to No");
+                        iser_err("IFMarker wasn't negotiated to No");
                         return -EPROTO;
                 }
                 break;
         case ISCSI_PARAM_OFMARKER_EN:
                 sscanf(buf, "%d", &value);
                 if (value) {
-                        printk(KERN_ERR "OFMarker wasn't negotiated to No");
+                        iser_err("OFMarker wasn't negotiated to No");
                         return -EPROTO;
                 }
                 break;
@@ -596,7 +596,7 @@ iscsi_iser_ep_poll(struct iscsi_endpoint *ep, int timeout_ms)
              ib_conn->state == ISER_CONN_DOWN))
                 rc = -1;
 
-        iser_err("ib conn %p rc = %d\n", ib_conn, rc);
+        iser_info("ib conn %p rc = %d\n", ib_conn, rc);
 
         if (rc > 0)
                 return 1; /* success, this is the equivalent of POLLOUT */
@@ -623,7 +623,7 @@ iscsi_iser_ep_disconnect(struct iscsi_endpoint *ep)
                 iscsi_suspend_tx(ib_conn->iser_conn->iscsi_conn);
 
 
-        iser_err("ib conn %p state %d\n",ib_conn, ib_conn->state);
+        iser_info("ib conn %p state %d\n", ib_conn, ib_conn->state);
         iser_conn_terminate(ib_conn);
 }
 
@@ -682,7 +682,7 @@ static umode_t iser_attr_is_visible(int param_type, int param)
 
 static struct scsi_host_template iscsi_iser_sht = {
         .module                 = THIS_MODULE,
-        .name                   = "iSCSI Initiator over iSER, v." DRV_VER,
+        .name                   = "iSCSI Initiator over iSER",
         .queuecommand           = iscsi_queuecommand,
         .change_queue_depth     = iscsi_change_queue_depth,
         .sg_tablesize           = ISCSI_ISER_SG_TABLESIZE,
@@ -740,7 +740,7 @@ static int __init iser_init(void)
         iser_dbg("Starting iSER datamover...\n");
 
         if (iscsi_max_lun < 1) {
-                printk(KERN_ERR "Invalid max_lun value of %u\n", iscsi_max_lun);
+                iser_err("Invalid max_lun value of %u\n", iscsi_max_lun);
                 return -EINVAL;
         }
 
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index 5babdb35bda7..06f578cde75b 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -42,6 +42,7 @@
 
 #include <linux/types.h>
 #include <linux/net.h>
+#include <linux/printk.h>
 #include <scsi/libiscsi.h>
 #include <scsi/scsi_transport_iscsi.h>
 
@@ -65,20 +66,26 @@
 
 #define DRV_NAME        "iser"
 #define PFX             DRV_NAME ": "
-#define DRV_VER         "0.1"
-#define DRV_DATE        "May 7th, 2006"
+#define DRV_VER         "1.1"
 
 #define iser_dbg(fmt, arg...)                           \
         do {                                            \
-                if (iser_debug_level > 1)               \
+                if (iser_debug_level > 2)               \
                         printk(KERN_DEBUG PFX "%s:" fmt,\
                                 __func__ , ## arg);     \
         } while (0)
 
 #define iser_warn(fmt, arg...)                          \
         do {                                            \
+                if (iser_debug_level > 1)               \
+                        pr_warn(PFX "%s:" fmt,          \
+                                __func__ , ## arg);     \
+        } while (0)
+
+#define iser_info(fmt, arg...)                          \
+        do {                                            \
                 if (iser_debug_level > 0)               \
-                        printk(KERN_DEBUG PFX "%s:" fmt,\
+                        pr_info(PFX "%s:" fmt,          \
                                 __func__ , ## arg);     \
         } while (0)
 
@@ -133,6 +140,15 @@ struct iser_hdr {
         __be64  read_va;
 } __attribute__((packed));
 
+
+#define ISER_ZBVA_NOT_SUPPORTED         0x80
+#define ISER_SEND_W_INV_NOT_SUPPORTED   0x40
+
+struct iser_cm_hdr {
+        u8      flags;
+        u8      rsvd[3];
+} __packed;
+
 /* Constant PDU lengths calculations */
 #define ISER_HEADERS_LEN  (sizeof(struct iser_hdr) + sizeof(struct iscsi_hdr))
 
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index be1edb04b085..68ebb7fe072a 100644
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -416,8 +416,9 @@ int iser_reg_rdma_mem(struct iscsi_iser_task *iser_task,
                         for (i=0 ; i<ib_conn->page_vec->length ; i++)
                                 iser_err("page_vec[%d] = 0x%llx\n", i,
                                          (unsigned long long) ib_conn->page_vec->pages[i]);
-                        return err;
                 }
+                if (err)
+                        return err;
         }
         return 0;
 }
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index 4debadc53106..5278916c3103 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -74,8 +74,9 @@ static int iser_create_device_ib_res(struct iser_device *device)
         struct iser_cq_desc *cq_desc;
 
         device->cqs_used = min(ISER_MAX_CQ, device->ib_device->num_comp_vectors);
-        iser_err("using %d CQs, device %s supports %d vectors\n", device->cqs_used,
-                 device->ib_device->name, device->ib_device->num_comp_vectors);
+        iser_info("using %d CQs, device %s supports %d vectors\n",
+                  device->cqs_used, device->ib_device->name,
+                  device->ib_device->num_comp_vectors);
 
         device->cq_desc = kmalloc(sizeof(struct iser_cq_desc) * device->cqs_used,
                                   GFP_KERNEL);
@@ -262,7 +263,7 @@ static int iser_create_ib_conn_res(struct iser_conn *ib_conn)
                         min_index = index;
         device->cq_active_qps[min_index]++;
         mutex_unlock(&ig.connlist_mutex);
-        iser_err("cq index %d used for ib_conn %p\n", min_index, ib_conn);
+        iser_info("cq index %d used for ib_conn %p\n", min_index, ib_conn);
 
         init_attr.event_handler = iser_qp_event_callback;
         init_attr.qp_context    = (void *)ib_conn;
@@ -280,9 +281,9 @@ static int iser_create_ib_conn_res(struct iser_conn *ib_conn)
                 goto out_err;
 
         ib_conn->qp = ib_conn->cma_id->qp;
-        iser_err("setting conn %p cma_id %p: fmr_pool %p qp %p\n",
-                 ib_conn, ib_conn->cma_id,
-                 ib_conn->fmr_pool, ib_conn->cma_id->qp);
+        iser_info("setting conn %p cma_id %p: fmr_pool %p qp %p\n",
+                  ib_conn, ib_conn->cma_id,
+                  ib_conn->fmr_pool, ib_conn->cma_id->qp);
         return ret;
 
 out_err:
@@ -299,9 +300,9 @@ static int iser_free_ib_conn_res(struct iser_conn *ib_conn, int can_destroy_id)
         int cq_index;
         BUG_ON(ib_conn == NULL);
 
-        iser_err("freeing conn %p cma_id %p fmr pool %p qp %p\n",
-                 ib_conn, ib_conn->cma_id,
-                 ib_conn->fmr_pool, ib_conn->qp);
+        iser_info("freeing conn %p cma_id %p fmr pool %p qp %p\n",
+                  ib_conn, ib_conn->cma_id,
+                  ib_conn->fmr_pool, ib_conn->qp);
 
         /* qp is created only once both addr & route are resolved */
         if (ib_conn->fmr_pool != NULL)
@@ -379,7 +380,7 @@ static void iser_device_try_release(struct iser_device *device)
 {
         mutex_lock(&ig.device_list_mutex);
         device->refcount--;
-        iser_err("device %p refcount %d\n",device,device->refcount);
+        iser_info("device %p refcount %d\n", device, device->refcount);
         if (!device->refcount) {
                 iser_free_device_ib_res(device);
                 list_del(&device->ig_list);
@@ -498,6 +499,7 @@ static int iser_route_handler(struct rdma_cm_id *cma_id)
 {
         struct rdma_conn_param conn_param;
         int    ret;
+        struct iser_cm_hdr req_hdr;
 
         ret = iser_create_ib_conn_res((struct iser_conn *)cma_id->context);
         if (ret)
@@ -509,6 +511,12 @@ static int iser_route_handler(struct rdma_cm_id *cma_id)
         conn_param.retry_count         = 7;
         conn_param.rnr_retry_count     = 6;
 
+        memset(&req_hdr, 0, sizeof(req_hdr));
+        req_hdr.flags = (ISER_ZBVA_NOT_SUPPORTED |
+                        ISER_SEND_W_INV_NOT_SUPPORTED);
+        conn_param.private_data         = (void *)&req_hdr;
+        conn_param.private_data_len     = sizeof(struct iser_cm_hdr);
+
         ret = rdma_connect(cma_id, &conn_param);
         if (ret) {
                 iser_err("failure connecting: %d\n", ret);
@@ -558,8 +566,8 @@ static int iser_cma_handler(struct rdma_cm_id *cma_id, struct rdma_cm_event *eve
 {
         int ret = 0;
 
-        iser_err("event %d status %d conn %p id %p\n",
-                event->event, event->status, cma_id->context, cma_id);
+        iser_info("event %d status %d conn %p id %p\n",
+                  event->event, event->status, cma_id->context, cma_id);
 
         switch (event->event) {
         case RDMA_CM_EVENT_ADDR_RESOLVED:
@@ -619,8 +627,8 @@ int iser_connect(struct iser_conn   *ib_conn,
         /* the device is known only --after-- address resolution */
         ib_conn->device = NULL;
 
-        iser_err("connecting to: %pI4, port 0x%x\n",
-                 &dst_addr->sin_addr, dst_addr->sin_port);
+        iser_info("connecting to: %pI4, port 0x%x\n",
+                  &dst_addr->sin_addr, dst_addr->sin_port);
 
         ib_conn->state = ISER_CONN_PENDING;
 
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index c09d41b1a2ff..b08ca7a9f76b 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -1374,7 +1374,7 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx)
                 target_put_sess_cmd(ioctx->ch->sess, &ioctx->cmd);
                 break;
         default:
-                WARN_ON("ERROR: unexpected command state");
+                WARN(1, "Unexpected command state (%d)", state);
                 break;
         }