Patch "qla2xxx: Fix incorrect tcm_qla2xxx_free_cmd use during TMR ABORT (v2)" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
qla2xxx: Fix incorrect tcm_qla2xxx_free_cmd use during TMR ABORT (v2)
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
qla2xxx-fix-incorrect-tcm_qla2xxx_free_cmd-use-during-tmr-abort-v2.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
6bcbb3174caa5f1ccc894f8ae077631659d5a629Mon Sep 17 00:00:00 2001
From: Nicholas Bellinger <[email protected]>
Date: Fri, 30 Jun 2017 00:08:13 -0700
Subject: qla2xxx: Fix incorrect tcm_qla2xxx_free_cmd use during TMR ABORT (v2)
From: Nicholas Bellinger <[email protected]>
commit 6bcbb3174caa5f1ccc894f8ae077631659d5a629 upstream.
This patch drops two incorrect usages of tcm_qla2xxx_free_cmd() during TMR ABORT within tcm_qla2xxx_handle_data_work() and tcm_qla2xxx_aborted_task(), which where attempting to dispatch into workqueue context to do tcm_qla2xxx_complete_free() and subsequently invoke transport_generic_free_cmd().
This is incorrect because during TMR ABORT target-core will drop the outstanding se_cmd->cmd_kref references once it has quiesced the se_cmd via transport_wait_for_tasks(), and in the case of qla2xxx it should not attempt to do it's own transport_generic_free_cmd() once the abort has occured.
As reported by Pascal, this was originally manifesting as a BUG_ON(cmd->cmd_in_wq) in qlt_free_cmd() during TMR ABORT, with a LIO backend that had sufficently high enough WRITE latency to trigger a host side TMR ABORT_TASK.
(v2: Drop the qla_tgt_cmd->write_pending_abort_comp changes,
as they will be addressed in a seperate series)
--- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 33 --------------------------------- 1 file changed, 33 deletions(-)
drivers/scsi/qla2xxx/tcm_qla2xxx.c +0 -33
@@ -484,7 +484,6 @@ static int tcm_qla2xxx_handle_cmd(scsi_qstatic void tcm_qla2xxx_handle_data_work (struct work_struct *work) { struct qla_tgt_cmd *cmd = container_of(work, struct qla_tgt_cmd, work); -unsigned long flags;/* * Ensure that the complete FCP WRITE payload has been received.
@@ -492,17 +491,6 @@ static void tcm_qla2xxx_handle_data_work*/ cmd->cmd_in_wq =0 ; -spin_lock_irqsave (&cmd->cmd_lock, flags); - cmd->cmd_flags |=CMD_FLAG_DATA_WORK ; -if (cmd->aborted) { - cmd->cmd_flags |=CMD_FLAG_DATA_WORK_FREE ; -spin_unlock_irqrestore (&cmd->cmd_lock, flags); - -tcm_qla2xxx_free_cmd (cmd); -return ; - } -spin_unlock_irqrestore (&cmd->cmd_lock, flags); - cmd->vha->tgt_counters.qla_core_ret_ctio++;if (!cmd->write_data_transferred) {/*
@@ -682,34 +670,13 @@ static void tcm_qla2xxx_queue_tm_rsp(strqlt_xmit_tm_rsp (mcmd); } - -#define DATA_WORK_NOT_FREE (_flags) \ - (( _flags & (CMD_FLAG_DATA_WORK|CMD_FLAG_DATA_WORK_FREE)) == \ - CMD_FLAG_DATA_WORK)static void tcm_qla2xxx_aborted_task (struct se_cmd *se_cmd) {struct qla_tgt_cmd *cmd =container_of (se_cmd, struct qla_tgt_cmd, se_cmd); -unsigned long flags;if (qlt_abort_cmd (cmd))return ; - -spin_lock_irqsave (&cmd->cmd_lock, flags); -if ((cmd->state ==QLA_TGT_STATE_NEW )|| - ((cmd->state ==QLA_TGT_STATE_DATA_IN ) && -DATA_WORK_NOT_FREE (cmd->cmd_flags)) ) { - - cmd->cmd_flags |=CMD_FLAG_DATA_WORK_FREE ; -spin_unlock_irqrestore (&cmd->cmd_lock, flags); -/* Cmd have not reached firmware. -* Use this trigger to free it. */ -tcm_qla2xxx_free_cmd (cmd); -return ; - } -spin_unlock_irqrestore (&cmd->cmd_lock, flags); -return ; - } static void tcm_qla2xxx_clear_sess_lookup(struct tcm_qla2xxx_lport *,
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/qla2xxx-fix-incorrect-tcm_qla2xxx_free_cmd-use-during-tmr-abort-v2.patch queue-4.9/target-iscsi-fix-iscsi-task-reassignment-handling.patch