Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e618c61 authored by Mike Christie's avatar Mike Christie Committed by Greg Kroah-Hartman
Browse files

scsi: iscsi: Unblock session then wake up error handler 

[ Upstream commit a0c2f8b6709a9a4af175497ca65f93804f57b248 ]

We can race where iscsi_session_recovery_timedout() has woken up the error
handler thread and it's now setting the devices to offline, and
session_recovery_timedout()'s call to scsi_target_unblock() is also trying
to set the device's state to transport-offline. We can then get a mix of
states.

For the case where we can't relogin we want the devices to be in
transport-offline so when we have repaired the connection
__iscsi_unblock_session() can set the state back to running.

Set the device state then call into libiscsi to wake up the error handler.

Link: https://lore.kernel.org/r/20211105221048.6541-2-michael.christie@oracle.com


Reviewed-by: default avatarLee Duncan <lduncan@suse.com>
Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ad4d6cd6

drivers/scsi/scsi_transport_iscsi.c

+3 −3
Original line number Diff line number Diff line
@@ -1892,12 +1892,12 @@ static void session_recovery_timedout(struct work_struct *work) 
	}

	spin_unlock_irqrestore(&session->lock, flags);



	if (session->transport->session_recovery_timedout)

		session->transport->session_recovery_timedout(session);



	ISCSI_DBG_TRANS_SESSION(session, "Unblocking SCSI target\n");

	scsi_target_unblock(&session->dev, SDEV_TRANSPORT_OFFLINE);

	ISCSI_DBG_TRANS_SESSION(session, "Completed unblocking SCSI target\n");



	if (session->transport->session_recovery_timedout)

		session->transport->session_recovery_timedout(session);

}



static void __iscsi_unblock_session(struct work_struct *work)