From d200d7b86250e3c96e10847547a19ebc42f0f4e0 Mon Sep 17 00:00:00 2001
From: wanghonghao <wanghonghao@bytedance.com>
Date: Wed, 4 Dec 2019 16:36:50 +0800
Subject: [PATCH] iser: queue pdus when cmdsn exceeds maxcmdsn

A PDU is sent directly in iscsi_iser_queue_pdu even if the cmdsn of
it exceeds maxcmdsn, and it may be ignored by the target.

Signed-off-by: wanghonghao <wanghonghao@bytedance.com>
---
 lib/iser.c | 74 +++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 54 insertions(+), 20 deletions(-)

diff --git a/lib/iser.c b/lib/iser.c
index 080da48..66f51a7 100644
--- a/lib/iser.c
+++ b/lib/iser.c
@@ -56,6 +56,7 @@ union socket_address {
 };
 
 static int cq_handle(struct iser_conn *iser_conn);
+static int iscsi_iser_revive_queued_pdus(struct iscsi_context *iscsi);
 
 /*
  * iscsi_iser_get_fd() - Return completion queue
@@ -111,7 +112,7 @@ iscsi_iser_service(struct iscsi_context *iscsi, int revents)
 		return -1;
 	}
 
-	return 0;
+	return iscsi_iser_revive_queued_pdus(iscsi);
 }
 
 /*
@@ -691,29 +692,12 @@ iser_send_command(struct iser_conn *iser_conn, struct iser_pdu *iser_pdu)
 	return 0;
 }
 
-
-/*
- * iser_queue_pdu() - sending iscsi pdu
- *
- * @iscsi_context:    iscsi context
- * @iscsi_pdu:     iscsi pdu
- *
- * Notes:
- * Need to be compatible to TCP which has real queue,
- * in iSER every queue pdu already sends all pdu (post_send)
- */
 static int
-iscsi_iser_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) {
-
+iscsi_iser_send_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) {
 	struct iser_pdu *iser_pdu;
 	struct iser_conn *iser_conn = iscsi->opaque;
 	uint8_t opcode;
 
-	if (pdu == NULL) {
-		iscsi_set_error(iscsi, "trying to queue NULL pdu");
-		return -1;
-	}
-
 	iser_pdu = container_of(pdu, struct iser_pdu, iscsi_pdu);
 	opcode = pdu->outdata.data[0];
 
@@ -731,7 +715,7 @@ iscsi_iser_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) {
 			return -1;
 		}
 	} else {
-                if (iser_send_command(iser_conn, iser_pdu)) {
+		if (iser_send_command(iser_conn, iser_pdu)) {
 			iscsi_set_error(iscsi, "iser_send_command Failed\n");
 			return -1;
 		}
@@ -740,6 +724,56 @@ iscsi_iser_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) {
 	return 0;
 }
 
+static int
+iscsi_iser_revive_queued_pdus(struct iscsi_context *iscsi) {
+	struct iscsi_pdu *pdu;
+
+	while (iscsi->outqueue != NULL) {
+		if (iscsi_serial32_compare(iscsi->outqueue->cmdsn, iscsi->maxcmdsn) > 0) {
+			break;
+		}
+
+		pdu = iscsi->outqueue;
+		ISCSI_LIST_REMOVE(&iscsi->outqueue, pdu);
+
+		if (iscsi_iser_send_pdu(iscsi, pdu) < 0) {
+			ISCSI_LIST_ADD(&iscsi->outqueue, pdu);
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+
+/*
+ * iser_queue_pdu() - sending iscsi pdu
+ *
+ * @iscsi_context:    iscsi context
+ * @iscsi_pdu:     iscsi pdu
+ *
+ * Notes:
+ * Need to be compatible to TCP which has real queue,
+ * in iSER pdus with cmdsn not exceeds maxcmdsn are already sent.
+ */
+static int
+iscsi_iser_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) {
+	if (pdu == NULL) {
+		iscsi_set_error(iscsi, "trying to queue NULL pdu");
+		return -1;
+	}
+
+	if (iscsi->outqueue != NULL ||
+		(iscsi_serial32_compare(pdu->cmdsn, iscsi->maxcmdsn) > 0
+		 && !(pdu->outdata.data[0] & ISCSI_PDU_IMMEDIATE))) {
+		iscsi_add_to_outqueue(iscsi, pdu);
+		return 0;
+	}
+
+	return iscsi_iser_send_pdu(iscsi, pdu);
+}
+
+
 /*
  * iser_create_iser_conn_res() - creating ib connections resources
  *