6 files changed, 82 insertions, 97 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 4115be54ba3b..5c1bc995e560 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -296,7 +296,8 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
         dev->stats.rx_bytes += skb->len;
 
         skb->dev = dev;
-        if ((dev->features & NETIF_F_RXCSUM) && likely(wc->csum_ok))
+        if ((dev->features & NETIF_F_RXCSUM) &&
+                        likely(wc->wc_flags & IB_WC_IP_CSUM_OK))
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
 
         napi_gro_receive(&priv->napi, skb);
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 9a43cb07f294..db43b3117168 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -364,6 +364,9 @@ iscsi_iser_conn_bind(struct iscsi_cls_session *cls_session,
         }
         ib_conn = ep->dd_data;
 
+        if (iser_alloc_rx_descriptors(ib_conn))
+                return -ENOMEM;
+
         /* binds the iSER connection retrieved from the previously
          * connected ep_handle to the iSCSI layer connection. exchanges
          * connection pointers */
@@ -398,19 +401,6 @@ iscsi_iser_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
         iser_conn->ib_conn = NULL;
 }
 
-static int
-iscsi_iser_conn_start(struct iscsi_cls_conn *cls_conn)
-{
-        struct iscsi_conn *conn = cls_conn->dd_data;
-        int err;
-
-        err = iser_conn_set_full_featured_mode(conn);
-        if (err)
-                return err;
-
-        return iscsi_conn_start(cls_conn);
-}
-
 static void iscsi_iser_session_destroy(struct iscsi_cls_session *cls_session)
 {
         struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);
