On 5/23/21 10:57 AM, Mike Christie wrote:
> We set the max_active iSCSI EH works to 1, so all work is going to execute
> in order by default. However, userspace can now override this in sysfs. If
> max_active > 1, we can end up with the block_work on CPU1 and
> iscsi_unblock_session running the unblock_work on CPU2 and the session
> and target/device state will end up out of sync with each other.
>
> This adds a flush of the block_work in iscsi_unblock_session.
>
> Fixes: 1d726aa6ef57 ("scsi: iscsi: Optimize work queue flush use")
> Signed-off-by: Mike Christie <michael.christie@xxxxxxxxxx>
> ---
> drivers/scsi/scsi_transport_iscsi.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
> index 909134b9c313..b07105ae7c91 100644
> --- a/drivers/scsi/scsi_transport_iscsi.c
> +++ b/drivers/scsi/scsi_transport_iscsi.c
> @@ -1969,6 +1969,8 @@ static void __iscsi_unblock_session(struct work_struct *work)
> */
> void iscsi_unblock_session(struct iscsi_cls_session *session)
> {
> + flush_work(&session->block_work);
> +
> queue_work(iscsi_eh_timer_workq, &session->unblock_work);
> /*
> * Blocking the session can be done from any context so we only
>
Reviewed-by: Lee Duncan <lduncan@xxxxxxxx>
