scsi: iscsi: fix iscsi cls conn state
Mike Christie
maintainerPATCH 1/1 scsi: iscsi: fix iscsi cls conn state
In commit 9e67600ed6b8 ("scsi: iscsi: Fix race condition between login and sync thread") I missed that libiscsi was now setting the iscsi class state, and that patch ended up resetting the state during conn stoppage and using the wrong state value during ep_disconnect. This patch moves the setting of the class state to the class module and then fixes the two issues above.
--- drivers/scsi/libiscsi.c | 26 +++----------------------- drivers/scsi/scsi_transport_iscsi.c | 18 +++++++++++++++--- 2 files changed, 18 insertions(+), 26 deletions(-)
drivers/scsi/libiscsi.c +3 -23
@@ -3179,9 +3179,10 @@ fail_mgmt_tasks(struct iscsi_session *session, struct iscsi_conn *conn) } } -static void iscsi_start_session_recovery (struct iscsi_session *session, -struct iscsi_conn *conn,int flag) +void iscsi_conn_stop (struct iscsi_cls_conn *cls_conn,int flag) { +struct iscsi_conn *conn = cls_conn->dd_data; +struct iscsi_session *session = conn->session;int old_stop_stage;mutex_lock (&session->eh_mutex);
@@ -3239,27 +3240,6 @@ static void iscsi_start_session_recovery(struct iscsi_session *session,spin_unlock_bh (&session->frwd_lock);mutex_unlock (&session->eh_mutex); } - -void iscsi_conn_stop (struct iscsi_cls_conn *cls_conn,int flag) -{ -struct iscsi_conn *conn = cls_conn->dd_data; -struct iscsi_session *session = conn->session; - -switch (flag) { -case STOP_CONN_RECOVER : - cls_conn->state =ISCSI_CONN_FAILED ; -break ; -case STOP_CONN_TERM : - cls_conn->state =ISCSI_CONN_DOWN ; -break ; -default : -iscsi_conn_printk (KERN_ERR , conn, -"invalid stop flag %d\n" , flag); -return ; - } - -iscsi_start_session_recovery (session, conn, flag); -}EXPORT_SYMBOL_GPL (iscsi_conn_stop); int iscsi_conn_bind(struct iscsi_cls_session *cls_session,
drivers/scsi/scsi_transport_iscsi.c +15 -3
@@ -2474,10 +2474,22 @@ static void iscsi_if_stop_conn(struct iscsi_cls_conn *conn, int flag)* it works. */ mutex_lock (&conn_mutex); +switch (flag) { +case STOP_CONN_RECOVER : + conn->state =ISCSI_CONN_FAILED ; +break ; +case STOP_CONN_TERM : + conn->state =ISCSI_CONN_DOWN ; +break ; +default : +iscsi_cls_conn_printk (KERN_ERR , conn, +"invalid stop flag %d\n" , flag); + goto unlock; + } + conn->transport->stop_conn (conn, flag); - conn->state =ISCSI_CONN_DOWN ; +unlock:mutex_unlock (&conn_mutex); - }static void stop_conn_work_fn (struct work_struct *work)
@@ -2968,7 +2980,7 @@ static int iscsi_if_ep_disconnect(struct iscsi_transport *transport,mutex_lock (&conn->ep_mutex); conn->ep =NULL ;mutex_unlock (&conn->ep_mutex); - conn->state =ISCSI_CONN_DOWN ; + conn->state =ISCSI_CONN_FAILED ; } transport->ep_disconnect (ep);
Signature · 1 line
2.25.1
Martin K. Petersen
AppliedQuoted 6 lines · Mike Christie
In commit
9e67600ed6b8("scsi: iscsi: Fix race condition between login and sync thread") I missed that libiscsi was now setting the iscsi class state, and that patch ended up resetting the state during conn stoppage and using the wrong state value duringep_disconnect. This patch moves the setting of the class state to the class module and then fixes the two issues above.
Applied to 5.12/scsi-fixes, thanks!
[1/1] scsi: iscsi: fix iscsi cls conn state
https://git.kernel.org/mkp/scsi/c/0dcf8febcb7b
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering