github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

scsi: ufs: core: Do not release a reserved request in ufshcd_abort()

Browse Source 
In SDB mode, aborting a timed-out device management request drops a clock
hold that the request never took:

 1. ufshcd_dev_man_lock() takes one ufshcd_hold() for the whole device
    management command. ufshcd_queue_reserved_command() submits the request
    without taking a hold of its own.

 2. The request times out and ufshcd_abort() clears its slot with
    ufshcd_clear_cmd().

 3. ufshcd_abort() claims BIT(tag) in hba->outstanding_reqs and calls
    ufshcd_release_scsi_cmd(), which calls ufshcd_release() for a hold the
    request never took.

 4. When ufshcd_dev_man_unlock() drops the hold from step 1,
    hba->clk_gating.active_reqs goes below zero.

Release the command only if it is a SCSI command.

Fixes: 08b12cda6c ("scsi: ufs: core: Switch to scsi_get_internal_cmd()")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/2060a8da-581b-46d1-a510-779f4df716cd@acm.org
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Peter Wang <peter.wang@mediatek.com>
Signed-off-by: Stanley Jhu <stanleyjhu@google.com>
Reviewed-by: Bean Huo <beanhuo@micron.com>
Link: https://patch.msgid.link/20261022034443.3034432-7-stanleyjhu@google.com
Signed-off-by: Martin K. Petersen (Oracle) <mkp@kernel.org>
This commit is contained in:
Stanley Jhu 2026-10-22 11:44:43 +08:00 committed by Martin K. Petersen (Oracle)
parent 7cfdfdd655
commit eb2c4847a1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/ufs/core/ufshcd.c
View File

@ -8171,7 +8171,8 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)
* Clear the corresponding bit from outstanding_reqs since the command
* has been aborted successfully.
*/
if (ufshcd_clear_outstanding_reqs(hba, BIT(tag)))
if (ufshcd_clear_outstanding_reqs(hba, BIT(tag)) &&
ufshcd_is_scsi_cmd(cmd))
ufshcd_release_scsi_cmd(hba, cmd);
err = SUCCESS;