From: Mike Christie <michael.christie@oracle.com>
To: mlombard@redhat.com, martin.petersen@oracle.com,
d.bogdanov@yadro.com, linux-scsi@vger.kernel.org,
target-devel@vger.kernel.org
Cc: Mike Christie <michael.christie@oracle.com>
Subject: [PATCH v5 5/9] scsi: target: iscsit: stop/wait on cmds during conn close
Date: Sat, 18 Mar 2023 20:56:16 -0500 [thread overview]
Message-ID: <20230319015620.96006-6-michael.christie@oracle.com> (raw)
In-Reply-To: <20230319015620.96006-1-michael.christie@oracle.com>
This fixes a bug added in:
commit f36199355c64 ("scsi: target: iscsi: Fix cmd abort fabric stop
race")
If we have multiple sessions to the same se_device we can hit a race where
a LUN_RESET on one session cleans up the se_cmds from under another
session which is being closed. This results in the closing session freeing
its conn/session structs while they are still in use.
The bug is:
1. Session1 has IO se_cmd1.
2. Session2 can also have se_cmds for IO and optionally TMRs for ABORTS
but then gets a LUN_RESET.
3. The LUN_RESET on session2 sees the se_cmds on session1 and during
the drain stages marks them all with CMD_T_ABORTED.
4. session1 is now closed so iscsit_release_commands_from_conn only sees
se_cmds with the CMD_T_ABORTED bit set and returns immediately even
though we have outstanding commands.
5. session1's connection and session are freed.
6. The backend request for se_cmd1 completes and it accesses the freed
connection/session.
This hooks the iscsit layer into the cmd counter code, so we can wait for
all outstanding se_cmds before freeing the connection.
Fixes: f36199355c64 ("scsi: target: iscsi: Fix cmd abort fabric stop race")
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Reviewed-by: Maurizio Lombardi <mlombard@redhat.com>
---
drivers/target/iscsi/iscsi_target.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 11115c207844..83b007141229 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -4245,6 +4245,16 @@ static void iscsit_release_commands_from_conn(struct iscsit_conn *conn)
iscsit_free_cmd(cmd, true);
}
+
+ /*
+ * Wait on commands that were cleaned up via the aborted_task path.
+ * LLDs that implement iscsit_wait_conn will already have waited for
+ * commands.
+ */
+ if (!conn->conn_transport->iscsit_wait_conn) {
+ target_stop_cmd_counter(conn->cmd_cnt);
+ target_wait_for_cmds(conn->cmd_cnt);
+ }
}
static void iscsit_stop_timers_for_cmds(
--
2.25.1
next prev parent reply other threads:[~2023-03-19 1:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-19 1:56 [PATCH v5 0/9] target: TMF and recovery fixes Mike Christie
2023-03-19 1:56 ` [PATCH v5 1/9] scsi: target: Move sess cmd counter to new struct Mike Christie
2023-03-19 1:56 ` [PATCH v5 2/9] scsi: target: Move cmd counter allocation Mike Christie
2023-03-19 1:56 ` [PATCH v5 3/9] scsi: target: Pass in cmd counter to use during cmd setup Mike Christie
2023-03-19 1:56 ` [PATCH v5 4/9] scsi: target: iscsit/isert: Alloc per conn cmd counter Mike Christie
2023-03-19 1:56 ` Mike Christie [this message]
2023-03-19 1:56 ` [PATCH v5 6/9] scsi: target: iscsit: free cmds before session free Mike Christie
2023-03-19 1:56 ` [PATCH v5 7/9] scsi: target: Fix multiple LUN_RESET handling Mike Christie
2023-03-19 1:56 ` [PATCH v5 8/9] scsi: target: iscsit: Fix TAS handling during conn cleanup Mike Christie
2023-03-19 1:56 ` [PATCH v5 9/9] scsi: target: iscsi: handle abort for WRITE_PENDING cmds Mike Christie
2023-03-24 21:40 ` [PATCH v5 0/9] target: TMF and recovery fixes Martin K. Petersen
2023-04-03 2:15 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230319015620.96006-6-michael.christie@oracle.com \
--to=michael.christie@oracle.com \
--cc=d.bogdanov@yadro.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mlombard@redhat.com \
--cc=target-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).