30 files changed, 728 insertions, 364 deletions

diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c
index 2e2d903db838..8d44a4060634 100644
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -41,11 +41,11 @@
 #include "iscsi_iser.h"
 
 /* Register user buffer memory and initialize passive rdma
- *  dto descriptor. Total data size is stored in
- *  iser_task->data[ISER_DIR_IN].data_len
+ *  dto descriptor. Data size is stored in
+ *  task->data[ISER_DIR_IN].data_len, Protection size
+ *  os stored in task->prot[ISER_DIR_IN].data_len
  */
-static int iser_prepare_read_cmd(struct iscsi_task *task,
-                                 unsigned int edtl)
+static int iser_prepare_read_cmd(struct iscsi_task *task)
 
 {
         struct iscsi_iser_task *iser_task = task->dd_data;
@@ -73,14 +73,6 @@ static int iser_prepare_read_cmd(struct iscsi_task *task,
                         return err;
         }
 
-        if (edtl > iser_task->data[ISER_DIR_IN].data_len) {
-                iser_err("Total data length: %ld, less than EDTL: "
-                         "%d, in READ cmd BHS itt: %d, conn: 0x%p\n",
-                         iser_task->data[ISER_DIR_IN].data_len, edtl,
-                         task->itt, iser_task->ib_conn);
-                return -EINVAL;
-        }
-
         err = device->iser_reg_rdma_mem(iser_task, ISER_DIR_IN);
         if (err) {
                 iser_err("Failed to set up Data-IN RDMA\n");
@@ -100,8 +92,9 @@ static int iser_prepare_read_cmd(struct iscsi_task *task,
 }
 
 /* Register user buffer memory and initialize passive rdma
- *  dto descriptor. Total data size is stored in
- *  task->data[ISER_DIR_OUT].data_len
+ *  dto descriptor. Data size is stored in
+ *  task->data[ISER_DIR_OUT].data_len, Protection size
+ *  is stored at task->prot[ISER_DIR_OUT].data_len
  */
 static int
 iser_prepare_write_cmd(struct iscsi_task *task,
@@ -135,14 +128,6 @@ iser_prepare_write_cmd(struct iscsi_task *task,
                         return err;
         }
 
-        if (edtl > iser_task->data[ISER_DIR_OUT].data_len) {
-                iser_err("Total data length: %ld, less than EDTL: %d, "
-                         "in WRITE cmd BHS itt: %d, conn: 0x%p\n",
-                         iser_task->data[ISER_DIR_OUT].data_len,
-                         edtl, task->itt, task->conn);
-                return -EINVAL;
-        }
-
         err = device->iser_reg_rdma_mem(iser_task, ISER_DIR_OUT);
         if (err != 0) {
                 iser_err("Failed to register write cmd RDMA mem\n");
@@ -417,11 +402,12 @@ int iser_send_command(struct iscsi_conn *conn,
         if (scsi_prot_sg_count(sc)) {
                 prot_buf->buf  = scsi_prot_sglist(sc);
                 prot_buf->size = scsi_prot_sg_count(sc);
-                prot_buf->data_len = sc->prot_sdb->length;
+                prot_buf->data_len = data_buf->data_len >>
+                                     ilog2(sc->device->sector_size) * 8;
         }
 
         if (hdr->flags & ISCSI_FLAG_CMD_READ) {
-                err = iser_prepare_read_cmd(task, edtl);
+                err = iser_prepare_read_cmd(task);
                 if (err)
                         goto send_command_error;
         }
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index b9d647468b99..d4c7928a0f36 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -663,8 +663,9 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
 
         pi_support = np->tpg_np->tpg->tpg_attrib.t10_pi;
         if (pi_support && !device->pi_capable) {
-                pr_err("Protection information requested but not supported\n");
-                ret = -EINVAL;
+                pr_err("Protection information requested but not supported, "
+                       "rejecting connect request\n");
+                ret = rdma_reject(cma_id, NULL, 0);
                 goto out_mr;
         }
 
@@ -787,14 +788,12 @@ isert_disconnect_work(struct work_struct *work)
                 isert_put_conn(isert_conn);
                 return;
         }
-        if (!isert_conn->logout_posted) {
-                pr_debug("Calling rdma_disconnect for !logout_posted from"
-                         " isert_disconnect_work\n");
+
+        if (isert_conn->disconnect) {
+                /* Send DREQ/DREP towards our initiator */
                 rdma_disconnect(isert_conn->conn_cm_id);
-                mutex_unlock(&isert_conn->conn_mutex);
-                iscsit_cause_connection_reinstatement(isert_conn->conn, 0);
-                goto wake_up;
         }
+
         mutex_unlock(&isert_conn->conn_mutex);
 
 wake_up:
@@ -803,10 +802,11 @@ wake_up:
 }
 
 static void
-isert_disconnected_handler(struct rdma_cm_id *cma_id)
+isert_disconnected_handler(struct rdma_cm_id *cma_id, bool disconnect)
 {
         struct isert_conn *isert_conn = (struct isert_conn *)cma_id->context;
 
+        isert_conn->disconnect = disconnect;
         INIT_WORK(&isert_conn->conn_logout_work, isert_disconnect_work);