iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: iscsi: Optimize work queue flush use

Browse Source 
There is no need for one session to flush the entire iscsi_eh_timer_workq
when removing/unblocking a session. During removal we need to make sure our
works are not running anymore. And iscsi_unblock_session only needs to make
sure its work is done. The unblock work function will flush/cancel the
works it has conflicts with.

Link: https://lore.kernel.org/r/1593632868-6808-3-git-send-email-michael.christie@oracle.com
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Mike Christie 2020-07-01 14:47:47 -05:00 committed by Martin K. Petersen
parent e463f96bdc
commit 1d726aa6ef
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/scsi/scsi_transport_iscsi.c
View File

@ -1978,10 +1978,11 @@ void iscsi_unblock_session(struct iscsi_cls_session *session)
{ {
queue_work(iscsi_eh_timer_workq, &session->unblock_work); queue_work(iscsi_eh_timer_workq, &session->unblock_work);
/* /*
* make sure all the events have completed before tell the driver * Blocking the session can be done from any context so we only
* it is safe * queue the block work. Make sure the unblock work has completed
* because it flushes/cancels the other works and updates the state.
*/ */
flush_workqueue(iscsi_eh_timer_workq); flush_work(&session->unblock_work);
} }
EXPORT_SYMBOL_GPL(iscsi_unblock_session); EXPORT_SYMBOL_GPL(iscsi_unblock_session);
@ -2205,11 +2206,9 @@ void iscsi_remove_session(struct iscsi_cls_session *session)
list_del(&session->sess_list); list_del(&session->sess_list);
spin_unlock_irqrestore(&sesslock, flags); spin_unlock_irqrestore(&sesslock, flags);
/* make sure there are no blocks/unblocks queued */ flush_work(&session->block_work);
flush_workqueue(iscsi_eh_timer_workq); flush_work(&session->unblock_work);
/* make sure the timedout callout is not running */ cancel_delayed_work_sync(&session->recovery_work);
if (!cancel_delayed_work(&session->recovery_work))
flush_workqueue(iscsi_eh_timer_workq);
/* /*
* If we are blocked let commands flow again. The lld or iscsi * If we are blocked let commands flow again. The lld or iscsi
* layer should set up the queuecommand to fail commands. * layer should set up the queuecommand to fail commands.