ufs: core: fix racing issue between ufshcd_mcq_abort and ISR
Subsystems (3)
PATCH 1/1 ufs: core: fix racing issue between ufshcd_mcq_abort and ISR
From: Peter Wang <[email protected]>
If command timeout happen and cq complete irq raise at the same time, ufshcd_mcq_abort null the lprb->cmd and NULL poiner KE in ISR. Below is error log.
ufshcd_abort: Device abort task at tag 18
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000108 pc : [0xffffffe27ef867ac] scsi_dma_unmap+0xc/0x44 lr : [0xffffffe27f1b898c] ufshcd_release_scsi_cmd+0x24/0x114
--- drivers/ufs/core/ufs-mcq.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/ufs/core/ufs-mcq.c +3 -0
@@ -630,6 +630,7 @@ int ufshcd_mcq_abort(struct scsi_cmnd *cmd)int tag =scsi_cmd_to_rq (cmd)->tag;struct ufshcd_lrb *lrbp = &hba->lrb[tag];struct ufs_hw_queue *hwq; +unsigned long flags;int err =FAILED ;if (!ufshcd_cmd_inflight (lrbp->cmd)) {
@@ -670,8 +671,10 @@ int ufshcd_mcq_abort(struct scsi_cmnd *cmd) } err =SUCCESS ; +spin_lock_irqsave (&hwq->cq_lock, flags);if (ufshcd_cmd_inflight (lrbp->cmd))ufshcd_release_scsi_cmd (hba, lrbp); +spin_unlock_irqrestore (&hwq->cq_lock, flags); out:return err;
Signature · 1 line
2.18.0
Hi all,
Gentle ping for this bug fix review.
Thanks.
Quoted 40 lines · On Fri, 2023-10-27 at 16:43 +0800, [email protected] wrote:
From: Peter Wang <[email protected]>
If command timeout happen and cq complete irq raise at the same time,
ufshcd_mcq_abortnull thelprb->cmdand NULL poiner KE in ISR. Below is error log.
ufshcd_abort: Device abort task at tag 18Unable to handle kernel NULL pointer dereference at virtual address 0000000000000108 pc : [0xffffffe27ef867ac] scsi_dma_unmap+0xc/0x44 lr : [0xffffffe27f1b898c] ufshcd_release_scsi_cmd+0x24/0x114Signed-off-by Peter Wang <[email protected]>--- drivers/ufs/core/ufs-mcq.c | 3 +++ 1 file changed, 3 insertions(+)drivers/ufs/core/ufs-mcq.c +3
-0@@ -630,6 +630,7 @@ int ufshcd_mcq_abort(struct scsi_cmnd *cmd)int tag =scsi_cmd_to_rq (cmd)->tag;struct ufshcd_lrb *lrbp = &hba->lrb[tag];struct ufs_hw_queue *hwq; +unsigned long flags;int err =FAILED ;if (!ufshcd_cmd_inflight (lrbp->cmd)) {@@ -670,8 +671,10 @@ int ufshcd_mcq_abort(struct scsi_cmnd *cmd) } err =SUCCESS ; +spin_lock_irqsave (&hwq->cq_lock, flags);if (ufshcd_cmd_inflight (lrbp->cmd))ufshcd_release_scsi_cmd (hba, lrbp); +spin_unlock_irqrestore (&hwq->cq_lock, flags); out:return err;
Bart Van Assche
reviewerQuoted 2 lines · On 10/27/23 01:43, [email protected] wrote:
If command timeout happen and cq complete irq raise at the same time,
ufshcd_mcq_abortnull thelprb->cmdand NULL poiner KE in ISR.
Please add a Fixes: tag. Otherwise this patch looks good to me.
Thanks,
Bart.
Quoted 5 lines · Bart Van Assche
External email : Please do not click links or open attachments until you have verified the sender or the content.
Quoted 1 line · On 10/27/23 01:43, [email protected] wrote:
If command timeout happen and cq complete irq raise at the same
Quoted 8 lines
time,
Quoted 1 line
ufshcd_mcq_abortnull thelprb->cmdand NULL poiner KE in ISR.Please add a Fixes: tag. Otherwise this patch looks good to me.
Thanks,
Bart.
Hi Bart,
Thank you for review, will add fixes tag next version.
Thanks.
Peter