[PATCH 1/3] scsi: target: iscsi: factor out iscsit_stop_kthreads()
From: Daniel Wade
Date: Sun Nov 15 2026 - 03:59:34 EST
iscsi_target_do_tx_login_io() stops a connection's RX and TX kthreads
and releases its thread-set bitmap slot inline on its error path. The
next patch needs that same teardown from iscsi_post_login_handler(), so
move it to a helper beside iscsit_start_kthreads().
No functional change.
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Daniel Wade <danjwade95@xxxxxxxxx>
---
drivers/target/iscsi/iscsi_target_login.c | 17 +++++++++++++++++
drivers/target/iscsi/iscsi_target_login.h | 1 +
drivers/target/iscsi/iscsi_target_nego.c | 17 ++---------------
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index c282b6a7029..f4df5518171 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -643,6 +643,23 @@ int iscsit_start_kthreads(struct iscsit_conn *conn)
return ret;
}
+void iscsit_stop_kthreads(struct iscsit_conn *conn)
+{
+ if (conn->rx_thread && conn->rx_thread_active) {
+ send_sig(SIGINT, conn->rx_thread, 1);
+ complete(&conn->rx_login_comp);
+ kthread_stop(conn->rx_thread);
+ }
+ if (conn->tx_thread && conn->tx_thread_active) {
+ send_sig(SIGINT, conn->tx_thread, 1);
+ kthread_stop(conn->tx_thread);
+ }
+ spin_lock(&iscsit_global->ts_bitmap_lock);
+ bitmap_release_region(iscsit_global->ts_bitmap, conn->bitmap_id,
+ get_order(1));
+ spin_unlock(&iscsit_global->ts_bitmap_lock);
+}
+
void iscsi_post_login_handler(
struct iscsi_np *np,
struct iscsit_conn *conn,
diff --git a/drivers/target/iscsi/iscsi_target_login.h b/drivers/target/iscsi/iscsi_target_login.h
index 03c7d695d58..02c5f6ecbec 100644
--- a/drivers/target/iscsi/iscsi_target_login.h
+++ b/drivers/target/iscsi/iscsi_target_login.h
@@ -20,6 +20,7 @@ extern int iscsit_get_login_rx(struct iscsit_conn *, struct iscsi_login *);
extern int iscsit_put_login_tx(struct iscsit_conn *, struct iscsi_login *, u32);
extern void iscsit_free_conn(struct iscsit_conn *);
extern int iscsit_start_kthreads(struct iscsit_conn *);
+extern void iscsit_stop_kthreads(struct iscsit_conn *);
extern void iscsi_post_login_handler(struct iscsi_np *, struct iscsit_conn *, u8);
extern void iscsi_target_login_sess_out(struct iscsit_conn *, bool, bool);
extern int iscsi_target_login_thread(void *);
diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c
index b03ed154ca3..d56b28446d3 100644
--- a/drivers/target/iscsi/iscsi_target_nego.c
+++ b/drivers/target/iscsi/iscsi_target_nego.c
@@ -362,21 +362,8 @@ static int iscsi_target_do_tx_login_io(struct iscsit_conn *conn, struct iscsi_lo
return 0;
err:
- if (login->login_complete) {
- if (conn->rx_thread && conn->rx_thread_active) {
- send_sig(SIGINT, conn->rx_thread, 1);
- complete(&conn->rx_login_comp);
- kthread_stop(conn->rx_thread);
- }
- if (conn->tx_thread && conn->tx_thread_active) {
- send_sig(SIGINT, conn->tx_thread, 1);
- kthread_stop(conn->tx_thread);
- }
- spin_lock(&iscsit_global->ts_bitmap_lock);
- bitmap_release_region(iscsit_global->ts_bitmap, conn->bitmap_id,
- get_order(1));
- spin_unlock(&iscsit_global->ts_bitmap_lock);
- }
+ if (login->login_complete)
+ iscsit_stop_kthreads(conn);
return -1;
}
--
2.39.0.windows.2