6 files changed, 80 insertions, 54 deletions

diff --git a/drivers/infiniband/ulp/iser/Kconfig b/drivers/infiniband/ulp/iser/Kconfig
index 365a1b5f19e0..aecbb9083f0c 100644
--- a/drivers/infiniband/ulp/iser/Kconfig
+++ b/drivers/infiniband/ulp/iser/Kconfig
@@ -1,11 +1,12 @@
 config INFINIBAND_ISER
-        tristate "ISCSI RDMA Protocol"
+        tristate "iSCSI Extensions for RDMA (iSER)"
         depends on INFINIBAND && SCSI && INET
         select SCSI_ISCSI_ATTRS
         ---help---
-          Support for the ISCSI RDMA Protocol over InfiniBand.  This
-          allows you to access storage devices that speak ISER/ISCSI
-          over InfiniBand.
+          Support for the iSCSI Extensions for RDMA (iSER) Protocol
+          over InfiniBand. This allows you to access storage devices
+          that speak iSCSI over iSER over InfiniBand.
 
-          The ISER protocol is defined by IETF.
-          See <http://www.ietf.org/>.
+          The iSER protocol is defined by IETF.
+          See <http://www.ietf.org/internet-drafts/draft-ietf-ips-iser-05.txt>
+          and <http://www.infinibandta.org/members/spec/iser_annex_060418.pdf>
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 2a14fe2e3226..eb6f98d82289 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -317,6 +317,8 @@ iscsi_iser_conn_destroy(struct iscsi_cls_conn *cls_conn)
         struct iscsi_iser_conn *iser_conn = conn->dd_data;
 
         iscsi_conn_teardown(cls_conn);
