]> git.hungrycats.org Git - linux/commitdiff
scsi: lpfc: Fix crash during driver unload with running nvme traffic
authorJames Smart <jsmart2021@gmail.com>
Tue, 21 Nov 2017 00:00:41 +0000 (16:00 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Mar 2018 08:09:55 +0000 (09:09 +0100)
[ Upstream commit 3386f4bdd243ad5a9094d390297602543abe9902 ]

When the driver is unloading, the nvme transport could be in the process
of submitting new requests, will send abort requests to terminate
associations, or may make LS-related requests.  The driver's abort and
request entry points currently is ignorant of the unloading state and is
starting the requests even though the infrastructure to complete them
continues to teardown.

Change the entry points for new requests to check whether unloading and
if so, reject the requests. Abort routines check unloading, and if so,
noop the request. An abort is noop'd as the teardown paths are already
aborting/terminating the io outstanding at the time the teardown
initiated.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/scsi/lpfc/lpfc_nvme.c
drivers/scsi/lpfc/lpfc_nvmet.c

index 517ae570e507019d94964e91171a67506e97a17e..0e63c88441a3f1ba583151299e32165397f705b8 100644 (file)
@@ -416,6 +416,9 @@ lpfc_nvme_ls_req(struct nvme_fc_local_port *pnvme_lport,
        lport = (struct lpfc_nvme_lport *)pnvme_lport->private;
        vport = lport->vport;
 
+       if (vport->load_flag & FC_UNLOADING)
+               return -ENODEV;
+
        if (vport->load_flag & FC_UNLOADING)
                return -ENODEV;
 
@@ -534,6 +537,9 @@ lpfc_nvme_ls_abort(struct nvme_fc_local_port *pnvme_lport,
        vport = lport->vport;
        phba = vport->phba;
 
+       if (vport->load_flag & FC_UNLOADING)
+               return;
+
        ndlp = lpfc_findnode_did(vport, pnvme_rport->port_id);
        if (!ndlp) {
                lpfc_printf_vlog(vport, KERN_ERR, LOG_NVME_ABTS,
@@ -1260,6 +1266,11 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport,
                goto out_fail;
        }
 
+       if (vport->load_flag & FC_UNLOADING) {
+               ret = -ENODEV;
+               goto out_fail;
+       }
+
        /* Validate pointers. */
        if (!pnvme_lport || !pnvme_rport || !freqpriv) {
                lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_IOERR | LOG_NODE,
@@ -1487,6 +1498,9 @@ lpfc_nvme_fcp_abort(struct nvme_fc_local_port *pnvme_lport,
        vport = lport->vport;
        phba = vport->phba;
 
+       if (vport->load_flag & FC_UNLOADING)
+               return;
+
        /* Announce entry to new IO submit field. */
        lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_ABTS,
                         "6002 Abort Request to rport DID x%06x "
index 84cf1b9079f78849fe2c6101df88245d90c28cb1..2b50aecc2722e9e329d56f478c8f86eea45d8f40 100644 (file)
@@ -632,6 +632,9 @@ lpfc_nvmet_xmt_ls_rsp(struct nvmet_fc_target_port *tgtport,
        struct ulp_bde64 bpl;
        int rc;
 
+       if (phba->pport->load_flag & FC_UNLOADING)
+               return -ENODEV;
+
        if (phba->pport->load_flag & FC_UNLOADING)
                return -ENODEV;
 
@@ -721,6 +724,11 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_target_port *tgtport,
                goto aerr;
        }
 
+       if (phba->pport->load_flag & FC_UNLOADING) {
+               rc = -ENODEV;
+               goto aerr;
+       }
+
 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
        if (ctxp->ts_cmd_nvme) {
                if (rsp->op == NVMET_FCOP_RSP)
@@ -820,6 +828,9 @@ lpfc_nvmet_xmt_fcp_abort(struct nvmet_fc_target_port *tgtport,
        struct lpfc_hba *phba = ctxp->phba;
        unsigned long flags;
 
+       if (phba->pport->load_flag & FC_UNLOADING)
+               return;
+
        if (phba->pport->load_flag & FC_UNLOADING)
                return;