@@ -724,7 +714,7 @@ static struct iscsi_transport iscsi_iser_transport = {
         .get_conn_param         = iscsi_conn_get_param,
         .get_ep_param           = iscsi_iser_get_ep_param,
         .get_session_param      = iscsi_session_get_param,
-        .start_conn             = iscsi_iser_conn_start,
+        .start_conn             = iscsi_conn_start,
         .stop_conn              = iscsi_iser_conn_stop,
         /* iscsi host params */
         .get_host_param         = iscsi_host_get_param,
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index db7ea3704da7..296be431a0e9 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -366,4 +366,5 @@ int iser_dma_map_task_data(struct iscsi_iser_task *iser_task,
 void iser_dma_unmap_task_data(struct iscsi_iser_task *iser_task);
 int  iser_initialize_task_headers(struct iscsi_task *task,
                         struct iser_tx_desc *tx_desc);
+int iser_alloc_rx_descriptors(struct iser_conn *ib_conn);
 #endif
diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c
index a607542fc796..a00ccd1ca333 100644
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -170,7 +170,7 @@ static void iser_create_send_desc(struct iser_conn	*ib_conn,
 }
 
 
-static int iser_alloc_rx_descriptors(struct iser_conn *ib_conn)
+int iser_alloc_rx_descriptors(struct iser_conn *ib_conn)
 {
         int i, j;
         u64 dma_addr;
@@ -220,18 +220,6 @@ void iser_free_rx_descriptors(struct iser_conn *ib_conn)
         struct iser_rx_desc *rx_desc;
         struct iser_device *device = ib_conn->device;
 
-        if (ib_conn->login_buf) {
-                if (ib_conn->login_req_dma)
-                        ib_dma_unmap_single(device->ib_device,
-                                ib_conn->login_req_dma,
-                                ISCSI_DEF_MAX_RECV_SEG_LEN, DMA_TO_DEVICE);
-                if (ib_conn->login_resp_dma)
-                        ib_dma_unmap_single(device->ib_device,
-                                ib_conn->login_resp_dma,
-                                ISER_RX_LOGIN_SIZE, DMA_FROM_DEVICE);
-                kfree(ib_conn->login_buf);
-        }
-
         if (!ib_conn->rx_descs)
                 return;
 
@@ -242,23 +230,24 @@ void iser_free_rx_descriptors(struct iser_conn *ib_conn)
         kfree(ib_conn->rx_descs);
 }
 
-/**
- *  iser_conn_set_full_featured_mode - (iSER API)
- */
-int iser_conn_set_full_featured_mode(struct iscsi_conn *conn)
+static int iser_post_rx_bufs(struct iscsi_conn *conn, struct iscsi_hdr *req)
 {
         struct iscsi_iser_conn *iser_conn = conn->dd_data;
 
-        iser_dbg("Initially post: %d\n", ISER_MIN_POSTED_RX);
-
-        /* Check that there is no posted recv or send buffers left - */
-        /* they must be consumed during the login phase */
-        BUG_ON(iser_conn->ib_conn->post_recv_buf_count != 0);
-        BUG_ON(atomic_read(&iser_conn->ib_conn->post_send_buf_count) != 0);
+        iser_dbg("req op %x flags %x\n", req->opcode, req->flags);
+        /* check if this is the last login - going to full feature phase */
+        if ((req->flags & ISCSI_FULL_FEATURE_PHASE) != ISCSI_FULL_FEATURE_PHASE)
+                return 0;
 
-        if (iser_alloc_rx_descriptors(iser_conn->ib_conn))
-                return -ENOMEM;
+        /*
+         * Check that there is one posted recv buffer (for the last login
+         * response) and no posted send buffers left - they must have been
+         * consumed during previous login phases.
+         */
+        WARN_ON(iser_conn->ib_conn->post_recv_buf_count != 1);
+        WARN_ON(atomic_read(&iser_conn->ib_conn->post_send_buf_count) != 0);
 
+        iser_dbg("Initially post: %d\n", ISER_MIN_POSTED_RX);
         /* Initial post receive buffers */
         if (iser_post_recvm(iser_conn->ib_conn, ISER_MIN_POSTED_RX))
                 return -ENOMEM;
@@ -438,6 +427,9 @@ int iser_send_control(struct iscsi_conn *conn,
                 err = iser_post_recvl(iser_conn->ib_conn);
                 if (err)
                         goto send_control_error;
+                err = iser_post_rx_bufs(conn, task->hdr);
+                if (err)
+                        goto send_control_error;
         }
 
         err = iser_post_send(iser_conn->ib_conn, mdesc);
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index e28877c4ce15..14224ba44fd8 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -274,6 +274,18 @@ static int iser_free_ib_conn_res(struct iser_conn *ib_conn, int can_destroy_id)
         ib_conn->cma_id   = NULL;
         kfree(ib_conn->page_vec);
 
+        if (ib_conn->login_buf) {
+                if (ib_conn->login_req_dma)
+                        ib_dma_unmap_single(ib_conn->device->ib_device,
+                                ib_conn->login_req_dma,
+                                ISCSI_DEF_MAX_RECV_SEG_LEN, DMA_TO_DEVICE);
+                if (ib_conn->login_resp_dma)
+                        ib_dma_unmap_single(ib_conn->device->ib_device,
+                                ib_conn->login_resp_dma,
+                                ISER_RX_LOGIN_SIZE, DMA_FROM_DEVICE);
+                kfree(ib_conn->login_buf);
+        }
+
         return 0;
 }
 
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 0bfa545675b8..bcbf22ee0aa7 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -30,6 +30,8 @@
  * SOFTWARE.
  */
 
+#define pr_fmt(fmt) PFX fmt
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -165,7 +167,7 @@ static void srp_free_iu(struct srp_host *host, struct srp_iu *iu)
 
 static void srp_qp_event(struct ib_event *event, void *context)
 {
-        printk(KERN_ERR PFX "QP event %d\n", event->event);
+        pr_debug("QP event %d\n", event->event);
 }
 
 static int srp_init_qp(struct srp_target_port *target,
@@ -472,6 +474,21 @@ static void srp_free_req_data(struct srp_target_port *target)
         }
 }
 
+/**
+ * srp_del_scsi_host_attr() - Remove attributes defined in the host template.
+ * @shost: SCSI host whose attributes to remove from sysfs.
+ *
+ * Note: Any attributes defined in the host template and that did not exist
+ * before invocation of this function will be ignored.
+ */
+static void srp_del_scsi_host_attr(struct Scsi_Host *shost)
+{
+        struct device_attribute **attr;
+
+        for (attr = shost->hostt->shost_attrs; attr && *attr; ++attr)
+                device_remove_file(&shost->shost_dev, *attr);
+}
+
 static void srp_remove_work(struct work_struct *work)
 {
         struct srp_target_port *target =
@@ -484,6 +501,7 @@ static void srp_remove_work(struct work_struct *work)
         list_del(&target->list);
         spin_unlock(&target->srp_host->target_lock);
 
+        srp_del_scsi_host_attr(target->scsi_host);
         srp_remove_host(target->scsi_host);
         scsi_remove_host(target->scsi_host);
         ib_destroy_cm_id(target->cm_id);
@@ -1676,10 +1694,6 @@ static ssize_t show_id_ext(struct device *dev, struct device_attribute *attr,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "0x%016llx\n",
                        (unsigned long long) be64_to_cpu(target->id_ext));
 }
@@ -1689,10 +1703,6 @@ static ssize_t show_ioc_guid(struct device *dev, struct device_attribute *attr,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "0x%016llx\n",
                        (unsigned long long) be64_to_cpu(target->ioc_guid));
 }
@@ -1702,10 +1712,6 @@ static ssize_t show_service_id(struct device *dev,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "0x%016llx\n",
                        (unsigned long long) be64_to_cpu(target->service_id));
 }
