|
 |
3d7c23 |
From f0f1af81d3ee32fddd607b4f21c66997178c6b8c Mon Sep 17 00:00:00 2001
|
|
|
3d7c23 |
From: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3d7c23 |
Date: Thu, 1 Aug 2019 15:55:14 -0400
|
|
|
3d7c23 |
Subject: [PATCH 054/124] [scsi] scsi: qla2xxx: Set remote port devloss timeout
|
|
|
3d7c23 |
to 0
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Message-id: <20190801155618.12650-55-hmadhani@redhat.com>
|
|
|
3d7c23 |
Patchwork-id: 267831
|
|
|
3d7c23 |
O-Subject: [RHEL 7.8 e-stor PATCH 054/118] scsi: qla2xxx: Set remote port devloss timeout to 0
|
|
|
3d7c23 |
Bugzilla: 1729270
|
|
|
3d7c23 |
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
3d7c23 |
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
3d7c23 |
|
|
|
3d7c23 |
From: Giridhar Malavali <gmalavali@marvell.com>
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Bugzilla 1729270
|
|
|
3d7c23 |
|
|
|
3d7c23 |
This patch sets remote_port_devloss value to 0. This indicates to FC-NVMe
|
|
|
3d7c23 |
transport that driver is unloading and transport should not retry.
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Fixes: e476fe8af5ff ("scsi: qla2xxx: Fix unload when NVMe devices are configured")
|
|
|
3d7c23 |
Cc: stable@vger.kernel.org
|
|
|
3d7c23 |
Signed-off-by: Giridhar Malavali <gmalavali@marvell.com>
|
|
|
3d7c23 |
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
|
|
|
3d7c23 |
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
|
3d7c23 |
(cherry picked from commit ffc81fc07efc94a04695a8c1d458a06aecaf9f30)
|
|
|
3d7c23 |
Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3d7c23 |
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
|
3d7c23 |
---
|
|
|
3d7c23 |
drivers/scsi/qla2xxx/qla_nvme.c | 19 +++++++------------
|
|
|
3d7c23 |
1 file changed, 7 insertions(+), 12 deletions(-)
|
|
|
3d7c23 |
|
|
|
3d7c23 |
diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
|
|
|
3d7c23 |
index c6522eb314a2..8d4624c9f75b 100644
|
|
|
3d7c23 |
--- a/drivers/scsi/qla2xxx/qla_nvme.c
|
|
|
3d7c23 |
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
|
|
|
3d7c23 |
@@ -627,7 +627,6 @@ static void qla_nvme_unregister_remote_port(struct work_struct *work)
|
|
|
3d7c23 |
struct fc_port *fcport = container_of(work, struct fc_port,
|
|
|
3d7c23 |
nvme_del_work);
|
|
|
3d7c23 |
struct qla_nvme_rport *qla_rport, *trport;
|
|
|
3d7c23 |
- scsi_qla_host_t *base_vha;
|
|
|
3d7c23 |
|
|
|
3d7c23 |
if (!IS_ENABLED(CONFIG_NVME_FC))
|
|
|
3d7c23 |
return;
|
|
|
3d7c23 |
@@ -635,23 +634,19 @@ static void qla_nvme_unregister_remote_port(struct work_struct *work)
|
|
|
3d7c23 |
ql_log(ql_log_warn, NULL, 0x2112,
|
|
|
3d7c23 |
"%s: unregister remoteport on %p\n",__func__, fcport);
|
|
|
3d7c23 |
|
|
|
3d7c23 |
- base_vha = pci_get_drvdata(fcport->vha->hw->pdev);
|
|
|
3d7c23 |
- if (test_bit(PFLG_DRIVER_REMOVING, &base_vha->pci_flags)) {
|
|
|
3d7c23 |
- ql_dbg(ql_dbg_disc, fcport->vha, 0x2114,
|
|
|
3d7c23 |
- "%s: Notify FC-NVMe transport, set devloss=0\n",
|
|
|
3d7c23 |
- __func__);
|
|
|
3d7c23 |
-
|
|
|
3d7c23 |
- nvme_fc_set_remoteport_devloss(fcport->nvme_remote_port, 0);
|
|
|
3d7c23 |
- }
|
|
|
3d7c23 |
-
|
|
|
3d7c23 |
list_for_each_entry_safe(qla_rport, trport,
|
|
|
3d7c23 |
&fcport->vha->nvme_rport_list, list) {
|
|
|
3d7c23 |
if (qla_rport->fcport == fcport) {
|
|
|
3d7c23 |
ql_log(ql_log_info, fcport->vha, 0x2113,
|
|
|
3d7c23 |
"%s: fcport=%p\n", __func__, fcport);
|
|
|
3d7c23 |
+ nvme_fc_set_remoteport_devloss
|
|
|
3d7c23 |
+ (fcport->nvme_remote_port, 0);
|
|
|
3d7c23 |
init_completion(&fcport->nvme_del_done);
|
|
|
3d7c23 |
- nvme_fc_unregister_remoteport(
|
|
|
3d7c23 |
- fcport->nvme_remote_port);
|
|
|
3d7c23 |
+ if (nvme_fc_unregister_remoteport
|
|
|
3d7c23 |
+ (fcport->nvme_remote_port))
|
|
|
3d7c23 |
+ ql_log(ql_log_info, fcport->vha, 0x2114,
|
|
|
3d7c23 |
+ "%s: Failed to unregister nvme_remote_port\n",
|
|
|
3d7c23 |
+ __func__);
|
|
|
3d7c23 |
wait_for_completion(&fcport->nvme_del_done);
|
|
|
3d7c23 |
break;
|
|
|
3d7c23 |
}
|
|
|
3d7c23 |
--
|
|
|
3d7c23 |
2.13.6
|
|
|
3d7c23 |
|