Skip to content

Commit 4b6c0d9

Browse files
bvanasschemartinkpetersen
authored andcommitted
scsi: ufs: core: Make blk_mq_tagset_busy_iter() skip reserved requests
A later patch will convert hba->reserved_slot into a reserved tag. Make blk_mq_tagset_busy_iter() skip reserved requests such that device management commands are skipped. Signed-off-by: Bart Van Assche <bvanassche@acm.org> Link: https://patch.msgid.link/20251031204029.2883185-27-bvanassche@acm.org Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 9a2c950 commit 4b6c0d9

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

drivers/ufs/core/ufshcd.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,8 @@ static bool ufshcd_print_tr_iter(struct request *req, void *priv)
644644
struct Scsi_Host *shost = sdev->host;
645645
struct ufs_hba *hba = shost_priv(shost);
646646

647-
ufshcd_print_tr(hba, blk_mq_rq_to_pdu(req), *(bool *)priv);
647+
if (!blk_mq_is_reserved_rq(req))
648+
ufshcd_print_tr(hba, blk_mq_rq_to_pdu(req), *(bool *)priv);
648649

649650
return true;
650651
}
@@ -5753,7 +5754,7 @@ static bool ufshcd_mcq_force_compl_one(struct request *rq, void *priv)
57535754
struct ufs_hba *hba = shost_priv(shost);
57545755
struct ufs_hw_queue *hwq = ufshcd_mcq_req_to_hwq(hba, rq);
57555756

5756-
if (!hwq)
5757+
if (blk_mq_is_reserved_rq(rq) || !hwq)
57575758
return true;
57585759

57595760
ufshcd_mcq_compl_all_cqes_lock(hba, hwq);
@@ -5780,7 +5781,7 @@ static bool ufshcd_mcq_compl_one(struct request *rq, void *priv)
57805781
struct ufs_hba *hba = shost_priv(shost);
57815782
struct ufs_hw_queue *hwq = ufshcd_mcq_req_to_hwq(hba, rq);
57825783

5783-
if (hwq)
5784+
if (!blk_mq_is_reserved_rq(rq) && hwq)
57845785
ufshcd_mcq_poll_cqe_lock(hba, hwq);
57855786

57865787
return true;
@@ -6648,6 +6649,9 @@ static bool ufshcd_abort_one(struct request *rq, void *priv)
66486649
struct Scsi_Host *shost = sdev->host;
66496650
struct ufs_hba *hba = shost_priv(shost);
66506651

6652+
if (blk_mq_is_reserved_rq(rq))
6653+
return true;
6654+
66516655
*ret = ufshcd_try_to_abort_task(hba, tag);
66526656
dev_err(hba->dev, "Aborting tag %d / CDB %#02x %s\n", tag,
66536657
ufshcd_is_scsi_cmd(cmd) ? cmd->cmnd[0] : -1,
@@ -7597,7 +7601,7 @@ static bool ufshcd_clear_lu_cmds(struct request *req, void *priv)
75977601
const u64 lun = *(u64 *)priv;
75987602
const u32 tag = req->tag;
75997603

7600-
if (sdev->lun != lun)
7604+
if (blk_mq_is_reserved_rq(req) || sdev->lun != lun)
76017605
return true;
76027606

76037607
if (ufshcd_clear_cmd(hba, tag) < 0) {

0 commit comments

Comments
 (0)