summaryrefslogtreecommitdiffstats
path: root/drivers/target/iscsi/iscsi_target_erl0.h
diff options
context:
space:
mode:
authorJiang Yi <jiangyilism@gmail.com>2017-05-16 17:57:55 +0800
committerNicholas Bellinger <nab@linux-iscsi.org>2017-05-31 15:12:57 -0700
commit5e0cf5e6c43b9e19fc0284f69e5cd2b4a47523b0 (patch)
tree7b1807ba795acf651f2599442806f7f96649daf1 /drivers/target/iscsi/iscsi_target_erl0.h
parent25cdda95fda78d22d44157da15aa7ea34be3c804 (diff)
downloadop-kernel-dev-5e0cf5e6c43b9e19fc0284f69e5cd2b4a47523b0.zip
op-kernel-dev-5e0cf5e6c43b9e19fc0284f69e5cd2b4a47523b0.tar.gz
iscsi-target: Always wait for kthread_should_stop() before kthread exit
There are three timing problems in the kthread usages of iscsi_target_mod: - np_thread of struct iscsi_np - rx_thread and tx_thread of struct iscsi_conn In iscsit_close_connection(), it calls send_sig(SIGINT, conn->tx_thread, 1); kthread_stop(conn->tx_thread); In conn->tx_thread, which is iscsi_target_tx_thread(), when it receive SIGINT the kthread will exit without checking the return value of kthread_should_stop(). So if iscsi_target_tx_thread() exit right between send_sig(SIGINT...) and kthread_stop(...), the kthread_stop() will try to stop an already stopped kthread. This is invalid according to the documentation of kthread_stop(). (Fix -ECONNRESET logout handling in iscsi_target_tx_thread and early iscsi_target_rx_thread failure case - nab) Signed-off-by: Jiang Yi <jiangyilism@gmail.com> Cc: <stable@vger.kernel.org> # v3.12+ Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target/iscsi/iscsi_target_erl0.h')
-rw-r--r--drivers/target/iscsi/iscsi_target_erl0.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/target/iscsi/iscsi_target_erl0.h b/drivers/target/iscsi/iscsi_target_erl0.h
index 60e69e2..3822d9c 100644
--- a/drivers/target/iscsi/iscsi_target_erl0.h
+++ b/drivers/target/iscsi/iscsi_target_erl0.h
@@ -15,6 +15,6 @@ extern int iscsit_stop_time2retain_timer(struct iscsi_session *);
extern void iscsit_connection_reinstatement_rcfr(struct iscsi_conn *);
extern void iscsit_cause_connection_reinstatement(struct iscsi_conn *, int);
extern void iscsit_fall_back_to_erl0(struct iscsi_session *);
-extern void iscsit_take_action_for_connection_exit(struct iscsi_conn *);
+extern void iscsit_take_action_for_connection_exit(struct iscsi_conn *, bool *);
#endif /*** ISCSI_TARGET_ERL0_H ***/
OpenPOWER on IntegriCloud