ALSA: Fix deadlocks with kctl removals at disconnection
PATCH 1/1 ALSA: Fix deadlocks with kctl removals at disconnection
In snd_card_disconnect(), we set card->shutdown flag at the beginning, call callbacks and do sync for card->power_ref_sleep waiters at the end. The callback may delete a kctl element, and this can lead to a deadlock when the device was in the suspended state. Namely:
* A process waits for the power up at snd_power_ref_and_wait() in snd_ctl_info() or read/write() inside card->controls_rwsem.
* The system gets disconnected meanwhile, and the driver tries to delete a kctl via snd_ctl_remove*(); it tries to take card->controls_rwsem again, but this is already locked by the above. Since the sleeper isn't woken up, this deadlocks.
An easy fix is to wake up sleepers before processing the driver disconnect callbacks but right after setting the card->shutdown flag. Then all sleepers will abort immediately, and the code flows again.
So, basically this patch moves the wait_event() call at the right timing. While we're at it, just to be sure, call wait_event_all() instead of wait_event(), although we don't use exclusive events on this queue for now.
--- sound/core/init.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
sound/core/init.c +8 -1
@@ -516,6 +516,14 @@ void snd_card_disconnect(struct snd_card *card) } } +#ifdef CONFIG_PM +/* wake up sleepers here before other callbacks for avoiding potential +* deadlocks with other locks (e.g. in kctls); +* then this notifies the shutdown and sleepers would abort immediately +*/ +wake_up_all (&card->power_sleep); +#endif +/* notify all connected devices about disconnection */ /* at this point, they cannot respond to any calls except release() */
@@ -543,7 +551,6 @@ void snd_card_disconnect(struct snd_card *card) }#ifdef CONFIG_PM -wake_up (&card->power_sleep);snd_power_sync_ref (card);#endif }
Signature · 1 line
2.43.0
Quoted 17 lines · Takashi Iwai
In
snd_card_disconnect(), we setcard->shutdownflag at the beginning, call callbacks and do sync forcard->power_ref_sleepwaiters at the end. The callback may delete a kctl element, and this can lead to a deadlock when the device was in the suspended state. Namely:* A process waits for the power up at
snd_power_ref_and_wait()insnd_ctl_info()or read/write() insidecard->controls_rwsem.* The system gets disconnected meanwhile, and the driver tries to delete a kctl via snd_ctl_remove*(); it tries to take
card->controls_rwsemagain, but this is already locked by the above. Since the sleeper isn't woken up, this deadlocks.An easy fix is to wake up sleepers before processing the driver disconnect callbacks but right after setting the
card->shutdownflag. Then all sleepers will abort immediately, and the code flows again.
Quoted 8 lines
So, basically this patch moves the
wait_event()call at the right timing. While we're at it, just to be sure, callwait_event_all()instead ofwait_event(), although we don't use exclusive events on this queue for now.
LGTM
Signature · 2 lines
Jaroslav Kysela <[email protected]> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.