iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers: usb: host: Fix deadlock in oxu_bus_suspend()

Browse Source 
[ Upstream commit 4d378f2ae5 ]

There is a deadlock in oxu_bus_suspend(), which is shown below:

   (Thread 1)              |      (Thread 2)
                           | timer_action()
oxu_bus_suspend()          |  mod_timer()
 spin_lock_irq() //(1)     |  (wait a time)
 ...                       | oxu_watchdog()
 del_timer_sync()          |  spin_lock_irq() //(2)
 (wait timer to stop)      |  ...

We hold oxu->lock in position (1) of thread 1, and use
del_timer_sync() to wait timer to stop, but timer handler
also need oxu->lock in position (2) of thread 2. As a result,
oxu_bus_suspend() will block forever.

This patch extracts del_timer_sync() from the protection of
spin_lock_irq(), which could let timer handler to obtain
the needed lock.

Signed-off-by: Duoming Zhou <duoming@zju.edu.cn>
Link: https://lore.kernel.org/r/20220417120305.64577-1-duoming@zju.edu.cn
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Duoming Zhou
2022-04-17 20:03:05 +08:00
committed by Greg Kroah-Hartman
parent 0976808d0d
commit 9b58d255f2
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/host/oxu210hp-hcd.c
View File

@ -3491,8 +3491,10 @@ static int oxu_bus_suspend(struct usb_hcd *hcd)
} }
} }
spin_unlock_irq(&oxu->lock);
/* turn off now-idle HC */ /* turn off now-idle HC */
del_timer_sync(&oxu->watchdog); del_timer_sync(&oxu->watchdog);
spin_lock_irq(&oxu->lock);
ehci_halt(oxu); ehci_halt(oxu);
hcd->state = HC_STATE_SUSPENDED; hcd->state = HC_STATE_SUSPENDED;