Commit 0dcf8feb authored by Mike Christie's avatar Mike Christie Committed by Martin K. Petersen
Browse files

scsi: iscsi: Fix iSCSI cls conn state 

In commit 9e67600e ("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.

Link: https://lore.kernel.org/r/20210406171746.5016-1-michael.christie@oracle.com


Fixes: 9e67600e ("scsi: iscsi: Fix race condition between login and sync thread")
Cc: Gulam Mohamed <gulam.mohamed@oracle.com>
Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 5cd0f6f5

drivers/scsi/libiscsi.c

+3 −23
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -2470,10 +2470,22 @@ static void iscsi_if_stop_conn(struct iscsi_cls_conn *conn, int flag) 
	 * it works.

	 */

	mutex_lock(&conn_mutex);

	conn->transport->stop_conn(conn, flag);

	switch (flag) {

	case STOP_CONN_RECOVER:

		conn->state = ISCSI_CONN_FAILED;

		break;

	case STOP_CONN_TERM:

		conn->state = ISCSI_CONN_DOWN;

	mutex_unlock(&conn_mutex);

		break;

	default:

		iscsi_cls_conn_printk(KERN_ERR, conn,

				      "invalid stop flag %d\n", flag);

		goto unlock;

	}



	conn->transport->stop_conn(conn, flag);

unlock:

	mutex_unlock(&conn_mutex);

}



static void stop_conn_work_fn(struct work_struct *work)
@@ -2961,7 +2973,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);