OSDN Git Service

scsi: iscsi: Fix recovery and unblocking race
authorMike Christie <michael.christie@oracle.com>
Sat, 26 Feb 2022 23:04:30 +0000 (17:04 -0600)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 2 Mar 2022 04:56:28 +0000 (23:56 -0500)
commit8dd3dff3bf3e9d91df3a4c3665d3da873b6095b8
treea04a8f4bbef02f92fb4a54c0a097ee025149c8fb
parent07e0984b96ec1ba8c6de1c092b986b00ea0c114c
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>
drivers/scsi/scsi_transport_iscsi.c