[PATCH v2 2/3] qla2xxx: on session delete return nvme cmd

[Himanshu Madhani]

From: Quinn Tran <qut...@marvell.com>

- on session delete or chip reset, reject all NVME commands.
- on NVME command submission error, free srb resource.

Signed-off-by: Quinn Tran <qut...@marvell.com>
Signed-off-by: Himanshu Madhani <hmadh...@marvell.com>
---
 drivers/scsi/qla2xxx/qla_nvme.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
index b43c62758cec..2c64457ce713 100644
--- a/drivers/scsi/qla2xxx/qla_nvme.c
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
@@ -241,6 +241,10 @@ static int qla_nvme_ls_req(struct nvme_fc_local_port 
*lport,
 
        vha = fcport->vha;
        ha = vha->hw;
+
+       if (!ha->flags.fw_started || (fcport && fcport->deleted))
+               return rval;
+
        /* Alloc SRB structure */
        sp = qla2x00_get_sp(vha, fcport, GFP_ATOMIC);
        if (!sp)
@@ -272,6 +276,7 @@ static int qla_nvme_ls_req(struct nvme_fc_local_port *lport,
                    "qla2x00_start_sp failed = %d\n", rval);
                atomic_dec(&sp->ref_count);
                wake_up(&sp->nvme_ls_waitq);
+               sp->free(sp);
                return rval;
        }
 
@@ -488,7 +493,7 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port 
*lport,
 
        vha = fcport->vha;
 
-       if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags))
+       if ((qpair && !qpair->fw_started) || (fcport && fcport->deleted))
                return rval;
 
        /*
@@ -523,6 +528,7 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port 
*lport,
                    "qla2x00_start_nvme_mq failed = %d\n", rval);
                atomic_dec(&sp->ref_count);
                wake_up(&sp->nvme_ls_waitq);
+               sp->free(sp);
        }
 
        return rval;
@@ -549,14 +555,13 @@ static void qla_nvme_remoteport_delete(struct 
nvme_fc_remote_port *rport)
 
        complete(&fcport->nvme_del_done);
 
-       if (!test_bit(UNLOADING, &fcport->vha->dpc_flags)) {
-               INIT_WORK(&fcport->free_work, qlt_free_session_done);
-               schedule_work(&fcport->free_work);
-       }
+       INIT_WORK(&fcport->free_work, qlt_free_session_done);
+       schedule_work(&fcport->free_work);
 
        fcport->nvme_flag &= ~NVME_FLAG_DELETING;
        ql_log(ql_log_info, fcport->vha, 0x2110,
-           "remoteport_delete of %p completed.\n", fcport);
+           "remoteport_delete of %p %8phN completed.\n",
+           fcport, fcport->port_name);
 }
 
 static struct nvme_fc_port_template qla_nvme_fc_transport = {
@@ -588,7 +593,8 @@ static void qla_nvme_unregister_remote_port(struct 
work_struct *work)
                return;
 
        ql_log(ql_log_warn, NULL, 0x2112,
-           "%s: unregister remoteport on %p\n",__func__, fcport);
+           "%s: unregister remoteport on %p %8phN\n",
+           __func__, fcport, fcport->port_name);
 
        nvme_fc_set_remoteport_devloss(fcport->nvme_remote_port, 0);
        init_completion(&fcport->nvme_del_done);
-- 
2.12.0