diff options
author | Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com> | 2016-04-26 02:31:57 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-04-29 19:08:24 -0400 |
commit | fc4bf75ea300a5e62a2419f89dd0e22189dd7ab7 (patch) | |
tree | f12405b5dcddd18ab38d9ea5ea38a7cab6d196b5 /drivers/scsi | |
parent | e4d5c4e238999ba0b68618a91eec33e7079cdbd4 (diff) |
aacraid: Fix for aac_command_thread hang
Typically under error conditions, it is possible for aac_command_thread()
to miss the wakeup from kthread_stop() and go back to sleep, causing it
to hang aac_shutdown.
In the observed scenario, the adapter is not functioning correctly and so
aac_fib_send() never completes (or time-outs depending on how it was
called). Shortly after aac_command_thread() starts it performs
aac_fib_send(SendHostTime) which hangs. When aac_probe_one
/aac_get_adapter_info send time outs, kthread_stop is called which breaks
the command thread out of it's hang.
The code will still go back to sleep in schedule_timeout() without
checking kthread_should_stop() so it causes aac_probe_one to hang until
the schedule_timeout() which is 30 minutes.
Fixed by: Adding another kthread_should_stop() before schedule_timeout()
Cc: stable@vger.kernel.org
Signed-off-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/aacraid/commsup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c index 725aa78cab61..bb7988d53216 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c | |||
@@ -1996,6 +1996,10 @@ int aac_command_thread(void *data) | |||
1996 | if (difference <= 0) | 1996 | if (difference <= 0) |
1997 | difference = 1; | 1997 | difference = 1; |
1998 | set_current_state(TASK_INTERRUPTIBLE); | 1998 | set_current_state(TASK_INTERRUPTIBLE); |
1999 | |||
2000 | if (kthread_should_stop()) | ||
2001 | break; | ||
2002 | |||
1999 | schedule_timeout(difference); | 2003 | schedule_timeout(difference); |
2000 | 2004 | ||
2001 | if (kthread_should_stop()) | 2005 | if (kthread_should_stop()) |