diff options
| author |   Mike Christie <michael.christie@oracle.com> | 2022-02-26 17:04:30 -0600 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2022-03-01 23:56:28 -0500 |
| commit | 8dd3dff3bf3e9d91df3a4c3665d3da873b6095b8 (patch) | |
| tree | a04a8f4bbef02f92fb4a54c0a097ee025149c8fb /drivers/scsi/scsi_transport_iscsi.c | |
| parent | scsi: scsi_transport_fc: Fix FPIN Link Integrity statistics counters (diff) | |
| download | linux-dev-8dd3dff3bf3e9d91df3a4c3665d3da873b6095b8.tar.xz linux-dev-8dd3dff3bf3e9d91df3a4c3665d3da873b6095b8.zip | |
scsi: iscsi: Fix recovery and unblocking race
If the user sets the iscsi_eh_timer_workq/iscsi_eh workqueue's max_active
to greater than 1, the recovery_work could be running when
__iscsi_unblock_session() runs. The cancel_delayed_work() will then not
wait for the running work and we can race where we end up with the wrong
session state and scsi_device state set.
This replaces the cancel_delayed_work() with the sync version.
Link: https://lore.kernel.org/r/20220226230435.38733-2-michael.christie@oracle.com
Reviewed-by: Lee Duncan <lduncan@suse.com>
Reviewed-by: Chris Leech <cleech@redhat.com>
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/scsi_transport_iscsi.c')
| -rw-r--r-- | drivers/scsi/scsi_transport_iscsi.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index 554b6f784223..c58126e8cd88 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c @@ -1917,11 +1917,8 @@ static void __iscsi_unblock_session(struct work_struct *work) unsigned long flags; ISCSI_DBG_TRANS_SESSION(session, "Unblocking session\n"); - /* - * The recovery and unblock work get run from the same workqueue, - * so try to cancel it if it was going to run after this unblock. - */ - cancel_delayed_work(&session->recovery_work); + + cancel_delayed_work_sync(&session->recovery_work); spin_lock_irqsave(&session->lock, flags); session->state = ISCSI_SESSION_LOGGED_IN; spin_unlock_irqrestore(&session->lock, flags); |