set_bit doesn't provide a barrier, so we can hit race where we've called
iscsi_suspend_tx and didn't see a work queued, and then a work is queued
and run and doesn't see the suspend bit is set. We will then call into the
driver when they might have already cleaned up their xmit related code.
Reviewed-by: Lee Duncan <lduncan@xxxxxxxx>
Signed-off-by: Mike Christie <michael.christie@xxxxxxxxxx>
---
drivers/scsi/libiscsi.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 5380216f7c05..24d4392f65d0 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -2021,10 +2021,14 @@ EXPORT_SYMBOL_GPL(iscsi_suspend_queue);
*/
void iscsi_suspend_tx(struct iscsi_conn *conn)
{
- struct Scsi_Host *shost = conn->session->host;
+ struct iscsi_session *session = conn->session;
+ struct Scsi_Host *shost = session->host;
struct iscsi_host *ihost = shost_priv(shost);
+ spin_lock_bh(&session->frwd_lock);
set_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags);
+ spin_unlock_bh(&session->frwd_lock);
+
if (ihost->workq)
flush_work(&conn->xmitwork);
}
--
2.25.1
