Merge tag 'linux-watchdog-5.10-rc1' of git://www.linux-watchdog.org/linux-watchdog

[linux-2.6-microblaze.git] / drivers / scsi / qedi / qedi_fw.c

diff --git a/drivers/scsi/qedi/qedi_fw.c b/drivers/scsi/qedi/qedi_fw.c
index 6ed7458..440ddd2 100644 (file)
--- a/drivers/scsi/qedi/qedi_fw.c
+++ b/drivers/scsi/qedi/qedi_fw.c
@@ -59,6 +59,7 @@ static void qedi_process_logout_resp(struct qedi_ctx *qedi,
                  "Freeing tid=0x%x for cid=0x%x\n",
                  cmd->task_id, qedi_conn->iscsi_conn_id);
 
+       spin_lock(&qedi_conn->list_lock);
        if (likely(cmd->io_cmd_in_list)) {
                cmd->io_cmd_in_list = false;
                list_del_init(&cmd->io_cmd);
@@ -69,6 +70,7 @@ static void qedi_process_logout_resp(struct qedi_ctx *qedi,
                          cmd->task_id, qedi_conn->iscsi_conn_id,
                          &cmd->io_cmd);
        }
+       spin_unlock(&qedi_conn->list_lock);
 
        cmd->state = RESPONSE_RECEIVED;
        qedi_clear_task_idx(qedi, cmd->task_id);
@@ -122,6 +124,7 @@ static void qedi_process_text_resp(struct qedi_ctx *qedi,
                  "Freeing tid=0x%x for cid=0x%x\n",
                  cmd->task_id, qedi_conn->iscsi_conn_id);
 
+       spin_lock(&qedi_conn->list_lock);
        if (likely(cmd->io_cmd_in_list)) {
                cmd->io_cmd_in_list = false;
                list_del_init(&cmd->io_cmd);
@@ -132,6 +135,7 @@ static void qedi_process_text_resp(struct qedi_ctx *qedi,
                          cmd->task_id, qedi_conn->iscsi_conn_id,
                          &cmd->io_cmd);
        }
+       spin_unlock(&qedi_conn->list_lock);
 
        cmd->state = RESPONSE_RECEIVED;
        qedi_clear_task_idx(qedi, cmd->task_id);
@@ -222,11 +226,13 @@ static void qedi_process_tmf_resp(struct qedi_ctx *qedi,
 
        tmf_hdr = (struct iscsi_tm *)qedi_cmd->task->hdr;
 
+       spin_lock(&qedi_conn->list_lock);
        if (likely(qedi_cmd->io_cmd_in_list)) {
                qedi_cmd->io_cmd_in_list = false;
                list_del_init(&qedi_cmd->io_cmd);
                qedi_conn->active_cmd_count--;
        }
+       spin_unlock(&qedi_conn->list_lock);
 
        if (((tmf_hdr->flags & ISCSI_FLAG_TM_FUNC_MASK) ==
              ISCSI_TM_FUNC_LOGICAL_UNIT_RESET) ||
@@ -288,11 +294,13 @@ static void qedi_process_login_resp(struct qedi_ctx *qedi,
                  ISCSI_LOGIN_RESPONSE_HDR_DATA_SEG_LEN_MASK;
        qedi_conn->gen_pdu.resp_wr_ptr = qedi_conn->gen_pdu.resp_buf + pld_len;
 
+       spin_lock(&qedi_conn->list_lock);
        if (likely(cmd->io_cmd_in_list)) {
                cmd->io_cmd_in_list = false;
                list_del_init(&cmd->io_cmd);
                qedi_conn->active_cmd_count--;
        }
+       spin_unlock(&qedi_conn->list_lock);
 
        memset(task_ctx, '\0', sizeof(*task_ctx));
 
@@ -816,8 +824,11 @@ static void qedi_process_cmd_cleanup_resp(struct qedi_ctx *qedi,
                        qedi_clear_task_idx(qedi_conn->qedi, rtid);
 
                        spin_lock(&qedi_conn->list_lock);
-                       list_del_init(&dbg_cmd->io_cmd);
-                       qedi_conn->active_cmd_count--;
+                       if (likely(dbg_cmd->io_cmd_in_list)) {
+                               dbg_cmd->io_cmd_in_list = false;
+                               list_del_init(&dbg_cmd->io_cmd);
+                               qedi_conn->active_cmd_count--;
+                       }
                        spin_unlock(&qedi_conn->list_lock);
                        qedi_cmd->state = CLEANUP_RECV;
                        wake_up_interruptible(&qedi_conn->wait_queue);
@@ -1235,6 +1246,7 @@ int qedi_cleanup_all_io(struct qedi_ctx *qedi, struct qedi_conn *qedi_conn,
                qedi_conn->cmd_cleanup_req++;
                qedi_iscsi_cleanup_task(ctask, true);
 
+               cmd->io_cmd_in_list = false;
                list_del_init(&cmd->io_cmd);
                qedi_conn->active_cmd_count--;
                QEDI_WARN(&qedi->dbg_ctx,
@@ -1255,7 +1267,8 @@ int qedi_cleanup_all_io(struct qedi_ctx *qedi, struct qedi_conn *qedi_conn,
        rval  = wait_event_interruptible_timeout(qedi_conn->wait_queue,
                                                 ((qedi_conn->cmd_cleanup_req ==
                                                 qedi_conn->cmd_cleanup_cmpl) ||
-                                                qedi_conn->ep),
+                                                test_bit(QEDI_IN_RECOVERY,
+                                                         &qedi->flags)),
                                                 5 * HZ);
        if (rval) {
                QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_SCSI_TM,
@@ -1280,7 +1293,9 @@ int qedi_cleanup_all_io(struct qedi_ctx *qedi, struct qedi_conn *qedi_conn,
        /* Enable IOs for all other sessions except current.*/
        if (!wait_event_interruptible_timeout(qedi_conn->wait_queue,
                                              (qedi_conn->cmd_cleanup_req ==
-                                              qedi_conn->cmd_cleanup_cmpl),
+                                              qedi_conn->cmd_cleanup_cmpl) ||
+                                              test_bit(QEDI_IN_RECOVERY,
+                                                       &qedi->flags),
                                              5 * HZ)) {
                iscsi_host_for_each_session(qedi->shost,
                                            qedi_mark_device_available);
@@ -1446,8 +1461,11 @@ ldel_exit:
        spin_unlock_bh(&qedi_conn->tmf_work_lock);
 
        spin_lock(&qedi_conn->list_lock);
-       list_del_init(&cmd->io_cmd);
-       qedi_conn->active_cmd_count--;
+       if (likely(cmd->io_cmd_in_list)) {
+               cmd->io_cmd_in_list = false;
+               list_del_init(&cmd->io_cmd);
+               qedi_conn->active_cmd_count--;
+       }
        spin_unlock(&qedi_conn->list_lock);
 
        clear_bit(QEDI_CONN_FW_CLEANUP, &qedi_conn->flags);