+        if (iser_conn->ib_conn)
+                iser_conn->ib_conn->iser_conn = NULL;
         kfree(iser_conn);
 }
 
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index 2cf9ae0def1c..9c53916f28c2 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -192,7 +192,7 @@ struct iser_regd_buf {
 
 struct iser_dto {
         struct iscsi_iser_cmd_task *ctask;
-        struct iscsi_iser_conn     *conn;
+        struct iser_conn *ib_conn;
         int                        notify_enable;
 
         /* vector of registered buffers */
@@ -355,4 +355,11 @@ int  iser_post_send(struct iser_desc *tx_desc);
 
 int iser_conn_state_comp(struct iser_conn *ib_conn,
                          enum iser_ib_conn_state comp);
+
+int iser_dma_map_task_data(struct iscsi_iser_cmd_task *iser_ctask,
+                            struct iser_data_buf       *data,
+                            enum   iser_data_dir       iser_dir,
+                            enum   dma_data_direction  dma_dir);
+
+void iser_dma_unmap_task_data(struct iscsi_iser_cmd_task *iser_ctask);
 #endif
diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c
index ccf56f6f7236..9b3d79c796c8 100644
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -66,42 +66,6 @@ static void iser_dto_add_regd_buff(struct iser_dto *dto,
         dto->regd_vector_len++;
 }
 
-static int iser_dma_map_task_data(struct iscsi_iser_cmd_task *iser_ctask,
-                                  struct iser_data_buf       *data,
-                                  enum   iser_data_dir       iser_dir,
-                                  enum   dma_data_direction  dma_dir)
-{
-        struct device *dma_device;
-
-        iser_ctask->dir[iser_dir] = 1;
-        dma_device = iser_ctask->iser_conn->ib_conn->device->ib_device->dma_device;
-
-        data->dma_nents = dma_map_sg(dma_device, data->buf, data->size, dma_dir);
-        if (data->dma_nents == 0) {
-                iser_err("dma_map_sg failed!!!\n");
-                return -EINVAL;
-        }
-        return 0;
-}
-
-static void iser_dma_unmap_task_data(struct iscsi_iser_cmd_task *iser_ctask)
-{
-        struct device  *dma_device;
-        struct iser_data_buf *data;
-
-        dma_device = iser_ctask->iser_conn->ib_conn->device->ib_device->dma_device;
-
-        if (iser_ctask->dir[ISER_DIR_IN]) {
-                data = &iser_ctask->data[ISER_DIR_IN];
-                dma_unmap_sg(dma_device, data->buf, data->size, DMA_FROM_DEVICE);
-        }
-
-        if (iser_ctask->dir[ISER_DIR_OUT]) {
-                data = &iser_ctask->data[ISER_DIR_OUT];
-                dma_unmap_sg(dma_device, data->buf, data->size, DMA_TO_DEVICE);
-        }
-}
-
 /* Register user buffer memory and initialize passive rdma
  *  dto descriptor. Total data size is stored in
  *  iser_ctask->data[ISER_DIR_IN].data_len
@@ -249,7 +213,7 @@ static int iser_post_receive_control(struct iscsi_conn *conn)
         }
 
         recv_dto = &rx_desc->dto;
-        recv_dto->conn          = iser_conn;
+        recv_dto->ib_conn = iser_conn->ib_conn;
         recv_dto->regd_vector_len = 0;
 
         regd_hdr = &rx_desc->hdr_regd_buf;
@@ -296,7 +260,7 @@ static void iser_create_send_desc(struct iscsi_iser_conn *iser_conn,
         regd_hdr->virt_addr  = tx_desc; /* == &tx_desc->iser_header */
         regd_hdr->data_size  = ISER_TOTAL_HEADERS_LEN;
 
-        send_dto->conn          = iser_conn;
+        send_dto->ib_conn         = iser_conn->ib_conn;
         send_dto->notify_enable   = 1;
         send_dto->regd_vector_len = 0;
 
@@ -588,7 +552,7 @@ void iser_rcv_completion(struct iser_desc *rx_desc,
                          unsigned long dto_xfer_len)
 {
         struct iser_dto        *dto = &rx_desc->dto;
-        struct iscsi_iser_conn *conn = dto->conn;
+        struct iscsi_iser_conn *conn = dto->ib_conn->iser_conn;
         struct iscsi_session *session = conn->iscsi_conn->session;
         struct iscsi_cmd_task *ctask;
         struct iscsi_iser_cmd_task *iser_ctask;
@@ -641,7 +605,8 @@ void iser_rcv_completion(struct iser_desc *rx_desc,
 void iser_snd_completion(struct iser_desc *tx_desc)
 {
         struct iser_dto        *dto = &tx_desc->dto;
-        struct iscsi_iser_conn *iser_conn = dto->conn;
+        struct iser_conn       *ib_conn = dto->ib_conn;
+        struct iscsi_iser_conn *iser_conn = ib_conn->iser_conn;
         struct iscsi_conn      *conn = iser_conn->iscsi_conn;
         struct iscsi_mgmt_task *mtask;
 
@@ -652,7 +617,7 @@ void iser_snd_completion(struct iser_desc *tx_desc)
         if (tx_desc->type == ISCSI_TX_DATAOUT)
                 kmem_cache_free(ig.desc_cache, tx_desc);
 
-        atomic_dec(&iser_conn->ib_conn->post_send_buf_count);
+        atomic_dec(&ib_conn->post_send_buf_count);
 
         write_lock(conn->recv_lock);
         if (conn->suspend_tx) {
@@ -698,14 +663,19 @@ void iser_ctask_rdma_init(struct iscsi_iser_cmd_task *iser_ctask)
 void iser_ctask_rdma_finalize(struct iscsi_iser_cmd_task *iser_ctask)
 {
         int deferred;
+        int is_rdma_aligned = 1;
 
         /* if we were reading, copy back to unaligned sglist,
          * anyway dma_unmap and free the copy
          */
-        if (iser_ctask->data_copy[ISER_DIR_IN].copy_buf != NULL)
+        if (iser_ctask->data_copy[ISER_DIR_IN].copy_buf != NULL) {
+                is_rdma_aligned = 0;
                 iser_finalize_rdma_unaligned_sg(iser_ctask, ISER_DIR_IN);
-        if (iser_ctask->data_copy[ISER_DIR_OUT].copy_buf != NULL)
+        }
+        if (iser_ctask->data_copy[ISER_DIR_OUT].copy_buf != NULL) {
+                is_rdma_aligned = 0;
                 iser_finalize_rdma_unaligned_sg(iser_ctask, ISER_DIR_OUT);
+        }
 
         if (iser_ctask->dir[ISER_DIR_IN]) {
                 deferred = iser_regd_buff_release
@@ -725,7 +695,9 @@ void iser_ctask_rdma_finalize(struct iscsi_iser_cmd_task *iser_ctask)
                 }
         }
 
-        iser_dma_unmap_task_data(iser_ctask);
+       /* if the data was unaligned, it was already unmapped and then copied */
+       if (is_rdma_aligned)
+                iser_dma_unmap_task_data(iser_ctask);
 }
 
 void iser_dto_buffs_release(struct iser_dto *dto)
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index d0b03f426581..0606744c3f84 100644
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -369,6 +369,44 @@ static void iser_page_vec_build(struct iser_data_buf *data,
         }
 }
 
+int iser_dma_map_task_data(struct iscsi_iser_cmd_task *iser_ctask,
+                            struct iser_data_buf       *data,
+                            enum   iser_data_dir       iser_dir,
+                            enum   dma_data_direction  dma_dir)
+{
+        struct device *dma_device;
+
+        iser_ctask->dir[iser_dir] = 1;
+        dma_device =
+                iser_ctask->iser_conn->ib_conn->device->ib_device->dma_device;
+
+        data->dma_nents = dma_map_sg(dma_device, data->buf, data->size, dma_dir);
+        if (data->dma_nents == 0) {
+                iser_err("dma_map_sg failed!!!\n");
+                return -EINVAL;
+        }
+        return 0;
+}
+
+void iser_dma_unmap_task_data(struct iscsi_iser_cmd_task *iser_ctask)
+{
+        struct device  *dma_device;
+        struct iser_data_buf *data;
+
+        dma_device =
+                iser_ctask->iser_conn->ib_conn->device->ib_device->dma_device;
+
+        if (iser_ctask->dir[ISER_DIR_IN]) {
+                data = &iser_ctask->data[ISER_DIR_IN];
+                dma_unmap_sg(dma_device, data->buf, data->size, DMA_FROM_DEVICE);
+        }
+
+        if (iser_ctask->dir[ISER_DIR_OUT]) {
+                data = &iser_ctask->data[ISER_DIR_OUT];
+                dma_unmap_sg(dma_device, data->buf, data->size, DMA_TO_DEVICE);
+        }
+}
+
 /**
  * iser_reg_rdma_mem - Registers memory intended for RDMA,
  * obtaining rkey and va
@@ -394,6 +432,10 @@ int iser_reg_rdma_mem(struct iscsi_iser_cmd_task *iser_ctask,
                 iser_err("rdma alignment violation %d/%d aligned\n",
                          aligned_len, mem->size);
                 iser_data_buf_dump(mem);
+
+                /* unmap the command data before accessing it */
+                iser_dma_unmap_task_data(iser_ctask);
+
                 /* allocate copy buf, if we are writing, copy the */
                 /* unaligned scatterlist, dma map the copy        */
                 if (iser_start_rdma_unaligned_sg(iser_ctask, cmd_dir) != 0)
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index ecdca7fc1e4c..18a000034996 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -571,6 +571,8 @@ void iser_conn_release(struct iser_conn *ib_conn)
         /* on EVENT_ADDR_ERROR there's no device yet for this conn */
         if (device != NULL)
                 iser_device_try_release(device);
+        if (ib_conn->iser_conn)
+                ib_conn->iser_conn->ib_conn = NULL;
         kfree(ib_conn);
 }
 
@@ -694,7 +696,7 @@ int iser_post_recv(struct iser_desc *rx_desc)
         struct iser_dto   *recv_dto = &rx_desc->dto;
 
         /* Retrieve conn */
-        ib_conn = recv_dto->conn->ib_conn;
+        ib_conn = recv_dto->ib_conn;
 
         iser_dto_to_iov(recv_dto, iov, 2);
 
@@ -727,7 +729,7 @@ int iser_post_send(struct iser_desc *tx_desc)
         struct iser_conn  *ib_conn;
         struct iser_dto   *dto = &tx_desc->dto;
 
-        ib_conn = dto->conn->ib_conn;
+        ib_conn = dto->ib_conn;
 
         iser_dto_to_iov(dto, iov, MAX_REGD_BUF_VECTOR_LEN);
 
@@ -774,7 +776,7 @@ static void iser_comp_error_worker(void *data)
 static void iser_handle_comp_error(struct iser_desc *desc)
 {
         struct iser_dto  *dto     = &desc->dto;
-        struct iser_conn *ib_conn = dto->conn->ib_conn;
+        struct iser_conn *ib_conn = dto->ib_conn;
 
         iser_dto_buffs_release(dto);