scsi: qla2xxx: Serialize session deletion by using work_lock

BugLink: http://bugs.launchpad.net/bugs/1770003
for session deletion, replace sess_lock with work_lock.
Under certain case sess_lock is not feasiable to acquire.
The lock is needed temporarily to make sure a single
call to schedule of the work element.

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>
(backported from d8630bb95f46ea118dede63bd75533faa64f9612)
Signed-off-by: Gustavo Walbon <gwalbon@linux.vnet.ibm.com>
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index eacd31653c45bc219bcea3d1ad63e1bfcd94b09b..ccd1e8c80f0dce0a451755af29fbb5e37afe76da 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -865,7 +865,6 @@ void qlt_plogi_ack_link(struct scsi_qla_host *, struct qlt_plogi_ack_t *,
        struct fc_port *, enum qlt_plogi_link_t);
 void qlt_plogi_ack_unref(struct scsi_qla_host *, struct qlt_plogi_ack_t *);
 extern void qlt_schedule_sess_for_deletion(struct fc_port *);
-extern void qlt_schedule_sess_for_deletion_lock(struct fc_port *);
 extern struct fc_port *qlt_find_sess_invalidate_other(scsi_qla_host_t *,
        uint64_t wwn, port_id_t port_id, uint16_t loop_id, struct fc_port **);
 void qla24xx_delete_sess_fn(struct work_struct *);

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 7d715e58901f2c634d223cdd77dea7b2aaab1795..985ccfdb92ea8420cf4aa87f695449b806544f20 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -2840,7 +2840,7 @@ void qla24xx_handle_gidpn_event(scsi_qla_host_t *vha, struct event_arg *ea)
                                        ql_dbg(ql_dbg_disc, vha, 0x2021,
                                            "%s %d %8phC post del sess\n",
                                            __func__, __LINE__, fcport->port_name);
-                                       qlt_schedule_sess_for_deletion_lock(fcport);
+                                       qlt_schedule_sess_for_deletion(fcport);
                                }
                        }
                } else { /* ea->sp->gen1 != fcport->rscn_gen */
@@ -2857,7 +2857,7 @@ void qla24xx_handle_gidpn_event(scsi_qla_host_t *vha, struct event_arg *ea)
                                ql_dbg(ql_dbg_disc, vha, 0x2042,
                                    "%s %d %8phC post del sess\n", __func__,
                                    __LINE__, fcport->port_name);
-                               qlt_schedule_sess_for_deletion_lock(fcport);
+                               qlt_schedule_sess_for_deletion(fcport);
                        } else {
                                ql_dbg(ql_dbg_disc, vha, 0x2045,
                                    "%s %d %8phC login\n", __func__, __LINE__,
@@ -3196,8 +3196,7 @@ void qla24xx_handle_gpnid_event(scsi_qla_host_t *vha, struct event_arg *ea)
                                            "%s %d %8phC post del sess\n",
                                            __func__, __LINE__,
                                            fcport->port_name);
-                                       qlt_schedule_sess_for_deletion_lock
-                                               (fcport);
+                                       qlt_schedule_sess_for_deletion(fcport);
                                        break;
                                }
                        }
@@ -3230,7 +3229,7 @@ void qla24xx_handle_gpnid_event(scsi_qla_host_t *vha, struct event_arg *ea)
                                                    "%s %d %8phC post del sess\n",
                                                    __func__, __LINE__,
                                                    conflict->port_name);
-                                               qlt_schedule_sess_for_deletion_lock
+                                               qlt_schedule_sess_for_deletion
                                                        (conflict);
                                                break;
                                        }
@@ -3287,7 +3286,7 @@ void qla24xx_handle_gpnid_event(scsi_qla_host_t *vha, struct event_arg *ea)
                                                    "%s %d %8phC post del sess\n",
                                                    __func__, __LINE__,
                                                    conflict->port_name);
-                                               qlt_schedule_sess_for_deletion_lock
+                                               qlt_schedule_sess_for_deletion
                                                        (conflict);
                                                break;
                                        }

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index e894bea76f899706f14203e9bd17f27d51283476..1ec07d014f82c7c73864950ab6aa1a794fd0bfa7 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -889,7 +889,7 @@ void qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, struct event_arg *ea)
        if (rval != QLA_SUCCESS) {
                ql_dbg(ql_dbg_disc, vha, 0x20d5, "%s %d %8phC post del sess\n",
                    __func__, __LINE__, fcport->port_name);
-               qlt_schedule_sess_for_deletion_lock(fcport);
+               qlt_schedule_sess_for_deletion(fcport);
                return;
        }
 
@@ -4748,8 +4748,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
                                            __func__, __LINE__,
                                            fcport->port_name);
 
-                                       qlt_schedule_sess_for_deletion_lock
-                                               (fcport);
+                                       qlt_schedule_sess_for_deletion(fcport);
                                        continue;
                                }
                        }
@@ -5329,9 +5328,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)
                                            "%s %d %8phC post del sess\n",
                                            __func__, __LINE__,
                                            fcport->port_name);
-
-                                       qlt_schedule_sess_for_deletion_lock
-                                               (fcport);
+                                       qlt_schedule_sess_for_deletion(fcport);
                                        continue;
                                }
                        }

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 0c3a0bb6b5f3991fa745ec88f966ea6a7b886efc..e46e5dfdc225cdc4a10813dcddaf4e082d52373c 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1009,7 +1009,7 @@ skip_rio:
                        if (qla_ini_mode_enabled(vha)) {
                                qla2x00_mark_device_lost(fcport->vha, fcport, 1, 1);
                                fcport->logout_on_delete = 0;
-                               qlt_schedule_sess_for_deletion_lock(fcport);
+                               qlt_schedule_sess_for_deletion(fcport);
                        }
                        break;
 
