scsi: ufs: core: Fix synchronization between scsi_unjam_host() and ufshcd_queuecommand()
PATCH v2 1/1 scsi: ufs: core: Fix synchronization between scsi_unjam_host() and ufshcd_queuecommand()
The SCSI error handler calls scsi_unjam_host() which can call the queue function ufshcd_queuecommand() indirectly. The error handler changes the state to UFSHCD_STATE_RESET while running, but error interrupts that happen while the error handler is running could change the state to UFSHCD_STATE_EH_SCHEDULED_NON_FATAL which would allow requests to go through ufshcd_queuecommand() even though the error handler is running. Block that hole by checking whether the error handler is in progress.
---
Changes in V2:
Add comment
drivers/scsi/ufs/ufshcd.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/scsi/ufs/ufshcd.c +12 -0
@@ -2688,7 +2688,19 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)switch (hba->ufshcd_state) {case UFSHCD_STATE_OPERATIONAL : +break ;case UFSHCD_STATE_EH_SCHEDULED_NON_FATAL : +/* +* SCSI error handler can call ->queuecommand() while UFS error +* handler is in progress. Error interrupts could change the +* state from UFSHCD_STATE_RESET to +* UFSHCD_STATE_EH_SCHEDULED_NON_FATAL. Prevent requests +* being issued in that case. +*/ +if (ufshcd_eh_in_progress (hba)) { + err =SCSI_MLQUEUE_HOST_BUSY ; + goto out; + }break ;case UFSHCD_STATE_EH_SCHEDULED_FATAL :/*
Signature · 1 line
2.25.1
Quoted 10 lines · Adrian Hunter
The SCSI error handler calls
scsi_unjam_host()which can call the queue functionufshcd_queuecommand()indirectly. The error handler changes the state toUFSHCD_STATE_RESETwhile running, but error interrupts that happen while the error handler is running could change the state toUFSHCD_STATE_EH_SCHEDULED_NON_FATALwhich would allow requests to go throughufshcd_queuecommand()even though the error handler is running. Block that hole by checking whether the error handler is in progress.Signed-off-by Adrian Hunter <[email protected]>---
LGTM.
Quoted 33 lines
Changes in V2:
Add comment
drivers/scsi/ufs/ufshcd.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)drivers/scsi/ufs/ufshcd.c +12
-0@@ -2688,7 +2688,19 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)switch (hba->ufshcd_state) {case UFSHCD_STATE_OPERATIONAL : +break ;case UFSHCD_STATE_EH_SCHEDULED_NON_FATAL : +/* +* SCSI error handler can call ->queuecommand() while UFS error +* handler is in progress. Error interrupts could change the +* state from UFSHCD_STATE_RESET to +* UFSHCD_STATE_EH_SCHEDULED_NON_FATAL. Prevent requests +* being issued in that case. +*/ +if (ufshcd_eh_in_progress (hba)) { + err =SCSI_MLQUEUE_HOST_BUSY ; + goto out; + }break ;case UFSHCD_STATE_EH_SCHEDULED_FATAL :/*
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, Linux Foundation Collaborative Project
Martin K. Petersen
AppliedAdrian,
Quoted 7 lines
The SCSI error handler calls
scsi_unjam_host()which can call the queue functionufshcd_queuecommand()indirectly. The error handler changes the state toUFSHCD_STATE_RESETwhile running, but error interrupts that happen while the error handler is running could change the state toUFSHCD_STATE_EH_SCHEDULED_NON_FATALwhich would allow requests to go throughufshcd_queuecommand()even though the error handler is running. Block that hole by checking whether the error handler is in progress.
Applied to 5.16/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 9 lines · Adrian Hunter
The SCSI error handler calls
scsi_unjam_host()which can call the queue functionufshcd_queuecommand()indirectly. The error handler changes the state toUFSHCD_STATE_RESETwhile running, but error interrupts that happen while the error handler is running could change the state toUFSHCD_STATE_EH_SCHEDULED_NON_FATALwhich would allow requests to go throughufshcd_queuecommand()even though the error handler is running. Block that hole by checking whether the error handler is in progress.[...]
Applied to 5.16/scsi-queue, thanks!
[1/1] scsi: ufs: core: Fix synchronization between scsi_unjam_host() and ufshcd_queuecommand()
https://git.kernel.org/mkp/scsi/c/d489f18ad1fc
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering