scsi: pm80xx: Fix tmf task completion race condition
Subsystems (2)
PATCH 1/1 scsi: pm80xx: Fix tmf task completion race condition
The tmf timeout timer may trigger at the same time when the response from a controller is being handled. When this happens the sas task may get freed before the response processing is finished.
Fix this by calling complete() only when SAS_TASK_STATE_DONE is not set.
Similar race condition was fixed in commit b90cd6f2b905 ("scsi: libsas: fix a race condition when smp task timeout")
--- drivers/scsi/pm8001/pm8001_sas.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-)
drivers/scsi/pm8001/pm8001_sas.c +15 -17
@@ -682,8 +682,7 @@ int pm8001_dev_found(struct domain_device *dev)void pm8001_task_done (struct sas_task *task) { -if (!del_timer (&task->slow_task->timer)) -return ; +del_timer (&task->slow_task->timer);complete (&task->slow_task->completion); }
@@ -691,9 +690,14 @@ static void pm8001_tmf_timedout(struct timer_list *t) {struct sas_task_slow *slow =from_timer (slow, t, timer);struct sas_task *task = slow->task; +unsigned long flags; - task->task_state_flags |=SAS_TASK_STATE_ABORTED ; -complete (&task->slow_task->completion); +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 ; +complete (&task->slow_task->completion); + } +spin_unlock_irqrestore (&task->task_state_lock, flags); }#define PM8001_TASK_TIMEOUT 20
@@ -746,13 +750,10 @@ static int pm8001_exec_internal_tmf_task(struct domain_device *dev, } res = -TMF_RESP_FUNC_FAILED ;/* Even TMF timed out, return direct. */ -if ((task->task_state_flags &SAS_TASK_STATE_ABORTED )) { -if (!(task->task_state_flags &SAS_TASK_STATE_DONE )) { -pm8001_dbg (pm8001_ha,FAIL , -"TMF task[%x]timeout.\n" , - tmf->tmf); - goto ex_err; - } +if (task->task_state_flags &SAS_TASK_STATE_ABORTED ) { +pm8001_dbg (pm8001_ha,FAIL ,"TMF task[%x]timeout.\n" , + tmf->tmf); + goto ex_err; } if (task->task_status.resp == SAS_TASK_COMPLETE &&
@@ -832,12 +833,9 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha,wait_for_completion (&task->slow_task->completion); res =TMF_RESP_FUNC_FAILED ;/* Even TMF timed out, return direct. */ -if ((task->task_state_flags &SAS_TASK_STATE_ABORTED )) { -if (!(task->task_state_flags &SAS_TASK_STATE_DONE )) { -pm8001_dbg (pm8001_ha,FAIL , -"TMF task timeout.\n" ); - goto ex_err; - } +if (task->task_state_flags &SAS_TASK_STATE_ABORTED ) { +pm8001_dbg (pm8001_ha,FAIL ,"TMF task timeout.\n" ); + goto ex_err; } if (task->task_status.resp == SAS_TASK_COMPLETE &&
Signature · 1 line
2.32.0.93.g670b81a890-goog
Jack,
Quoted 8 lines
The tmf timeout timer may trigger at the same time when the response from a controller is being handled. When this happens the sas task may get freed before the response processing is finished.
Fix this by calling
complete()only whenSAS_TASK_STATE_DONEis not set.Similar race condition was fixed in commit
b90cd6f2b905("scsi: libsas: fix a race condition when smp task timeout")
Please review. Thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Hi Martin
Quoted 8 lines · Martin K. Petersen
Jack,
Quoted 4 lines
The tmf timeout timer may trigger at the same time when the response from a controller is being handled. When this happens the sas task may get freed before the response processing is finished.
Quoted 6 lines
Quoted 4 lines
Fix this by calling
complete()only whenSAS_TASK_STATE_DONEis not set.Similar race condition was fixed in commit
b90cd6f2b905("scsi: libsas: fix a race condition when smp task timeout")Please review. Thanks!
Sorry for the late reply, done.
Quoted 3 lines
--
Martin K. Petersen Oracle Linux Engineering
Quoted 5 lines · Igor Pylypiv
The tmf timeout timer may trigger at the same time when the response from a controller is being handled. When this happens the sas task may get freed before the response processing is finished.
Quoted 7 lines
Fix this by calling
complete()only whenSAS_TASK_STATE_DONEis not set.Similar race condition was fixed in commit
b90cd6f2b905("scsi: libsas: fix a race condition when smp task timeout")Reviewed-by Vishakha Channapattan <[email protected]>Signed-off-by Igor Pylypiv <[email protected]>
Looks good to me, thx, sorry for late reply, somehow I missed it.
Quoted 73 lines
--- drivers/scsi/pm8001/pm8001_sas.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-)drivers/scsi/pm8001/pm8001_sas.c +15
-18@@ -682,8 +682,7 @@ int pm8001_dev_found(struct domain_device *dev)void pm8001_task_done (struct sas_task *task) { -if (!del_timer (&task->slow_task->timer)) -return ; +del_timer (&task->slow_task->timer);complete (&task->slow_task->completion); }@@ -691,9 +690,14 @@ static void pm8001_tmf_timedout(struct timer_list *t) {struct sas_task_slow *slow =from_timer (slow, t, timer);struct sas_task *task = slow->task; +unsigned long flags; - task->task_state_flags |=SAS_TASK_STATE_ABORTED ; -complete (&task->slow_task->completion); +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 ; +complete (&task->slow_task->completion); + } +spin_unlock_irqrestore (&task->task_state_lock, flags); }#define PM8001_TASK_TIMEOUT 20@@ -746,13 +750,10 @@ static int pm8001_exec_internal_tmf_task(struct domain_device *dev, } res = -TMF_RESP_FUNC_FAILED ;/* Even TMF timed out, return direct. */ -if ((task->task_state_flags &SAS_TASK_STATE_ABORTED )) { -if (!(task->task_state_flags &SAS_TASK_STATE_DONE )) { -pm8001_dbg (pm8001_ha,FAIL , -"TMF task[%x]timeout.\n" , - tmf->tmf); - goto ex_err; - } +if (task->task_state_flags &SAS_TASK_STATE_ABORTED ) { +pm8001_dbg (pm8001_ha,FAIL ,"TMF task[%x]timeout.\n" , + tmf->tmf); + goto ex_err; } if (task->task_status.resp == SAS_TASK_COMPLETE &&@@ -832,12 +833,9 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha,wait_for_completion (&task->slow_task->completion); res =TMF_RESP_FUNC_FAILED ;/* Even TMF timed out, return direct. */ -if ((task->task_state_flags &SAS_TASK_STATE_ABORTED )) { -if (!(task->task_state_flags &SAS_TASK_STATE_DONE )) { -pm8001_dbg (pm8001_ha,FAIL , -"TMF task timeout.\n" ); - goto ex_err; - } +if (task->task_state_flags &SAS_TASK_STATE_ABORTED ) { +pm8001_dbg (pm8001_ha,FAIL ,"TMF task timeout.\n" ); + goto ex_err; } if (task->task_status.resp == SAS_TASK_COMPLETE && --2.32.0.93.g670b81a890-goog
Martin K. Petersen
AppliedQuoted 8 lines · Igor Pylypiv
The tmf timeout timer may trigger at the same time when the response from a controller is being handled. When this happens the sas task may get freed before the response processing is finished.
Fix this by calling
complete()only whenSAS_TASK_STATE_DONEis not set.Similar race condition was fixed in commit
b90cd6f2b905("scsi: libsas: fix a race condition when smp task timeout")
Applied to 5.14/scsi-fixes, thanks!
[1/1] scsi: pm80xx: Fix tmf task completion race condition
https://git.kernel.org/mkp/scsi/c/d712d3fb484b
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering