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

scsi: hisi_sas: Free slot later in slot_complete_vx_hw() 



If an SSP/SMP IO times out, it may be actually in reality be
simultaneously processing completion of the slot in
slot_complete_vx_hw().

Then if the slot is freed in slot_complete_vx_hw() (this IPTT is freed
and it may be re-used by other slot), and we may abort the wrong slot in
hisi_sas_abort_task().

So to solve the issue, free the slot after the check of
SAS_TASK_STATE_ABORTED in slot_complete_vx_hw().

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 584f53fe

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -2483,7 +2483,6 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot) 
	}



out:

	hisi_sas_slot_task_free(hisi_hba, task, slot);

	sts = ts->stat;

	spin_lock_irqsave(&task->task_state_lock, flags);

	if (task->task_state_flags & SAS_TASK_STATE_ABORTED) {
@@ -2493,6 +2492,7 @@ out: 
	}

	task->task_state_flags |= SAS_TASK_STATE_DONE;

	spin_unlock_irqrestore(&task->task_state_lock, flags);

	hisi_sas_slot_task_free(hisi_hba, task, slot);



	if (!is_internal && (task->task_proto != SAS_PROTOCOL_SMP)) {

		spin_lock_irqsave(&device->done_lock, flags);

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1751,7 +1751,6 @@ slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot) 
	}



out:

	hisi_sas_slot_task_free(hisi_hba, task, slot);

	sts = ts->stat;

	spin_lock_irqsave(&task->task_state_lock, flags);

	if (task->task_state_flags & SAS_TASK_STATE_ABORTED) {
@@ -1761,6 +1760,7 @@ out: 
	}

	task->task_state_flags |= SAS_TASK_STATE_DONE;

	spin_unlock_irqrestore(&task->task_state_lock, flags);

	hisi_sas_slot_task_free(hisi_hba, task, slot);



	if (!is_internal && (task->task_proto != SAS_PROTOCOL_SMP)) {

		spin_lock_irqsave(&device->done_lock, flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE