Skip to content

Commit 7f2a398

Browse files
Quinn Tranmartinkpetersen
Quinn Tran
authored and
martinkpetersen
committed
scsi: qla2xxx: Fix N2N link reset
Fix stalled link recovery for N2N with FC-NVMe connection. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Quinn Tran <[email protected]> Signed-off-by: Himanshu Madhani <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent f5187b7 commit 7f2a398

File tree

4 files changed

+103
-34
lines changed

4 files changed

+103
-34
lines changed

‎drivers/scsi/qla2xxx/qla_def.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2396,6 +2396,7 @@ typedef struct fc_port {
23962396
unsigned int query:1;
23972397
unsigned int id_changed:1;
23982398
unsigned int scan_needed:1;
2399+
unsigned int n2n_flag:1;
23992400

24002401
struct completion nvme_del_done;
24012402
uint32_t nvme_prli_service_param;
@@ -2446,7 +2447,6 @@ typedef struct fc_port {
24462447
uint8_t fc4_type;
24472448
uint8_t fc4f_nvme;
24482449
uint8_t scan_state;
2449-
uint8_t n2n_flag;
24502450

24512451
unsigned long last_queue_full;
24522452
unsigned long last_ramp_up;
@@ -3036,6 +3036,7 @@ enum scan_flags_t {
30363036
enum fc4type_t {
30373037
FS_FC4TYPE_FCP = BIT_0,
30383038
FS_FC4TYPE_NVME = BIT_1,
3039+
FS_FCP_IS_N2N = BIT_7,
30393040
};
30403041

30413042
struct fab_scan_rp {

‎drivers/scsi/qla2xxx/qla_init.c

Lines changed: 77 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -746,19 +746,24 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha,
746746
break;
747747
default:
748748
if ((id.b24 != fcport->d_id.b24 &&
749-
fcport->d_id.b24) ||
749+
fcport->d_id.b24 &&
750+
fcport->loop_id != FC_NO_LOOP_ID) ||
750751
(fcport->loop_id != FC_NO_LOOP_ID &&
751752
fcport->loop_id != loop_id)) {
752753
ql_dbg(ql_dbg_disc, vha, 0x20e3,
753754
"%s %d %8phC post del sess\n",
754755
__func__, __LINE__, fcport->port_name);
756+
if (fcport->n2n_flag)
757+
fcport->d_id.b24 = 0;
755758
qlt_schedule_sess_for_deletion(fcport);
756759
return;
757760
}
758761
break;
759762
}
760763

761764
fcport->loop_id = loop_id;
765+
if (fcport->n2n_flag)
766+
fcport->d_id.b24 = id.b24;
762767

763768
wwn = wwn_to_u64(fcport->port_name);
764769
qlt_find_sess_invalidate_other(vha, wwn,
@@ -972,7 +977,7 @@ static void qla24xx_async_gnl_sp_done(srb_t *sp, int res)
972977
wwn = wwn_to_u64(e->port_name);
973978

974979
ql_dbg(ql_dbg_disc + ql_dbg_verbose, vha, 0x20e8,
975-
"%s %8phC %02x:%02x:%02x state %d/%d lid %x \n",
980+
"%s %8phC %02x:%02x:%02x CLS %x/%x lid %x \n",
976981
__func__, (void *)&wwn, e->port_id[2], e->port_id[1],
977982
e->port_id[0], e->current_login_state, e->last_login_state,
978983
(loop_id & 0x7fff));
@@ -1499,7 +1504,8 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)
14991504
(fcport->fw_login_state == DSC_LS_PRLI_PEND)))
15001505
return 0;
15011506

1502-
if (fcport->fw_login_state == DSC_LS_PLOGI_COMP) {
1507+
if (fcport->fw_login_state == DSC_LS_PLOGI_COMP &&
1508+
!N2N_TOPO(vha->hw)) {
15031509
if (time_before_eq(jiffies, fcport->plogi_nack_done_deadline)) {
15041510
set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
15051511
return 0;
@@ -1570,8 +1576,9 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)
15701576
qla24xx_post_gpdb_work(vha, fcport, 0);
15711577
} else {
15721578
ql_dbg(ql_dbg_disc, vha, 0x2118,
1573-
"%s %d %8phC post NVMe PRLI\n",
1574-
__func__, __LINE__, fcport->port_name);
1579+
"%s %d %8phC post %s PRLI\n",
1580+
__func__, __LINE__, fcport->port_name,
1581+
fcport->fc4f_nvme ? "NVME" : "FC");
15751582
qla24xx_post_prli_work(vha, fcport);
15761583
}
15771584
break;
@@ -1853,17 +1860,38 @@ qla24xx_handle_prli_done_event(struct scsi_qla_host *vha, struct event_arg *ea)
18531860
break;
18541861
}
18551862

