From patchwork Fri Jan 19 20:35:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael David Tinoco X-Patchwork-Id: 864216 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3zQ7vj5T4Cz9sNx; Mon, 22 Jan 2018 22:08:17 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1edZxP-0005ts-Rj; Mon, 22 Jan 2018 11:08:07 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1ecdO5-0002YW-7V for kernel-team@lists.ubuntu.com; Fri, 19 Jan 2018 20:35:45 +0000 Received: from mail-qt0-f200.google.com ([209.85.216.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1ecdO4-0004A6-T9 for kernel-team@lists.ubuntu.com; Fri, 19 Jan 2018 20:35:44 +0000 Received: by mail-qt0-f200.google.com with SMTP id r23so4318334qte.13 for ; Fri, 19 Jan 2018 12:35:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=f/cgnFzSGVeVXphxzWe69XSHPmlj2OXV8NckpfpUSfg=; b=N0Z8gAZRa9RrE32r/hDkiYhFHr1oa+DiLbIUTzrsvoRUw/hS6+cjgxWJJukpwJE6YG h9PHxLnPe/c+OTZersFyJfPJUM/8iUdb0XT97tOIOxdr0TTfTjcAU0otvbpLADJc+iXJ lSHrdDJ6I2e3q9g93zGEjqvCGHHgczgXXvtCnoYn85Bney2CZlQj5irDPnA6WLHoKrEr JIa+H9uKimr3Bh6xruFDNMEaKX/rN1uHlwVrlgsuJks8wykCrYEcDzQ0WAx2ACYPEpDF xgY+EiPdnlCae8CqL6K2eW0mz6cIpF9x/+dUAFRCilOCjUQGVfO2OsQJLfDkGERtB3Wx rAmw== X-Gm-Message-State: AKwxyte8arSIYo2auF8DA9zCFv+CcXkqap0exSrcEKVTyK46cRBKOK9M XDIHozwk3vFI+6/QbOM3TOIUk0tHD2b4sagpnLlwUfs15RL3Bc032fCqJt/ObcGUHP1BymQIUr+ 1PfY/Cf/yEwlvcFKI4Hfgob7ipUxcKO1EJwNKFcdqNA== X-Received: by 10.55.78.149 with SMTP id c143mr61274081qkb.30.1516394143608; Fri, 19 Jan 2018 12:35:43 -0800 (PST) X-Google-Smtp-Source: ACJfBotpmGF7s1tiwbgr3TJTGhFhOwC/evSqCGFkMJW5gXo3etZX+5et8yZ5OhO4hCNgR7vjWzoJ4w== X-Received: by 10.55.78.149 with SMTP id c143mr61274064qkb.30.1516394143280; Fri, 19 Jan 2018 12:35:43 -0800 (PST) Received: from workstation.celeiro.br ([177.220.173.115]) by smtp.gmail.com with ESMTPSA id p40sm6954260qtp.25.2018.01.19.12.35.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Jan 2018 12:35:42 -0800 (PST) From: Rafael David Tinoco To: kernel-team@lists.ubuntu.com Subject: [PATCH][SRU][Bionic] scsi: libiscsi: Allow sd_shutdown on bad transport Date: Fri, 19 Jan 2018 20:35:39 +0000 Message-Id: <20180119203539.17885-1-rafael.tinoco@canonical.com> X-Mailer: git-send-email 2.14.1 X-Mailman-Approved-At: Mon, 22 Jan 2018 11:08:04 +0000 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: rafael.tinoco@canonical.com MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1569925 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 (cherry-picked from commit d754941225a7dbc61f6dd2173fa9498049f9a7ee next-20180117) Reviewed-by: Lee Duncan Signed-off-by: Martin K. Petersen Signed-off-by: Rafael David Tinoco Reviewed-by: [...] Signed-off-by: [...] Signed-off-by: Rafael David Tinoco --- drivers/scsi/libiscsi.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 42381adf0769..f11c16500ff1 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -1696,6 +1696,15 @@ int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc) */ switch (session->state) { case ISCSI_STATE_FAILED: + /* + * cmds should fail during shutdown, if the session + * state is bad, allowing completion to happen + */ + if (unlikely(system_state != SYSTEM_RUNNING)) { + reason = FAILURE_SESSION_FAILED; + sc->result = DID_NO_CONNECT << 16; + break; + } case ISCSI_STATE_IN_RECOVERY: reason = FAILURE_SESSION_IN_RECOVERY; sc->result = DID_IMM_RETRY << 16; @@ -1980,6 +1989,19 @@ enum blk_eh_timer_return iscsi_eh_cmd_timed_out(struct scsi_cmnd *sc) } if (session->state != ISCSI_STATE_LOGGED_IN) { + /* + * During shutdown, if session is prematurely disconnected, + * recovery won't happen and there will be hung cmds. Not + * handling cmds would trigger EH, also bad in this case. + * Instead, handle cmd, allow completion to happen and let + * upper layer to deal with the result. + */ + if (unlikely(system_state != SYSTEM_RUNNING)) { + sc->result = DID_NO_CONNECT << 16; + ISCSI_DBG_EH(session, "sc on shutdown, handled\n"); + rc = BLK_EH_HANDLED; + goto done; + } /* * We are probably in the middle of iscsi recovery so let * that complete and handle the error. @@ -2084,7 +2106,7 @@ enum blk_eh_timer_return iscsi_eh_cmd_timed_out(struct scsi_cmnd *sc) task->last_timeout = jiffies; spin_unlock(&session->frwd_lock); ISCSI_DBG_EH(session, "return %s\n", rc == BLK_EH_RESET_TIMER ? - "timer reset" : "nh"); + "timer reset" : "shutdown or nh"); return rc; } EXPORT_SYMBOL_GPL(iscsi_eh_cmd_timed_out);