70 lines
2.7 KiB
Diff
70 lines
2.7 KiB
Diff
From 3df1056ee50d09c97e421896a698f74d367282ef Mon Sep 17 00:00:00 2001
|
|
From: Xiang Chen <chenxiang66@hisilicon.com>
|
|
Date: Mon, 24 Sep 2018 23:06:31 +0800
|
|
Subject: [PATCH 04/31] scsi: hisi_sas: Free slot later in
|
|
slot_complete_vx_hw()
|
|
Origin: https://git.kernel.org/linus/3e178f3ecfcf91a258e832b0f0843a4cfd9059ac
|
|
|
|
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: Xiang Chen <chenxiang66@hisilicon.com>
|
|
Signed-off-by: John Garry <john.garry@huawei.com>
|
|
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
---
|
|
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 2 +-
|
|
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
index 1c4ea58da1ae..c4774d63d5d0 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
@@ -2481,7 +2481,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) {
|
|
@@ -2491,6 +2490,7 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
|
|
}
|
|
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);
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
index 3922b17e2ea3..fb2a5969181b 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
@@ -1749,7 +1749,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) {
|
|
@@ -1759,6 +1758,7 @@ slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
|
|
}
|
|
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);
|
|
--
|
|
2.20.1
|
|
|