Commit f64a6988 authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: fix timeout check in hisi_sas_internal_task_abort() 



We need to check for timeout before task status, or the task will be
mistook as completed internal abort command.  Also add protection for
sas_task.task_state_flags in hisi_sas_tmf_timedout().

Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1080f7ec

drivers/scsi/hisi_sas/hisi_sas_main.c

+17 −8
Original line number Diff line number Diff line
@@ -691,8 +691,13 @@ static void hisi_sas_task_done(struct sas_task *task) 
static void hisi_sas_tmf_timedout(unsigned long data)

{

	struct sas_task *task = (struct sas_task *)data;

	unsigned long flags;



	spin_lock_irqsave(&task->task_state_lock, flags);

	if (!(task->task_state_flags & SAS_TASK_STATE_DONE))

		task->task_state_flags |= SAS_TASK_STATE_ABORTED;

	spin_unlock_irqrestore(&task->task_state_lock, flags);



	complete(&task->slow_task->completion);

}
@@ -1247,6 +1252,17 @@ hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba, 
	wait_for_completion(&task->slow_task->completion);

	res = TMF_RESP_FUNC_FAILED;



	/* Internal abort timed out */

	if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {

		if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {

			struct hisi_sas_slot *slot = task->lldd_task;



			if (slot)

				slot->task = NULL;

			dev_err(dev, "internal task abort: timeout.\n");

		}

	}



	if (task->task_status.resp == SAS_TASK_COMPLETE &&

		task->task_status.stat == TMF_RESP_FUNC_COMPLETE) {

		res = TMF_RESP_FUNC_COMPLETE;
@@ -1259,13 +1275,6 @@ hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba, 
		goto exit;

	}



	/* Internal abort timed out */

	if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {

		if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {

			dev_err(dev, "internal task abort: timeout.\n");

		}

	}



exit:

	dev_dbg(dev, "internal task abort: task to dev %016llx task=%p "

		"resp: 0x%x sts 0x%x\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE