Commit 1ae634eb authored by Quinn Tran's avatar Quinn Tran Committed by Martin K. Petersen

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: default avatarQuinn Tran <quinn.tran@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d8630bb9
...@@ -2334,6 +2334,7 @@ typedef struct fc_port { ...@@ -2334,6 +2334,7 @@ typedef struct fc_port {
unsigned int conf_compl_supported:1; unsigned int conf_compl_supported:1;
unsigned int deleted:2; unsigned int deleted:2;
unsigned int free_pending:1;
unsigned int local:1; unsigned int local:1;
unsigned int logout_on_delete:1; unsigned int logout_on_delete:1;
unsigned int logo_ack_needed:1; unsigned int logo_ack_needed:1;
......
...@@ -1105,6 +1105,7 @@ static void qlt_free_session_done(struct work_struct *work) ...@@ -1105,6 +1105,7 @@ static void qlt_free_session_done(struct work_struct *work)
sess->plogi_link[QLT_PLOGI_LINK_SAME_WWN] = NULL; sess->plogi_link[QLT_PLOGI_LINK_SAME_WWN] = NULL;
} }
} }
spin_unlock_irqrestore(&ha->tgt.sess_lock, flags); spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
ql_dbg(ql_dbg_tgt_mgt, vha, 0xf001, ql_dbg(ql_dbg_tgt_mgt, vha, 0xf001,
...@@ -1118,6 +1119,9 @@ static void qlt_free_session_done(struct work_struct *work) ...@@ -1118,6 +1119,9 @@ static void qlt_free_session_done(struct work_struct *work)
wake_up_all(&vha->fcport_waitQ); wake_up_all(&vha->fcport_waitQ);
base_vha = pci_get_drvdata(ha->pdev); base_vha = pci_get_drvdata(ha->pdev);
sess->free_pending = 0;
if (test_bit(PFLG_DRIVER_REMOVING, &base_vha->pci_flags)) if (test_bit(PFLG_DRIVER_REMOVING, &base_vha->pci_flags))
return; return;
...@@ -1140,11 +1144,20 @@ static void qlt_free_session_done(struct work_struct *work) ...@@ -1140,11 +1144,20 @@ static void qlt_free_session_done(struct work_struct *work)
void qlt_unreg_sess(struct fc_port *sess) void qlt_unreg_sess(struct fc_port *sess)
{ {
struct scsi_qla_host *vha = sess->vha; struct scsi_qla_host *vha = sess->vha;
unsigned long flags;
ql_dbg(ql_dbg_disc, sess->vha, 0x210a, ql_dbg(ql_dbg_disc, sess->vha, 0x210a,
"%s sess %p for deletion %8phC\n", "%s sess %p for deletion %8phC\n",
__func__, sess, sess->port_name); __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) if (sess->se_sess)
vha->hw->tgt.tgt_ops->clear_nacl_from_fcport_map(sess); vha->hw->tgt.tgt_ops->clear_nacl_from_fcport_map(sess);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment