Skip to content

Commit 3807b6f

Browse files
Rafael David Tinocogregkh
Rafael David Tinoco
authored andcommitted
scsi: libiscsi: Allow sd_shutdown on bad transport
[ Upstream commit d754941 ] If, for any reason, userland shuts down iscsi transport interfaces before proper logouts - like when logging in to LUNs manually, without logging out on server shutdown, or when automated scripts can't umount/logout from logged LUNs - kernel will hang forever on its sd_sync_cache() logic, after issuing the SYNCHRONIZE_CACHE cmd to all still existent paths. PID: 1 TASK: ffff8801a69b8000 CPU: 1 COMMAND: "systemd-shutdow" #0 [ffff8801a69c3a30] __schedule at ffffffff8183e9ee #1 [ffff8801a69c3a80] schedule at ffffffff8183f0d5 #2 [ffff8801a69c3a98] schedule_timeout at ffffffff81842199 #3 [ffff8801a69c3b40] io_schedule_timeout at ffffffff8183e604 #4 [ffff8801a69c3b70] wait_for_completion_io_timeout at ffffffff8183fc6c #5 [ffff8801a69c3bd0] blk_execute_rq at ffffffff813cfe10 #6 [ffff8801a69c3c88] scsi_execute at ffffffff815c3fc7 #7 [ffff8801a69c3cc8] scsi_execute_req_flags at ffffffff815c60fe #8 [ffff8801a69c3d30] sd_sync_cache at ffffffff815d37d7 #9 [ffff8801a69c3da8] sd_shutdown at ffffffff815d3c3c This happens because iscsi_eh_cmd_timed_out(), the transport layer timeout helper, would tell the queue timeout function (scsi_times_out) to reset the request timer over and over, until the session state is back to logged in state. Unfortunately, during server shutdown, this might never happen again. Other option would be "not to handle" the issue in the transport layer. That would trigger the error handler logic, which would also need the session state to be logged in again. Best option, for such case, is to tell upper layers that the command was handled during the transport layer error handler helper, marking it as DID_NO_CONNECT, which will allow completion and inform about the problem. After the session was marked as ISCSI_STATE_FAILED, due to the first timeout during the server shutdown phase, all subsequent cmds will fail to be queued, allowing upper logic to fail faster. Signed-off-by: Rafael David Tinoco <[email protected]> Reviewed-by: Lee Duncan <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 978c281 commit 3807b6f

File tree

1 file changed

+23
-1
lines changed

1 file changed

+23
-1
lines changed

drivers/scsi/libiscsi.c

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1696,6 +1696,15 @@ int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc)
16961696
*/
16971697
switch (session->state) {
16981698
case ISCSI_STATE_FAILED:
1699+
/*
1700+
* cmds should fail during shutdown, if the session
1701+
* state is bad, allowing completion to happen
1702+
*/
1703+
if (unlikely(system_state != SYSTEM_RUNNING)) {
1704+
reason = FAILURE_SESSION_FAILED;
1705+
sc->result = DID_NO_CONNECT << 16;
1706+
break;
1707+
}
16991708
case ISCSI_STATE_IN_RECOVERY:
17001709
reason = FAILURE_SESSION_IN_RECOVERY;
17011710
sc->result = DID_IMM_RETRY << 16;
@@ -1980,6 +1989,19 @@ enum blk_eh_timer_return iscsi_eh_cmd_timed_out(struct scsi_cmnd *sc)
19801989
}
19811990

19821991
if (session->state != ISCSI_STATE_LOGGED_IN) {
1992+
/*
1993+
* During shutdown, if session is prematurely disconnected,
1994+
* recovery won't happen and there will be hung cmds. Not
1995+
* handling cmds would trigger EH, also bad in this case.
1996+
* Instead, handle cmd, allow completion to happen and let
1997+
* upper layer to deal with the result.
1998+
*/
1999+
if (unlikely(system_state != SYSTEM_RUNNING)) {
2000+
sc->result = DID_NO_CONNECT << 16;
2001+
ISCSI_DBG_EH(session, "sc on shutdown, handled\n");
2002+
rc = BLK_EH_HANDLED;
2003+
goto done;
2004+
}
19832005
/*
19842006
* We are probably in the middle of iscsi recovery so let
19852007
* that complete and handle the error.
@@ -2084,7 +2106,7 @@ enum blk_eh_timer_return iscsi_eh_cmd_timed_out(struct scsi_cmnd *sc)
20842106
task->last_timeout = jiffies;
20852107
spin_unlock(&session->frwd_lock);
20862108
ISCSI_DBG_EH(session, "return %s\n", rc == BLK_EH_RESET_TIMER ?
2087-
"timer reset" : "nh");
2109+
"timer reset" : "shutdown or nh");
20882110
return rc;
20892111
}
20902112
EXPORT_SYMBOL_GPL(iscsi_eh_cmd_timed_out);

0 commit comments

Comments
 (0)