@@ -1715,10 +1721,6 @@ static ssize_t show_pkey(struct device *dev, struct device_attribute *attr,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "0x%04x\n", be16_to_cpu(target->path.pkey));
 }
 
@@ -1727,10 +1729,6 @@ static ssize_t show_dgid(struct device *dev, struct device_attribute *attr,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "%pI6\n", target->path.dgid.raw);
 }
 
@@ -1739,10 +1737,6 @@ static ssize_t show_orig_dgid(struct device *dev,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "%pI6\n", target->orig_dgid);
 }
 
@@ -1751,10 +1745,6 @@ static ssize_t show_req_lim(struct device *dev,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "%d\n", target->req_lim);
 }
 
@@ -1763,10 +1753,6 @@ static ssize_t show_zero_req_lim(struct device *dev,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "%d\n", target->zero_req_lim);
 }
 
@@ -1989,7 +1975,7 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
                                 goto out;
                         }
                         if (strlen(p) != 32) {
-                                printk(KERN_WARNING PFX "bad dest GID parameter '%s'\n", p);
+                                pr_warn("bad dest GID parameter '%s'\n", p);
                                 kfree(p);
                                 goto out;
                         }
@@ -2004,7 +1990,7 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
 
                 case SRP_OPT_PKEY:
                         if (match_hex(args, &token)) {
-                                printk(KERN_WARNING PFX "bad P_Key parameter '%s'\n", p);
+                                pr_warn("bad P_Key parameter '%s'\n", p);
                                 goto out;
                         }
                         target->path.pkey = cpu_to_be16(token);
@@ -2023,7 +2009,7 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
 
                 case SRP_OPT_MAX_SECT:
                         if (match_int(args, &token)) {
-                                printk(KERN_WARNING PFX "bad max sect parameter '%s'\n", p);
+                                pr_warn("bad max sect parameter '%s'\n", p);
                                 goto out;
                         }
                         target->scsi_host->max_sectors = token;
@@ -2031,7 +2017,8 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
 
                 case SRP_OPT_MAX_CMD_PER_LUN:
                         if (match_int(args, &token)) {
-                                printk(KERN_WARNING PFX "bad max cmd_per_lun parameter '%s'\n", p);
+                                pr_warn("bad max cmd_per_lun parameter '%s'\n",
+                                        p);
                                 goto out;
                         }
                         target->scsi_host->cmd_per_lun = min(token, SRP_CMD_SQ_SIZE);
@@ -2039,14 +2026,14 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
 
                 case SRP_OPT_IO_CLASS:
                         if (match_hex(args, &token)) {
-                                printk(KERN_WARNING PFX "bad  IO class parameter '%s' \n", p);
+                                pr_warn("bad IO class parameter '%s'\n", p);
                                 goto out;
                         }
                         if (token != SRP_REV10_IB_IO_CLASS &&
                             token != SRP_REV16A_IB_IO_CLASS) {
-                                printk(KERN_WARNING PFX "unknown IO class parameter value"
-                                       " %x specified (use %x or %x).\n",
-                                       token, SRP_REV10_IB_IO_CLASS, SRP_REV16A_IB_IO_CLASS);
+                                pr_warn("unknown IO class parameter value %x specified (use %x or %x).\n",
+                                        token, SRP_REV10_IB_IO_CLASS,
+                                        SRP_REV16A_IB_IO_CLASS);
                                 goto out;
                         }
                         target->io_class = token;
@@ -2064,7 +2051,8 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
 
                 case SRP_OPT_CMD_SG_ENTRIES:
                         if (match_int(args, &token) || token < 1 || token > 255) {
-                                printk(KERN_WARNING PFX "bad max cmd_sg_entries parameter '%s'\n", p);
+                                pr_warn("bad max cmd_sg_entries parameter '%s'\n",
+                                        p);
                                 goto out;
                         }
                         target->cmd_sg_cnt = token;
@@ -2072,7 +2060,7 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
 
                 case SRP_OPT_ALLOW_EXT_SG:
                         if (match_int(args, &token)) {
-                                printk(KERN_WARNING PFX "bad allow_ext_sg parameter '%s'\n", p);
+                                pr_warn("bad allow_ext_sg parameter '%s'\n", p);
                                 goto out;
                         }
                         target->allow_ext_sg = !!token;
@@ -2081,15 +2069,16 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
                 case SRP_OPT_SG_TABLESIZE:
                         if (match_int(args, &token) || token < 1 ||
                                         token > SCSI_MAX_SG_CHAIN_SEGMENTS) {
-                                printk(KERN_WARNING PFX "bad max sg_tablesize parameter '%s'\n", p);
+                                pr_warn("bad max sg_tablesize parameter '%s'\n",
+                                        p);
                                 goto out;
                         }
                         target->sg_tablesize = token;
                         break;
 
                 default:
