scsi: qla2xxx: Move session delete to driver work queue

Quinn Tran · martinkpetersen · commit a01c77d2cbc4 · 2017-12-07T21:07:00.000-05:00
Move session delete from system work queue to driver's work queue for in time processing. Fixes: 726b854 ("qla2xxx: Add framework for async fabric discovery") Cc: <stable@vger.kernel.org> # 4.10+ Signed-off-by: Quinn Tran <quinn.tran@cavium.com> Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com> Reviewed-by: Hannes Reinecke <hare@suse.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
@@ -3193,10 +3193,11 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 	    host->can_queue, base_vha->req,
 	    base_vha->mgmt_svr_loop_id, host->sg_tablesize);
 
+	ha->wq = alloc_workqueue("qla2xxx_wq", WQ_MEM_RECLAIM, 0);
+
 	if (ha->mqenable) {
 		bool mq = false;
 		bool startit = false;
-		ha->wq = alloc_workqueue("qla2xxx_wq", WQ_MEM_RECLAIM, 0);
 
 		if (QLA_TGT_MODE_ENABLED()) {
 			mq = true;
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
@@ -1205,7 +1205,8 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess,
 	ql_dbg(ql_dbg_tgt, sess->vha, 0xe001,
 	    "Scheduling sess %p for deletion\n", sess);
 
-	schedule_work(&sess->del_work);
+	INIT_WORK(&sess->del_work, qla24xx_delete_sess_fn);
+	queue_work(sess->vha->hw->wq, &sess->del_work);
 }
 
 void qlt_schedule_sess_for_deletion_lock(struct fc_port *sess)

Original file line number	Diff line number	Diff line change
`@@ -1205,7 +1205,8 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess,`
`1205`	`1205`	`ql_dbg(ql_dbg_tgt, sess->vha, 0xe001,`
`1206`	`1206`	`"Scheduling sess %p for deletion\n", sess);`
`1207`	`1207`
`1208`		`- schedule_work(&sess->del_work);`
	`1208`	`+ INIT_WORK(&sess->del_work, qla24xx_delete_sess_fn);`
	`1209`	`+ queue_work(sess->vha->hw->wq, &sess->del_work);`
`1209`	`1210`	`}`
`1210`	`1211`
`1211`	`1212`	`void qlt_schedule_sess_for_deletion_lock(struct fc_port *sess)`