1856-
if (ea->fcport->n2n_flag) {
1863+
if (ea->fcport->fc4f_nvme) {
18571864
ql_dbg(ql_dbg_disc, vha, 0x2118,
18581865
"%s %d %8phC post fc4 prli\n",
18591866
__func__, __LINE__, ea->fcport->port_name);
18601867
ea->fcport->fc4f_nvme = 0;
1861-
ea->fcport->n2n_flag = 0;
18621868
qla24xx_post_prli_work(vha, ea->fcport);
1869+
return;
1870+
}
1871+
1872+
/* at this point both PRLI NVME & PRLI FCP failed */
1873+
if (N2N_TOPO(vha->hw)) {
1874+
if (ea->fcport->n2n_link_reset_cnt < 3) {
1875+
ea->fcport->n2n_link_reset_cnt++;
1876+
/*
1877+
* remote port is not sending Plogi. Reset
1878+
* link to kick start his state machine
1879+
*/
1880+
set_bit(N2N_LINK_RESET, &vha->dpc_flags);
1881+
} else {
1882+
ql_log(ql_log_warn, vha, 0x2119,
1883+
"%s %d %8phC Unable to reconnect\n",
1884+
__func__, __LINE__, ea->fcport->port_name);
1885+
}
1886+
} else {
1887+
/*
1888+
* switch connect. login failed. Take connection
1889+
* down and allow relogin to retrigger
1890+
*/
1891+
ea->fcport->flags &= ~FCF_ASYNC_SENT;
1892+
ea->fcport->keep_nport_handle = 0;
1893+
qlt_schedule_sess_for_deletion(ea->fcport);
18631894
}
1864-
ql_dbg(ql_dbg_disc, vha, 0x2119,
1865-
"%s %d %8phC unhandle event of %x\n",
1866-
__func__, __LINE__, ea->fcport->port_name, ea->data[0]);
18671895
break;
18681896
}
18691897
}
@@ -5000,28 +5028,47 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
50005028
unsigned long flags;
50015029

50025030
/* Inititae N2N login. */
5003-
if (test_and_clear_bit(N2N_LOGIN_NEEDED, &vha->dpc_flags)) {
5004-
/* borrowing */
5005-
u32 *bp, i, sz;
5006-
5007-
memset(ha->init_cb, 0, ha->init_cb_size);
5008-
sz = min_t(int, sizeof(struct els_plogi_payload),
5009-
ha->init_cb_size);
5010-
rval = qla24xx_get_port_login_templ(vha, ha->init_cb_dma,
5011-
(void *)ha->init_cb, sz);
5012-
if (rval == QLA_SUCCESS) {
5013-
bp = (uint32_t *)ha->init_cb;
5014-
for (i = 0; i < sz/4 ; i++, bp++)
5015-
*bp = cpu_to_be32(*bp);
5031+
if (N2N_TOPO(ha)) {
5032+
if (test_and_clear_bit(N2N_LOGIN_NEEDED, &vha->dpc_flags)) {
5033+
/* borrowing */
5034+
u32 *bp, i, sz;
5035+
5036+
memset(ha->init_cb, 0, ha->init_cb_size);
5037+
sz = min_t(int, sizeof(struct els_plogi_payload),
5038+
ha->init_cb_size);
5039+
rval = qla24xx_get_port_login_templ(vha,
5040+
ha->init_cb_dma, (void *)ha->init_cb, sz);
5041+
if (rval == QLA_SUCCESS) {
5042+
bp = (uint32_t *)ha->init_cb;
5043+
for (i = 0; i < sz/4 ; i++, bp++)
5044+
*bp = cpu_to_be32(*bp);
50165045

5017-
memcpy(&ha->plogi_els_payld.data, (void *)ha->init_cb,
5018-
sizeof(ha->plogi_els_payld.data));
5019-
set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
5020-
} else {
5021-
ql_dbg(ql_dbg_init, vha, 0x00d1,
5022-
"PLOGI ELS param read fail.\n");
5046+
memcpy(&ha->plogi_els_payld.data,
5047+
(void *)ha->init_cb,
5048+
sizeof(ha->plogi_els_payld.data));
5049+
set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
5050+
} else {
5051+
ql_dbg(ql_dbg_init, vha, 0x00d1,
5052+
"PLOGI ELS param read fail.\n");
5053+
goto skip_login;
5054+
}
5055+
}
5056+
5057+
list_for_each_entry(fcport, &vha->vp_fcports, list) {
5058+
if (fcport->n2n_flag) {
5059+
qla24xx_fcport_handle_login(vha, fcport);
5060+
return QLA_SUCCESS;
5061+
}
5062+
}
5063+
skip_login:
5064+
spin_lock_irqsave(&vha->work_lock, flags);
5065+
vha->scan.scan_retry++;
5066+
spin_unlock_irqrestore(&vha->work_lock, flags);
5067+
5068+
if (vha->scan.scan_retry < MAX_SCAN_RETRIES) {
5069+
set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags);
5070+
set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);
50235071
}
5024-
return QLA_SUCCESS;
50255072
}
50265073

