scsi: qla2xxx: Serialize session deletion by using work_lock

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>

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 47bff9ab11760cddfee9a657a122b12d0d4a7704..e9295398050c827964ad323443cea73abdc38014 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -888,7 +888,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 546011b1a7659b5a26882c9b7f2a0d8a01421c9f..6bfe24eeb402fc7678699eca6a13ce83541e0cd1 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -3047,7 +3047,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 */
@@ -3064,7 +3064,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__,
@@ -3436,8 +3436,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;
                                }
                        }
@@ -3470,7 +3469,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;
                                        }
@@ -3528,7 +3527,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;
                                        }
@@ -3959,8 +3958,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)
                                            __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_init.c b/drivers/scsi/qla2xxx/qla_init.c
index aaa8c07b2d8d4d4ab9708786e154ab39b9cef4ca..9c08222e4c8b0699e336d892e17c4c9d4e9267c1 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1091,7 +1091,7 @@ void qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, struct event_arg *ea)
        default:
                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;
        }
        __qla24xx_handle_gpdb_event(vha, ea);
@@ -4964,8 +4964,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;
                                }
                        }
@@ -5552,9 +5551,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 a37a2a474a501bed084821b101feed4385e5a9a4..14109d86c3f6a786313bbf83d4c973e60553e33e 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1009,7 +1009,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
                        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;
 
@@ -2701,7 +2701,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                                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 8455058cd7243a0c8f586c52ad7d82514c3b93ec..7397aeddd96cb9ca783b9b9b5dffc1f6d423f954 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -3896,7 +3896,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 a64f67a562f0616965ad83f299379424d39f1fdb..b21878a70f6e0df1db167c9cdc414981cdd1f0cd 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3869,7 +3869,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;
@@ -4897,8 +4897,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 867d089c3ebee9cf6daaf911a1f0eec02089864f..72b452db26da90e3ee04fa50785f8534c6db2b97 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -1214,6 +1214,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;
@@ -1229,12 +1230,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,
@@ -1246,15 +1254,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)
 {
@@ -2210,7 +2209,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);
@@ -3905,7 +3904,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;
                }
@@ -4723,7 +4722,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:
@@ -4951,7 +4950,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 */