scsi: qla2xxx: Serialize session free in qlt_free_session_done

Add free_pending flag to serialize queueing of
free_work element onto the work queue

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index ac2f340bc1c64ef4d1fc528debea45d419f20dce..f7396a2e28bab135ff0d5cf007e432058e37fc3c 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2334,6 +2334,7 @@ typedef struct fc_port {
 
        unsigned int conf_compl_supported:1;
        unsigned int deleted:2;
+       unsigned int free_pending:1;
        unsigned int local:1;
        unsigned int logout_on_delete:1;
        unsigned int logo_ack_needed:1;

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 72b452db26da90e3ee04fa50785f8534c6db2b97..0d3c3f647f91c2ee1ec92620c5b0cf28d53dc3a4 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -1105,6 +1105,7 @@ static void qlt_free_session_done(struct work_struct *work)
                        sess->plogi_link[QLT_PLOGI_LINK_SAME_WWN] = NULL;
                }
        }
+
        spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
 
        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf001,
@@ -1118,6 +1119,9 @@ static void qlt_free_session_done(struct work_struct *work)
                wake_up_all(&vha->fcport_waitQ);
 
        base_vha = pci_get_drvdata(ha->pdev);
+
+       sess->free_pending = 0;
+
        if (test_bit(PFLG_DRIVER_REMOVING, &base_vha->pci_flags))
                return;
 
@@ -1140,11 +1144,20 @@ static void qlt_free_session_done(struct work_struct *work)
 void qlt_unreg_sess(struct fc_port *sess)
 {
        struct scsi_qla_host *vha = sess->vha;
+       unsigned long flags;
 
        ql_dbg(ql_dbg_disc, sess->vha, 0x210a,
            "%s sess %p for deletion %8phC\n",
            __func__, sess, sess->port_name);
 
+       spin_lock_irqsave(&sess->vha->work_lock, flags);
+       if (sess->free_pending) {
+               spin_unlock_irqrestore(&sess->vha->work_lock, flags);
+               return;
+       }
+       sess->free_pending = 1;
+       spin_unlock_irqrestore(&sess->vha->work_lock, flags);
+
        if (sess->se_sess)
                vha->hw->tgt.tgt_ops->clear_nacl_from_fcport_map(sess);