|
Daniel Wagner |
3dc148 |
From: Quinn Tran <qutran@marvell.com>
|
|
Daniel Wagner |
3dc148 |
Date: Tue, 17 Dec 2019 14:06:11 -0800
|
|
Daniel Wagner |
3dc148 |
Subject: scsi: qla2xxx: Fix stuck login session using prli_pend_timer
|
|
Denis Kirjanov |
1c92e0 |
Patch-mainline: v5.6-rc1
|
|
Daniel Wagner |
3dc148 |
Git-commit: 8aaac2d7da873aebeba92c666f82c00bbd74aaf9
|
|
Daniel Wagner |
3dc148 |
References: bsc#1158013
|
|
Daniel Wagner |
3dc148 |
|
|
Daniel Wagner |
3dc148 |
Session is stuck if driver sees FW has received a PRLI. Driver allows FW to
|
|
Daniel Wagner |
3dc148 |
finish with processing of PRLI by checking back with FW at a later time to
|
|
Daniel Wagner |
3dc148 |
see if the PRLI has finished. Instead, driver failed to push forward after
|
|
Daniel Wagner |
3dc148 |
re-checking PRLI completion.
|
|
Daniel Wagner |
3dc148 |
|
|
Daniel Wagner |
3dc148 |
Fixes: ce0ba496dccf ("scsi: qla2xxx: Fix stuck login session")
|
|
Daniel Wagner |
3dc148 |
Cc: stable@vger.kernel.org # 5.3
|
|
Daniel Wagner |
3dc148 |
Link: https://lore.kernel.org/r/20191217220617.28084-9-hmadhani@marvell.com
|
|
Daniel Wagner |
3dc148 |
Signed-off-by: Quinn Tran <qutran@marvell.com>
|
|
Daniel Wagner |
3dc148 |
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
|
|
Daniel Wagner |
3dc148 |
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
Daniel Wagner |
3dc148 |
Acked-by: Daniel Wagner <dwagner@suse.de>
|
|
Daniel Wagner |
3dc148 |
---
|
|
Daniel Wagner |
3dc148 |
drivers/scsi/qla2xxx/qla_def.h | 5 +++++
|
|
Daniel Wagner |
3dc148 |
drivers/scsi/qla2xxx/qla_init.c | 34 ++++++++++++++++++++++++++--------
|
|
Daniel Wagner |
3dc148 |
drivers/scsi/qla2xxx/qla_target.c | 1 +
|
|
Daniel Wagner |
3dc148 |
3 files changed, 32 insertions(+), 8 deletions(-)
|
|
Daniel Wagner |
3dc148 |
|
|
Daniel Wagner |
3dc148 |
--- a/drivers/scsi/qla2xxx/qla_def.h
|
|
Daniel Wagner |
3dc148 |
+++ b/drivers/scsi/qla2xxx/qla_def.h
|
|
Daniel Wagner |
3dc148 |
@@ -2402,6 +2402,7 @@ typedef struct fc_port {
|
|
Daniel Wagner |
3dc148 |
unsigned int scan_needed:1;
|
|
Daniel Wagner |
3dc148 |
unsigned int n2n_flag:1;
|
|
Daniel Wagner |
3dc148 |
unsigned int explicit_logout:1;
|
|
Daniel Wagner |
3dc148 |
+ unsigned int prli_pend_timer:1;
|
|
Daniel Wagner |
3dc148 |
|
|
Daniel Wagner |
3dc148 |
struct completion nvme_del_done;
|
|
Daniel Wagner |
3dc148 |
uint32_t nvme_prli_service_param;
|
|
Daniel Wagner |
3dc148 |
@@ -2428,6 +2429,7 @@ typedef struct fc_port {
|
|
Daniel Wagner |
3dc148 |
struct work_struct free_work;
|
|
Daniel Wagner |
3dc148 |
struct work_struct reg_work;
|
|
Daniel Wagner |
3dc148 |
uint64_t jiffies_at_registration;
|
|
Daniel Wagner |
3dc148 |
+ unsigned long prli_expired;
|
|
Daniel Wagner |
3dc148 |
struct qlt_plogi_ack_t *plogi_link[QLT_PLOGI_LINK_MAX];
|
|
Daniel Wagner |
3dc148 |
|
|
Daniel Wagner |
3dc148 |
uint16_t tgt_id;
|
|
Daniel Wagner |
3dc148 |
@@ -4856,6 +4858,9 @@ struct sff_8247_a0 {
|
|
Daniel Wagner |
3dc148 |
(ha->fc4_type_priority == FC4_PRIORITY_NVME)) || \
|
|
Daniel Wagner |
3dc148 |
NVME_ONLY_TARGET(fcport)) \
|
|
Daniel Wagner |
3dc148 |
|
|
Daniel Wagner |
3dc148 |
+#define PRLI_PHASE(_cls) \
|
|
Daniel Wagner |
3dc148 |
+ ((_cls == DSC_LS_PRLI_PEND) || (_cls == DSC_LS_PRLI_COMP))
|
|
Daniel Wagner |
3dc148 |
+
|
|
Daniel Wagner |
3dc148 |
#include "qla_target.h"
|
|
Daniel Wagner |
3dc148 |
#include "qla_gbl.h"
|
|
Daniel Wagner |
3dc148 |
#include "qla_dbg.h"
|
|
Daniel Wagner |
3dc148 |
--- a/drivers/scsi/qla2xxx/qla_init.c
|
|
Daniel Wagner |
3dc148 |
+++ b/drivers/scsi/qla2xxx/qla_init.c
|
|
Daniel Wagner |
3dc148 |
@@ -675,7 +675,7 @@ static void qla24xx_handle_gnl_done_even
|
|
Daniel Wagner |
3dc148 |
port_id_t id;
|
|
Daniel Wagner |
3dc148 |
u64 wwn;
|
|
Daniel Wagner |
3dc148 |
u16 data[2];
|
|
Daniel Wagner |
3dc148 |
- u8 current_login_state;
|
|
Daniel Wagner |
3dc148 |
+ u8 current_login_state, nvme_cls;
|
|
Daniel Wagner |
3dc148 |
|
|
Daniel Wagner |
3dc148 |
fcport = ea->fcport;
|
|
Daniel Wagner |
3dc148 |
ql_dbg(ql_dbg_disc, vha, 0xffff,
|
|
Daniel Wagner |
3dc148 |
@@ -734,10 +734,17 @@ static void qla24xx_handle_gnl_done_even
|
|
Daniel Wagner |
3dc148 |
|
|
Daniel Wagner |
3dc148 |
loop_id = le16_to_cpu(e->nport_handle);
|
|
Daniel Wagner |
3dc148 |
loop_id = (loop_id & 0x7fff);
|
|
Daniel Wagner |
3dc148 |
- if (NVME_TARGET(vha->hw, fcport))
|
|
Daniel Wagner |
3dc148 |
- current_login_state = e->current_login_state >> 4;
|
|
Daniel Wagner |
3dc148 |
- else
|
|
Daniel Wagner |
3dc148 |
- current_login_state = e->current_login_state & 0xf;
|
|
Daniel Wagner |
3dc148 |
+ nvme_cls = e->current_login_state >> 4;
|
|
Daniel Wagner |
3dc148 |
+ current_login_state = e->current_login_state & 0xf;
|
|
Daniel Wagner |
3dc148 |
+
|
|
Daniel Wagner |
3dc148 |
+ if (PRLI_PHASE(nvme_cls)) {
|
|
Daniel Wagner |
3dc148 |
+ current_login_state = nvme_cls;
|
|
Daniel Wagner |
3dc148 |
+ fcport->fc4_type &= ~FS_FC4TYPE_FCP;
|
|
Daniel Wagner |
3dc148 |
+ fcport->fc4_type |= FS_FC4TYPE_NVME;
|
|
Daniel Wagner |
3dc148 |
+ } else if (PRLI_PHASE(current_login_state)) {
|
|
Daniel Wagner |
3dc148 |
+ fcport->fc4_type |= FS_FC4TYPE_FCP;
|
|
Daniel Wagner |
3dc148 |
+ fcport->fc4_type &= ~FS_FC4TYPE_NVME;
|
|
Daniel Wagner |
3dc148 |
+ }
|
|
Daniel Wagner |
3dc148 |
|
|
Daniel Wagner |
3dc148 |
ql_dbg(ql_dbg_disc, vha, 0x20e2,
|
|
Daniel Wagner |
3dc148 |
"%s found %8phC CLS [%x|%x] fc4_type %d ID[%06x|%06x] lid[%d|%d]\n",
|
|
Daniel Wagner |
3dc148 |
@@ -1209,12 +1216,19 @@ qla24xx_async_prli(struct scsi_qla_host
|
|
Daniel Wagner |
3dc148 |
struct srb_iocb *lio;
|
|
Daniel Wagner |
3dc148 |
int rval = QLA_FUNCTION_FAILED;
|
|
Daniel Wagner |
3dc148 |
|
|
Daniel Wagner |
3dc148 |
- if (!vha->flags.online)
|
|
Daniel Wagner |
3dc148 |
+ if (!vha->flags.online) {
|
|
Daniel Wagner |
3dc148 |
+ ql_dbg(ql_dbg_disc, vha, 0xffff, "%s %d %8phC exit\n",
|
|
Daniel Wagner |
3dc148 |
+ __func__, __LINE__, fcport->port_name);
|
|
Daniel Wagner |
3dc148 |
return rval;
|
|
Daniel Wagner |
3dc148 |
+ }
|
|
Daniel Wagner |
3dc148 |
|
|
Daniel Wagner |
3dc148 |
- if (fcport->fw_login_state == DSC_LS_PLOGI_PEND ||
|
|
Daniel Wagner |
3dc148 |
- fcport->fw_login_state == DSC_LS_PRLI_PEND)
|
|
Daniel Wagner |
3dc148 |
+ if ((fcport->fw_login_state == DSC_LS_PLOGI_PEND ||
|
|
Daniel Wagner |
3dc148 |
+ fcport->fw_login_state == DSC_LS_PRLI_PEND) &&
|
|
Daniel Wagner |
3dc148 |
+ qla_dual_mode_enabled(vha)) {
|
|
Daniel Wagner |
3dc148 |
+ ql_dbg(ql_dbg_disc, vha, 0xffff, "%s %d %8phC exit\n",
|
|
Daniel Wagner |
3dc148 |
+ __func__, __LINE__, fcport->port_name);
|
|
Daniel Wagner |
3dc148 |
return rval;
|
|
Daniel Wagner |
3dc148 |
+ }
|
|
Daniel Wagner |
3dc148 |
|
|
Daniel Wagner |
3dc148 |
sp = qla2x00_get_sp(vha, fcport, GFP_KERNEL);
|
|
Daniel Wagner |
3dc148 |
if (!sp)
|
|
Daniel Wagner |
3dc148 |
@@ -1593,6 +1607,10 @@ int qla24xx_fcport_handle_login(struct s
|
|
Daniel Wagner |
3dc148 |
break;
|
|
Daniel Wagner |
3dc148 |
default:
|
|
Daniel Wagner |
3dc148 |
if (fcport->login_pause) {
|
|
Daniel Wagner |
3dc148 |
+ ql_dbg(ql_dbg_disc, vha, 0x20d8,
|
|
Daniel Wagner |
3dc148 |
+ "%s %d %8phC exit\n",
|
|
Daniel Wagner |
3dc148 |
+ __func__, __LINE__,
|
|
Daniel Wagner |
3dc148 |
+ fcport->port_name);
|
|
Daniel Wagner |
3dc148 |
fcport->last_rscn_gen = fcport->rscn_gen;
|
|
Daniel Wagner |
3dc148 |
fcport->last_login_gen = fcport->login_gen;
|
|
Daniel Wagner |
3dc148 |
set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
|
|
Daniel Wagner |
3dc148 |
--- a/drivers/scsi/qla2xxx/qla_target.c
|
|
Daniel Wagner |
3dc148 |
+++ b/drivers/scsi/qla2xxx/qla_target.c
|
|
Daniel Wagner |
3dc148 |
@@ -1267,6 +1267,7 @@ void qlt_schedule_sess_for_deletion(stru
|
|
Daniel Wagner |
3dc148 |
sess->deleted = QLA_SESS_DELETION_IN_PROGRESS;
|
|
Daniel Wagner |
3dc148 |
spin_unlock_irqrestore(&sess->vha->work_lock, flags);
|
|
Daniel Wagner |
3dc148 |
|
|
Daniel Wagner |
3dc148 |
+ sess->prli_pend_timer = 0;
|
|
Daniel Wagner |
3dc148 |
qla2x00_set_fcport_disc_state(sess, DSC_DELETE_PEND);
|
|
Daniel Wagner |
3dc148 |
|
|
Daniel Wagner |
3dc148 |
qla24xx_chk_fcp_state(sess);
|