| From 69dd7453c6b17f37195869548eca5d2f1d7deb4c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 15 Apr 2022 12:42:29 +0000 |
| Subject: scsi: qla2xxx: Fix missed DMA unmap for aborted commands |
| |
| From: Gleb Chesnokov <Chesnokov.G@raidix.com> |
| |
| [ Upstream commit 26f9ce53817a8fd84b69a73473a7de852a24c897 ] |
| |
| Aborting commands that have already been sent to the firmware can |
| cause BUG in qlt_free_cmd(): BUG_ON(cmd->sg_mapped) |
| |
| For instance: |
| |
| - Command passes rdx_to_xfer state, maps sgl, sends to the firmware |
| |
| - Reset occurs, qla2xxx performs ISP error recovery, aborts the command |
| |
| - Target stack calls qlt_abort_cmd() and then qlt_free_cmd() |
| |
| - BUG_ON(cmd->sg_mapped) in qlt_free_cmd() occurs because sgl was not |
| unmapped |
| |
| Thus, unmap sgl in qlt_abort_cmd() for commands with the aborted flag set. |
| |
| Link: https://lore.kernel.org/r/AS8PR10MB4952D545F84B6B1DFD39EC1E9DEE9@AS8PR10MB4952.EURPRD10.PROD.OUTLOOK.COM |
| Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com> |
| Signed-off-by: Gleb Chesnokov <Chesnokov.G@raidix.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/scsi/qla2xxx/qla_target.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c |
| index df598c377161..cb97565b6a33 100644 |
| --- a/drivers/scsi/qla2xxx/qla_target.c |
| +++ b/drivers/scsi/qla2xxx/qla_target.c |
| @@ -3768,6 +3768,9 @@ int qlt_abort_cmd(struct qla_tgt_cmd *cmd) |
| |
| spin_lock_irqsave(&cmd->cmd_lock, flags); |
| if (cmd->aborted) { |
| + if (cmd->sg_mapped) |
| + qlt_unmap_sg(vha, cmd); |
| + |
| spin_unlock_irqrestore(&cmd->cmd_lock, flags); |
| /* |
| * It's normal to see 2 calls in this path: |
| -- |
| 2.35.1 |
| |
