lkml.org 
[lkml]   [2018]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 081/128] scsi: lpfc: Fix crash during driver unload with running nvme traffic
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: James Smart <jsmart2021@gmail.com>


    [ 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 | 14 ++++++++++++++
    drivers/scsi/lpfc/lpfc_nvmet.c | 11 +++++++++++
    2 files changed, 25 insertions(+)

    --- a/drivers/scsi/lpfc/lpfc_nvme.c
    +++ b/drivers/scsi/lpfc/lpfc_nvme.c
    @@ -419,6 +419,9 @@ lpfc_nvme_ls_req(struct nvme_fc_local_po
    if (vport->load_flag & FC_UNLOADING)
    return -ENODEV;

    + if (vport->load_flag & FC_UNLOADING)
    + return -ENODEV;
    +
    ndlp = lpfc_findnode_did(vport, pnvme_rport->port_id);
    if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) {
    lpfc_printf_vlog(vport, KERN_ERR, LOG_NODE | LOG_NVME_IOERR,
    @@ -534,6 +537,9 @@ lpfc_nvme_ls_abort(struct nvme_fc_local_
    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_l
    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
    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 "
    --- a/drivers/scsi/lpfc/lpfc_nvmet.c
    +++ b/drivers/scsi/lpfc/lpfc_nvmet.c
    @@ -635,6 +635,9 @@ lpfc_nvmet_xmt_ls_rsp(struct nvmet_fc_ta
    if (phba->pport->load_flag & FC_UNLOADING)
    return -ENODEV;

    + if (phba->pport->load_flag & FC_UNLOADING)
    + return -ENODEV;
    +
    lpfc_printf_log(phba, KERN_INFO, LOG_NVME_DISC,
    "6023 NVMET LS rsp oxid x%x\n", ctxp->oxid);

    @@ -721,6 +724,11 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_ta
    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)
    @@ -822,6 +830,9 @@ lpfc_nvmet_xmt_fcp_abort(struct nvmet_fc

    if (phba->pport->load_flag & FC_UNLOADING)
    return;
    +
    + if (phba->pport->load_flag & FC_UNLOADING)
    + return;

    lpfc_printf_log(phba, KERN_INFO, LOG_NVME_ABTS,
    "6103 NVMET Abort op: oxri x%x flg x%x ste %d\n",

    \
     
     \ /
      Last update: 2018-03-16 16:52    [W:4.286 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site