[src/trunk]: src/sys/dev/iscsi Handle ExpCmdSN and MaxCmdSN updates as specif...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/db0da76b7766
branches:  trunk
changeset: 345688:db0da76b7766
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun Jun 05 05:11:57 2016 +0000

description:
Handle ExpCmdSN and MaxCmdSN updates as specified. Don't compare
serial numbers as integers.

diffstat:

 sys/dev/iscsi/iscsi_rcv.c |  18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r b0f084ac20a0 -r db0da76b7766 sys/dev/iscsi/iscsi_rcv.c
--- a/sys/dev/iscsi/iscsi_rcv.c Sun Jun 05 05:07:23 2016 +0000
+++ b/sys/dev/iscsi/iscsi_rcv.c Sun Jun 05 05:11:57 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iscsi_rcv.c,v 1.15 2016/06/05 05:07:23 mlelstv Exp $   */
+/*     $NetBSD: iscsi_rcv.c,v 1.16 2016/06/05 05:11:57 mlelstv Exp $   */
 
 /*-
  * Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -1014,7 +1014,7 @@
        ccb_t *req_ccb;
        ccb_list_t waiting;
        int rc;
-       uint32_t MaxCmdSN, digest;
+       uint32_t MaxCmdSN, ExpCmdSN, digest;
        session_t *sess = conn->session;
 
        if (conn->HeaderDigest) {
@@ -1112,7 +1112,7 @@
                return rc;
 
        /* MaxCmdSN and ExpCmdSN are in the same place in all received PDUs */
-       sess->ExpCmdSN = max(sess->ExpCmdSN, ntohl(pdu->pdu.p.nop_in.ExpCmdSN));
+       ExpCmdSN = ntohl(pdu->pdu.p.nop_in.ExpCmdSN);
        MaxCmdSN = ntohl(pdu->pdu.p.nop_in.MaxCmdSN);
 
        /* received a valid frame, reset timeout */
@@ -1128,7 +1128,17 @@
         * We have to handle wait/nowait CCBs a bit differently.
         */
        mutex_enter(&sess->lock);
-       if (MaxCmdSN != sess->MaxCmdSN) {
+
+       if (sn_a_lt_b(MaxCmdSN, ExpCmdSN-1)) {
+               /* both are ignored */
+               mutex_exit(&sess->lock);
+               return 0;
+       }
+
+       if (sn_a_lt_b(sess->ExpCmdSN, ExpCmdSN))
+               sess->ExpCmdSN = ExpCmdSN;
+
+       if (sn_a_lt_b(sess->MaxCmdSN, MaxCmdSN)) {
                sess->MaxCmdSN = MaxCmdSN;
                if (TAILQ_FIRST(&sess->ccbs_throttled) == NULL) {
                        mutex_exit(&sess->lock);