From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Quinn Tran <qutran@marvell.com>,
Himanshu Madhani <himanshu.madhani@oracle.com>,
Nilesh Javali <njavali@marvell.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Sasha Levin <sashal@kernel.org>,
linux-scsi@vger.kernel.org
Subject: [PATCH AUTOSEL 5.4 28/38] scsi: qla2xxx: Fix login timeout
Date: Mon, 24 Aug 2020 12:37:40 -0400 [thread overview]
Message-ID: <20200824163751.606577-28-sashal@kernel.org> (raw)
In-Reply-To: <20200824163751.606577-1-sashal@kernel.org>
From: Quinn Tran <qutran@marvell.com>
[ Upstream commit abb31aeaa9b20680b0620b23fea5475ea4591e31 ]
Multipath errors were seen during failback due to login timeout. The
remote device sent LOGO, the local host tore down the session and did
relogin. The RSCN arrived indicates remote device is going through failover
after which the relogin is in a 20s timeout phase. At this point the
driver is stuck in the relogin process. Add a fix to delete the session as
part of abort/flush the login.
Link: https://lore.kernel.org/r/20200806111014.28434-5-njavali@marvell.com
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/scsi/qla2xxx/qla_gs.c | 18 +++++++++++++++---
drivers/scsi/qla2xxx/qla_target.c | 2 +-
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index a44de4c5dcf6c..fc6e12fb7d77b 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -3673,10 +3673,22 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)
}
if (fcport->scan_state != QLA_FCPORT_FOUND) {
+ bool do_delete = false;
+
+ if (fcport->scan_needed &&
+ fcport->disc_state == DSC_LOGIN_PEND) {
+ /* Cable got disconnected after we sent
+ * a login. Do delete to prevent timeout.
+ */
+ fcport->logout_on_delete = 1;
+ do_delete = true;
+ }
+
fcport->scan_needed = 0;
- if ((qla_dual_mode_enabled(vha) ||
- qla_ini_mode_enabled(vha)) &&
- atomic_read(&fcport->state) == FCS_ONLINE) {
+ if (((qla_dual_mode_enabled(vha) ||
+ qla_ini_mode_enabled(vha)) &&
+ atomic_read(&fcport->state) == FCS_ONLINE) ||
+ do_delete) {
if (fcport->loop_id != FC_NO_LOOP_ID) {
if (fcport->flags & FCF_FCP2_DEVICE)
fcport->logout_on_delete = 0;
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index cb8a892e2d393..b75e6e4d58c06 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -1262,7 +1262,7 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess)
qla24xx_chk_fcp_state(sess);
- ql_dbg(ql_dbg_tgt, sess->vha, 0xe001,
+ ql_dbg(ql_dbg_disc, sess->vha, 0xe001,
"Scheduling sess %p for deletion %8phC\n",
sess, sess->port_name);
--
2.25.1
next prev parent reply other threads:[~2020-08-24 17:02 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-24 16:37 [PATCH AUTOSEL 5.4 01/38] spi: stm32: clear only asserted irq flags on interrupt Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 02/38] jbd2: make sure jh have b_transaction set in refile/unfile_buffer Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 03/38] ext4: don't BUG on inconsistent journal feature Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 04/38] ext4: handle read only external journal device Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 05/38] jbd2: abort journal if free a async write error metadata buffer Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 06/38] ext4: handle option set by mount flags correctly Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 07/38] ext4: handle error of ext4_setup_system_zone() on remount Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 08/38] ext4: correctly restore system zone info when remount fails Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 09/38] fs: prevent BUG_ON in submit_bh_wbc() Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 10/38] spi: stm32h7: fix race condition at end of transfer Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 11/38] spi: stm32: fix fifo threshold level in case of short transfer Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 12/38] spi: stm32: fix stm32_spi_prepare_mbr in case of odd clk_rate Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 13/38] spi: stm32: always perform registers configuration prior to transfer Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 14/38] drm/amd/powerplay: correct Vega20 cached smu feature state Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 15/38] drm/amd/powerplay: correct UVD/VCE PG state on custom pptable uploading Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 16/38] drm/amd/display: Switch to immediate mode for updating infopackets Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 17/38] libbpf: Handle GCC built-in types for Arm NEON Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 18/38] netfilter: avoid ipv6 -> nf_defrag_ipv6 module dependency Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 19/38] can: j1939: transport: j1939_xtp_rx_dat_one(): compare own packets to detect corruptions Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 20/38] ALSA: hda/realtek: Add model alc298-samsung-headphone Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 21/38] s390/cio: add cond_resched() in the slow_eval_known_fn() loop Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 22/38] ASoC: wm8994: Avoid attempts to read unreadable registers Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 23/38] selftests: disable rp_filter for icmp_redirect.sh Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 24/38] scsi: fcoe: Fix I/O path allocation Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 25/38] scsi: ufs: Fix possible infinite loop in ufshcd_hold Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 26/38] scsi: ufs: Improve interrupt handling for shared interrupts Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 27/38] scsi: ufs: Clean up completed request without interrupt notification Sasha Levin
2020-08-24 16:37 ` Sasha Levin [this message]
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 29/38] scsi: qla2xxx: Check if FW supports MQ before enabling Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 30/38] scsi: qla2xxx: Fix null pointer access during disconnect from subsystem Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 31/38] Revert "scsi: qla2xxx: Fix crash on qla2x00_mailbox_command" Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 32/38] macvlan: validate setting of multiple remote source MAC addresses Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 33/38] net: gianfar: Add of_node_put() before goto statement Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 34/38] drm/amdgpu: disable gfxoff for navy_flounder Sasha Levin
2020-08-24 18:25 ` Alex Deucher
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 35/38] Revert "drm/amdgpu: disable gfxoff for navy_flounder" Sasha Levin
2020-08-24 18:25 ` Alex Deucher
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 36/38] powerpc/perf: Fix soft lockups due to missed interrupt accounting Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 37/38] arm64: Move handling of erratum 1418040 into C code Sasha Levin
2020-08-24 16:37 ` [PATCH AUTOSEL 5.4 38/38] arm64: Allow booting of late CPUs affected by erratum 1418040 Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200824163751.606577-28-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=himanshu.madhani@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=njavali@marvell.com \
--cc=qutran@marvell.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome