cnic: Finetune iSCSI connection reset.

For bnx2 devices, always send notification to bnx2i to let it initiate
the cleanup when RST is received.

For bnx2x devices, add unsolicited RST_COMP handling to start the cleanup.

Signed-off-by: Eddie Wai <waie@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 0fe83717967ac41a89f1063da45bfc4c4e0fd0f2..40865aac2afaf496b1902e8c025820d1aa7f9bea 100644 (file)
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -3108,7 +3108,10 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe)
                break;
 
        case L4_KCQE_OPCODE_VALUE_RESET_RECEIVED:
-               if (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags))
+               if (test_bit(CNIC_F_BNX2_CLASS, &dev->flags)) {
+                       cnic_cm_upcall(cp, csk, opcode);
+                       break;
+               } else if (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags))
                        csk->state = opcode;
                /* fall through */
        case L4_KCQE_OPCODE_VALUE_CLOSE_COMP:
@@ -3172,6 +3175,16 @@ static int cnic_ready_to_close(struct cnic_sock *csk, u32 opcode)
                if (!test_and_set_bit(SK_F_CLOSING, &csk->flags))
                        return 1;
        }
+       /* 57710+ only  workaround to handle unsolicited RESET_COMP
+        * which will be treated like a RESET RCVD notification
+        * which triggers the clean up procedure
+        */
+       else if (opcode == L4_KCQE_OPCODE_VALUE_RESET_COMP) {
+               if (!test_and_set_bit(SK_F_CLOSING, &csk->flags)) {
+                       csk->state = L4_KCQE_OPCODE_VALUE_RESET_RECEIVED;
+                       return 1;
+               }
+       }
        return 0;
 }
 
@@ -3181,10 +3194,8 @@ static void cnic_close_bnx2_conn(struct cnic_sock *csk, u32 opcode)
        struct cnic_local *cp = dev->cnic_priv;
 
        clear_bit(SK_F_CONNECT_START, &csk->flags);
-       if (cnic_ready_to_close(csk, opcode)) {
-               cnic_close_conn(csk);
-               cnic_cm_upcall(cp, csk, opcode);
-       }
+       cnic_close_conn(csk);
+       cnic_cm_upcall(cp, csk, opcode);
 }
 
 static void cnic_cm_stop_bnx2_hw(struct cnic_dev *dev)