50275074
found_devs = 0;

‎drivers/scsi/qla2xxx/qla_mbx.c

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2249,7 +2249,7 @@ qla2x00_lip_reset(scsi_qla_host_t *vha)
22492249
mbx_cmd_t mc;
22502250
mbx_cmd_t *mcp = &mc;
22512251

2252-
ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105a,
2252+
ql_dbg(ql_dbg_disc, vha, 0x105a,
22532253
"Entered %s.\n", __func__);
22542254

22552255
if (IS_CNA_CAPABLE(vha->hw)) {
@@ -3883,14 +3883,23 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
38833883
case TOPO_N2N:
38843884
ha->current_topology = ISP_CFG_N;
38853885
spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags);
3886+
list_for_each_entry(fcport, &vha->vp_fcports, list) {
3887+
fcport->scan_state = QLA_FCPORT_SCAN;
3888+
fcport->n2n_flag = 0;
3889+
}
3890+
38863891
fcport = qla2x00_find_fcport_by_wwpn(vha,
38873892
rptid_entry->u.f1.port_name, 1);
38883893
spin_unlock_irqrestore(&vha->hw->tgt.sess_lock, flags);
38893894

38903895
if (fcport) {
38913896
fcport->plogi_nack_done_deadline = jiffies + HZ;
3892-
fcport->dm_login_expire = jiffies + 3*HZ;
3897+
fcport->dm_login_expire = jiffies + 2*HZ;
38933898
fcport->scan_state = QLA_FCPORT_FOUND;
3899+
fcport->n2n_flag = 1;
3900+
if (vha->flags.nvme_enabled)
3901+
fcport->fc4f_nvme = 1;
3902+
38943903
switch (fcport->disc_state) {
38953904
case DSC_DELETED:
38963905
set_bit(RELOGIN_NEEDED,
@@ -3924,7 +3933,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
39243933
rptid_entry->u.f1.port_name,
39253934
rptid_entry->u.f1.node_name,
39263935
NULL,
3927-
FC4_TYPE_UNKNOWN);
3936+
FS_FCP_IS_N2N);
39283937
}
39293938

39303939
/* if our portname is higher then initiate N2N login */
@@ -4023,6 +4032,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
40234032

40244033
list_for_each_entry(fcport, &vha->vp_fcports, list) {
40254034
fcport->scan_state = QLA_FCPORT_SCAN;
4035+
fcport->n2n_flag = 0;
40264036
}
40274037

40284038
fcport = qla2x00_find_fcport_by_wwpn(vha,
@@ -4032,6 +4042,13 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
40324042
fcport->login_retry = vha->hw->login_retry_count;
40334043
fcport->plogi_nack_done_deadline = jiffies + HZ;
40344044
fcport->scan_state = QLA_FCPORT_FOUND;
4045+
fcport->n2n_flag = 1;
4046+
fcport->d_id.b.domain =
4047+
rptid_entry->u.f2.remote_nport_id[2];
4048+
fcport->d_id.b.area =
4049+
rptid_entry->u.f2.remote_nport_id[1];
4050+
fcport->d_id.b.al_pa =
4051+
rptid_entry->u.f2.remote_nport_id[0];
40354052
}
40364053
}
40374054
}

‎drivers/scsi/qla2xxx/qla_os.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5033,6 +5033,10 @@ void qla24xx_create_new_sess(struct scsi_qla_host *vha, struct qla_work_evt *e)
50335033

50345034
memcpy(fcport->port_name, e->u.new_sess.port_name,
50355035
WWN_SIZE);
5036+
5037+
if (e->u.new_sess.fc4_type & FS_FCP_IS_N2N)
5038+
fcport->n2n_flag = 1;
5039+
50365040
} else {
50375041
ql_dbg(ql_dbg_disc, vha, 0xffff,
50385042
"%s %8phC mem alloc fail.\n",

0 commit comments

Comments
 (0)