scsi: efct: Fix nport free

nport_free for an empty nport hangs the state machine waiting for mbox
completion if nport is not yet attached thinking that it is attaching right
now.  Add a check for nport attaching state and complete nport free.

Link: https://lore.kernel.org/r/20210914105539.6942-3-d.bogdanov@yadro.com
Reviewed-by: Ram Vegesna <ram.vegesna@broadcom.com>
Signed-off-by: Dmitry Bogdanov <d.bogdanov@yadro.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/elx/libefc/efc_cmds.c b/drivers/scsi/elx/libefc/efc_cmds.c
index 37e6697d86b888a4b6a4d95a9913d7536b706ef5..f8665d48904af48ad420e43a70ed008822812983 100644 (file)
--- a/drivers/scsi/elx/libefc/efc_cmds.c
+++ b/drivers/scsi/elx/libefc/efc_cmds.c
@@ -249,6 +249,7 @@ efc_nport_attach_reg_vpi_cb(struct efc *efc, int status, u8 *mqe,
 {
        struct efc_nport *nport = arg;
 
+       nport->attaching = false;
        if (efc_nport_get_mbox_status(nport, mqe, status)) {
                efc_nport_free_resources(nport, EFC_EVT_NPORT_ATTACH_FAIL, mqe);
                return -EIO;
@@ -286,6 +287,8 @@ efc_cmd_nport_attach(struct efc *efc, struct efc_nport *nport, u32 fc_id)
        if (rc) {
                efc_log_err(efc, "REG_VPI command failure\n");
                efc_nport_free_resources(nport, EFC_EVT_NPORT_ATTACH_FAIL, buf);
+       } else {
+               nport->attaching = true;
        }
 
        return rc;
@@ -302,8 +305,10 @@ efc_cmd_nport_free(struct efc *efc, struct efc_nport *nport)
        /* Issue the UNREG_VPI command to free the assigned VPI context */
        if (nport->attached)
                efc_nport_free_unreg_vpi(nport);
-       else
+       else if (nport->attaching)
                nport->free_req_pending = true;
+       else
+               efc_sm_post_event(&nport->sm, EFC_EVT_NPORT_FREE_OK, NULL);
 
        return 0;
 }

diff --git a/drivers/scsi/elx/libefc/efclib.h b/drivers/scsi/elx/libefc/efclib.h
index ee291cabf7e05628abdb99d06fbd690e90778ea5..dde20891c2dd71f54cd47712c33a7713b14c10c0 100644 (file)
--- a/drivers/scsi/elx/libefc/efclib.h
+++ b/drivers/scsi/elx/libefc/efclib.h
@@ -142,6 +142,7 @@ struct efc_nport {
        bool                    is_vport;
        bool                    free_req_pending;
        bool                    attached;
+       bool                    attaching;
        bool                    p2p_winner;
        struct efc_domain       *domain;
        u64                     wwpn;