Skip to content

Fix a deadlock in the UFS driver

Bart Van Assche linux-scsi 4 versions – Applied

Status from this message: Applied to 6.2/scsi-staging, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest10 patches 11 repliesApplied
  2. v38 patches 18 repliesSuperseded
  3. v28 patches 6 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v18 patches4 repliesSuperseded

Changes in v4 from the cover letter

* Added two patches: one patch to reduce the START STOP UNIT timeout and another patch that introduces the ufshcd_execute_start_stop() function.
* Modified patch 3 such that it introduces a new flag (SCMD_FAIL_IF_RECOVERING) instead of modifying the behavior for the REQ_FAILFAST flags.

Patches in v4 Applied

#Subject and filesSizeRepliesApplied
1/10scsi: core: Fix a race between scsi_done() and scsi_timeout()drivers/scsi/scsi_error.c+3 -110 replies
2/10scsi: core: Change the return type of .eh_timed_out()Documentation/scsi/scsi_eh.rst drivers/message/fusion/mptsas.c drivers/scsi/libiscsi.c +12 more+77 -591 reply
3/10scsi: core: Support failing requests while recoveringdrivers/scsi/scsi_lib.c include/scsi/scsi_cmnd.h+7 -43 replies
4/10scsi: ufs: Remove an outdated commentdrivers/ufs/core/ufshcd.c+0 -10 replies
5/10scsi: ufs: Use 'else' in ufshcd_set_dev_pwr_mode()drivers/ufs/core/ufshcd.c+2 -30 replies
6/10scsi: ufs: Reduce the START STOP UNIT timeoutdrivers/ufs/core/ufshcd.c+1 -80 replies
7/10scsi: ufs: Try harder to change the power modedrivers/ufs/core/ufshcd.c+5 -30 replies
8/10scsi: ufs: Track system suspend / resume activitydrivers/ufs/core/ufshcd.c include/ufs/ufshcd.h+6 -10 replies
9/10scsi: ufs: Introduce the function ufshcd_execute_start_stop()drivers/ufs/core/ufshcd.c+34 -53 replies
10/10scsi: ufs: Fix a deadlock between PM and the SCSI error handlerdrivers/ufs/core/ufshcd.c+24 -00 replies

Reviews trailers per patch

8 of 10 patches have a Reviewed-by or Acked-by.

PatchMike ChristieLee DuncanBean HuoAdrian Hunter
1/10R-b
2/10R-b R-b
3/10R-b
4/10R-b R-b
5/10R-b R-b
6/10
7/10
8/10R-b
9/10R-b
10/10R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v4 thread

Cover letter [PATCH v4 00/10] Fix a deadlock in the UFS driver

Hi Martin,

This patch series fixes a deadlock in the UFS driver between the suspend/resume code and the SCSI error handler. Please consider this patch series for the next merge window.

Thanks,

Bart.

Changes compared to v3:
* Added two patches: one patch to reduce the START STOP UNIT timeout and another patch that introduces the ufshcd_execute_start_stop() function.
* Modified patch 3 such that it introduces a new flag (SCMD_FAIL_IF_RECOVERING) instead of modifying the behavior for the REQ_FAILFAST flags.

Changes compared to v2:
* Replaced the custom error handling code in ufshcd_eh_timed_out() with a call to ufshcd_link_recovery().

Changes compared to v1:
* Added support in the SCSI core for failing SCSI commands quickly during host recovery.
* Removed the patch that splits the ufshcd_err_handler() function.
* Fixed the code in ufshcd_eh_timed_out() for handling command timeouts.
* Removed the power management notifier again.

Bart Van Assche (10):
scsi: core: Fix a race between scsi_done() and scsi_timeout()
scsi: core: Change the return type of .eh_timed_out()
scsi: core: Support failing requests while recovering
scsi: ufs: Remove an outdated comment
scsi: ufs: Use 'else' in ufshcd_set_dev_pwr_mode()
scsi: ufs: Reduce the START STOP UNIT timeout
scsi: ufs: Try harder to change the power mode
scsi: ufs: Track system suspend / resume activity
scsi: ufs: Introduce the function ufshcd_execute_start_stop()
scsi: ufs: Fix a deadlock between PM and the SCSI error handler

 Documentation/scsi/scsi_eh.rst            |  7 +-
 drivers/message/fusion/mptsas.c           |  8 +--
 drivers/scsi/libiscsi.c                   | 26 +++----
 drivers/scsi/megaraid/megaraid_sas_base.c |  7 +-
 drivers/scsi/mvumi.c                      |  4 +-
 drivers/scsi/qla4xxx/ql4_os.c             |  8 +--
 drivers/scsi/scsi_error.c                 | 41 +++++------
 drivers/scsi/scsi_lib.c                   |  8 ++-
 drivers/scsi/scsi_transport_fc.c          |  7 +-
 drivers/scsi/scsi_transport_srp.c         |  8 +--
 drivers/scsi/storvsc_drv.c                |  4 +-
 drivers/scsi/virtio_scsi.c                |  4 +-
 drivers/ufs/core/ufshcd.c                 | 86 ++++++++++++++++++-----
 include/scsi/libiscsi.h                   |  2 +-
 include/scsi/scsi_cmnd.h                  |  3 +-
 include/scsi/scsi_host.h                  | 14 +++-
 include/scsi/scsi_transport_fc.h          |  2 +-
 include/scsi/scsi_transport_srp.h         |  2 +-
 include/ufs/ufshcd.h                      |  5 +-
 19 files changed, 155 insertions(+), 91 deletions(-)