iscsi/isert-target: Refactor ISCSI_OP_NOOP RX handling

This patch refactors ISCSI_OP_NOOP handling within iscsi-target in
order to handle iscsi_nopout payloads in a transport specific manner.

This includes splitting existing iscsit_handle_nop_out() into
iscsit_setup_nop_out() and iscsit_process_nop_out() calls, and
makes iscsit_handle_nop_out() be only used internally by traditional
iscsi socket calls.

Next update iser-target code to use new callers and add FIXME for
the handling iscsi_nopout payloads.  Also fix reject response handling
in iscsit_setup_nop_out() to use proper iscsit_add_reject_from_cmd().

v2: Fix uninitialized iscsit_handle_nop_out() payload_length usage (Fengguang)
v3: Remove left-over dead code in iscsit_setup_nop_out() (DanC)

Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

1 files changed, 22 insertions, 1 deletions

diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 41712f096515..c48c9481025c 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -1001,6 +1001,25 @@ isert_handle_iscsi_dataout(struct isert_conn *isert_conn,
 }
 
 static int
+isert_handle_nop_out(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,
+                     struct iser_rx_desc *rx_desc, unsigned char *buf)
+{
+        struct iscsi_cmd *cmd = &isert_cmd->iscsi_cmd;
+        struct iscsi_conn *conn = isert_conn->conn;
+        struct iscsi_nopout *hdr = (struct iscsi_nopout *)buf;
+        int rc;
+
+        rc = iscsit_setup_nop_out(conn, cmd, hdr);
+        if (rc < 0)
+                return rc;
+        /*
+         * FIXME: Add support for NOPOUT payload using unsolicited RDMA payload
+         */
+
+        return iscsit_process_nop_out(conn, cmd, hdr);
+}
+
+static int
 isert_rx_opcode(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc,
                 uint32_t read_stag, uint64_t read_va,
                 uint32_t write_stag, uint64_t write_va)
@@ -1032,7 +1051,9 @@ isert_rx_opcode(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc,
                 if (!cmd)
                         break;
 
-                ret = iscsit_handle_nop_out(conn, cmd, (unsigned char *)hdr);
+                isert_cmd = container_of(cmd, struct isert_cmd, iscsi_cmd);
+                ret = isert_handle_nop_out(isert_conn, isert_cmd,
+                                           rx_desc, (unsigned char *)hdr);
                 break;
         case ISCSI_OP_SCSI_DATA_OUT:
                 ret = isert_handle_iscsi_dataout(isert_conn, rx_desc,