@@ -2668,7 +2668,7 @@ check_scsi_status:
                                comp_status);
 
                        qla2x00_mark_device_lost(fcport->vha, fcport, 1, 1);
-                       qlt_schedule_sess_for_deletion_lock(fcport);
+                       qlt_schedule_sess_for_deletion(fcport);
                }
 
                break;

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index a6f3cdaee9804cc6dc8f1c3476981dbf0706f91a..5be77e7e4b5242516bce79795876dbcc60c919ee 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -3895,7 +3895,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
                        case DSC_DELETE_PEND:
                                break;
                        default:
-                               qlt_schedule_sess_for_deletion_lock(fcport);
+                               qlt_schedule_sess_for_deletion(fcport);
                                break;
                        }
                } else {

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 135b39e4e290d4b39299d8e940222bef253e535d..87eed003e798f41fabe2d02c39873b82db39fb65 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3837,7 +3837,7 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha, int defer)
 
        list_for_each_entry(fcport, &vha->vp_fcports, list) {
                fcport->scan_state = 0;
-               qlt_schedule_sess_for_deletion_lock(fcport);
+               qlt_schedule_sess_for_deletion(fcport);
 
                if (vha->vp_idx != 0 && vha->vp_idx != fcport->vha->vp_idx)
                        continue;
@@ -4828,8 +4828,7 @@ void qla24xx_create_new_sess(struct scsi_qla_host *vha, struct qla_work_evt *e)
                                default:
                                        fcport->login_pause = 1;
                                        tfcp->conflict = fcport;
-                                       qlt_schedule_sess_for_deletion_lock
-                                               (tfcp);
+                                       qlt_schedule_sess_for_deletion(tfcp);
                                        break;
                                }
                        }

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 4ef8d8b95c468f709678ac8def440aafb6f4ec94..730bf11b12299e603795ddb3c247dd0e3d257aed 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -1207,6 +1207,7 @@ static void qla24xx_chk_fcp_state(struct fc_port *sess)
 void qlt_schedule_sess_for_deletion(struct fc_port *sess)
 {
        struct qla_tgt *tgt = sess->tgt;
+       unsigned long flags;
 
        if (sess->disc_state == DSC_DELETE_PEND)
                return;
@@ -1222,12 +1223,19 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess)
                        return;
        }
 
-       sess->disc_state = DSC_DELETE_PEND;
-
        if (sess->deleted == QLA_SESS_DELETED)
                sess->logout_on_delete = 0;
 
+       spin_lock_irqsave(&sess->vha->work_lock, flags);
+       if (sess->deleted == QLA_SESS_DELETION_IN_PROGRESS) {
+               spin_unlock_irqrestore(&sess->vha->work_lock, flags);
+               return;
+       }
        sess->deleted = QLA_SESS_DELETION_IN_PROGRESS;
+       spin_unlock_irqrestore(&sess->vha->work_lock, flags);
+
+       sess->disc_state = DSC_DELETE_PEND;
+
        qla24xx_chk_fcp_state(sess);
 
        ql_dbg(ql_dbg_tgt, sess->vha, 0xe001,
@@ -1239,15 +1247,6 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess)
        queue_work(sess->vha->hw->wq, &sess->del_work);
 }
 
-void qlt_schedule_sess_for_deletion_lock(struct fc_port *sess)
-{
-       unsigned long flags;
-       struct qla_hw_data *ha = sess->vha->hw;
-       spin_lock_irqsave(&ha->tgt.sess_lock, flags);
-       qlt_schedule_sess_for_deletion(sess);
-       spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
-}
-
 /* ha->tgt.sess_lock supposed to be held on entry */
 static void qlt_clear_tgt_db(struct qla_tgt *tgt)
 {
@@ -2208,7 +2207,7 @@ void qlt_xmit_tm_rsp(struct qla_tgt_mgmt_cmd *mcmd)
                            "TM response logo %phC status %#x state %#x",
                            mcmd->sess->port_name, mcmd->fc_tm_rsp,
                            mcmd->flags);
-                       qlt_schedule_sess_for_deletion_lock(mcmd->sess);
+                       qlt_schedule_sess_for_deletion(mcmd->sess);
                } else {
                        qlt_send_notify_ack(vha->hw->base_qpair,
                            &mcmd->orig_iocb.imm_ntfy, 0, 0, 0, 0, 0, 0);
@@ -3903,7 +3902,7 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha,
                                    "%s %d %8phC post del sess\n",
                                    __func__, __LINE__, cmd->sess->port_name);
 
-                               qlt_schedule_sess_for_deletion_lock(cmd->sess);
+                               qlt_schedule_sess_for_deletion(cmd->sess);
                        }
                        break;
                }
@@ -4802,7 +4801,7 @@ static int qlt_handle_login(struct scsi_qla_host *vha,
                    __func__, __LINE__, sess->port_name);
 
 
-               qlt_schedule_sess_for_deletion_lock(sess);
+               qlt_schedule_sess_for_deletion(sess);
                break;
        }
 out:
@@ -4995,7 +4994,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
                } else {
                        /* cmd did not go to upper layer. */
                        if (sess) {
-                               qlt_schedule_sess_for_deletion_lock(sess);
+                               qlt_schedule_sess_for_deletion(sess);
                                res = 0;
                        }
                        /* else logo will be ack */