| Message ID | 20211006114031.245731-1-adrian.hunter@intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | scsi: ufs: core: Fix synchronization between scsi_unjam_host() and ufshcd_queuecommand() | expand |
On 10/6/21 4:40 AM, Adrian Hunter wrote: > 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. > > Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> > --- > drivers/scsi/ufs/ufshcd.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index f34227add27d..df28e1444eff 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -2688,7 +2688,12 @@ 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: > + if (ufshcd_eh_in_progress(hba)) { > + err = SCSI_MLQUEUE_HOST_BUSY; > + goto out; > + } > break; > case UFSHCD_STATE_EH_SCHEDULED_FATAL: Please add a comment in ufshcd_queuecommand() that explains why the new code returns SCSI_MLQUEUE_HOST_BUSY. Thanks, Bart.
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index f34227add27d..df28e1444eff 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -2688,7 +2688,12 @@ 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: + if (ufshcd_eh_in_progress(hba)) { + err = SCSI_MLQUEUE_HOST_BUSY; + goto out; + } break; case UFSHCD_STATE_EH_SCHEDULED_FATAL: /*
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. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- drivers/scsi/ufs/ufshcd.c | 5 +++++ 1 file changed, 5 insertions(+)