-                        printk(KERN_WARNING PFX "unknown parameter or missing value "
-                               "'%s' in target creation request\n", p);
+                        pr_warn("unknown parameter or missing value '%s' in target creation request\n",
+                                p);
                         goto out;
                 }
         }
@@ -2100,9 +2089,8 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
                 for (i = 0; i < ARRAY_SIZE(srp_opt_tokens); ++i)
                         if ((srp_opt_tokens[i].token & SRP_OPT_ALL) &&
                             !(srp_opt_tokens[i].token & opt_mask))
-                                printk(KERN_WARNING PFX "target creation request is "
-                                       "missing parameter '%s'\n",
-                                       srp_opt_tokens[i].pattern);
+                                pr_warn("target creation request is missing parameter '%s'\n",
+                                        srp_opt_tokens[i].pattern);
 
 out:
         kfree(options);
@@ -2149,7 +2137,7 @@ static ssize_t srp_create_target(struct device *dev,
 
         if (!host->srp_dev->fmr_pool && !target->allow_ext_sg &&
                                 target->cmd_sg_cnt < target->sg_tablesize) {
-                printk(KERN_WARNING PFX "No FMR pool and no external indirect descriptors, limiting sg_tablesize to cmd_sg_cnt\n");
+                pr_warn("No FMR pool and no external indirect descriptors, limiting sg_tablesize to cmd_sg_cnt\n");
                 target->sg_tablesize = target->cmd_sg_cnt;
         }
 
@@ -2309,8 +2297,7 @@ static void srp_add_one(struct ib_device *device)
                 return;
 
         if (ib_query_device(device, dev_attr)) {
-                printk(KERN_WARNING PFX "Query device failed for %s\n",
-                       device->name);
+                pr_warn("Query device failed for %s\n", device->name);
                 goto free_attr;
         }
 
@@ -2429,6 +2416,7 @@ static void srp_remove_one(struct ib_device *device)
 
                 list_for_each_entry_safe(target, tmp_target,
                                          &host->target_list, list) {
+                        srp_del_scsi_host_attr(target->scsi_host);
                         srp_remove_host(target->scsi_host);
                         scsi_remove_host(target->scsi_host);
                         srp_disconnect_target(target);
@@ -2459,7 +2447,7 @@ static int __init srp_init_module(void)
         BUILD_BUG_ON(FIELD_SIZEOF(struct ib_wc, wr_id) < sizeof(void *));
 
         if (srp_sg_tablesize) {
-                printk(KERN_WARNING PFX "srp_sg_tablesize is deprecated, please use cmd_sg_entries\n");
+                pr_warn("srp_sg_tablesize is deprecated, please use cmd_sg_entries\n");
                 if (!cmd_sg_entries)
                         cmd_sg_entries = srp_sg_tablesize;
         }
@@ -2468,14 +2456,15 @@ static int __init srp_init_module(void)
                 cmd_sg_entries = SRP_DEF_SG_TABLESIZE;
 
         if (cmd_sg_entries > 255) {
-                printk(KERN_WARNING PFX "Clamping cmd_sg_entries to 255\n");
+                pr_warn("Clamping cmd_sg_entries to 255\n");
                 cmd_sg_entries = 255;
         }
 
         if (!indirect_sg_entries)
                 indirect_sg_entries = cmd_sg_entries;
         else if (indirect_sg_entries < cmd_sg_entries) {
-                printk(KERN_WARNING PFX "Bumping up indirect_sg_entries to match cmd_sg_entries (%u)\n", cmd_sg_entries);
+                pr_warn("Bumping up indirect_sg_entries to match cmd_sg_entries (%u)\n",
+                        cmd_sg_entries);
                 indirect_sg_entries = cmd_sg_entries;
         }
 
@@ -2486,7 +2475,7 @@ static int __init srp_init_module(void)
 
         ret = class_register(&srp_class);
         if (ret) {
-                printk(KERN_ERR PFX "couldn't register class infiniband_srp\n");
+                pr_err("couldn't register class infiniband_srp\n");
                 srp_release_transport(ib_srp_transport_template);
                 return ret;
         }
@@ -2495,7 +2484,7 @@ static int __init srp_init_module(void)
 
         ret = ib_register_client(&srp_client);
         if (ret) {
-                printk(KERN_ERR PFX "couldn't register IB client\n");
+                pr_err("couldn't register IB client\n");
                 srp_release_transport(ib_srp_transport_template);
                 ib_sa_unregister_client(&srp_sa_client);
                 class_unregister(&srp_class);