ALSA: usb-audio: qcom: Adjust mutex unlock order
PATCH v4 1/1 ALSA: usb-audio: qcom: Adjust mutex unlock order
The mutexes qdev_mutex and chip->mutex are acquired in that order throughout the driver. To preserve proper lock hierarchy and avoid potential deadlocks, they must be released in the reverse order of acquisition.
This change reorders the unlock sequence to first release chip->mutex followed by qdev_mutex, ensuring consistency with the locking pattern.
SND offloading support")
changes since v3:
- Add the correct fixes tag.
--- sound/usb/qcom/qc_audio_offload.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/usb/qcom/qc_audio_offload.c +3 -3
@@ -825,8 +825,8 @@ static int uaudio_sideband_notifier(struct usb_interface *intf, } } -mutex_unlock (&qdev_mutex);mutex_unlock (&chip->mutex); +mutex_unlock (&qdev_mutex);return 0 ; }
@@ -1865,8 +1865,8 @@ static void qc_usb_audio_offload_disconnect(struct snd_usb_audio *chip)/* Device has already been cleaned up, or never populated */ if (!dev->chip) { -mutex_unlock (&qdev_mutex);mutex_unlock (&chip->mutex); +mutex_unlock (&qdev_mutex);return ; }
@@ -1921,8 +1921,8 @@ static void qc_usb_audio_offload_suspend(struct usb_interface *intf,uaudio_send_disconnect_ind (chip); +mutex_unlock (&chip->mutex);mutex_unlock (&qdev_mutex); -mutex_unlock (&chip->mutex); }static struct snd_usb_platform_ops offload_ops = {
Signature · 1 line
2.43.0
…
Quoted 8 lines
This change reorders the unlock sequence to first release
chip->mutexfollowed byqdev_mutex, ensuring consistency with the locking pattern.Fixes 326bbc348298a ("ALSA: usb-audio: qcom: Introduce QC USBSND offloading support")
changes since v3:
- Add the correct fixes tag.
…
Please take another look at patch requirements.
Regards,
Markus
Quoted 4 lines
The mutexes
qdev_mutexandchip->mutexare acquired in that order throughout the driver. To preserve proper lock hierarchy and avoid potential deadlocks, they must be released in the reverse order of acquisition.
Would you become interested to benefit any more from lock guards?
https://elixir.bootlin.com/linux/v6.16-rc6/source/include/linux/mutex.h#L225
Regards,
Markus
Quoted 11 lines · Erick Karanja
The mutexes
qdev_mutexandchip->mutexare acquired in that order throughout the driver. To preserve proper lock hierarchy and avoid potential deadlocks, they must be released in the reverse order of acquisition.This change reorders the unlock sequence to first release
chip->mutexfollowed byqdev_mutex, ensuring consistency with the locking pattern.Fixes 326bbc348298a ("ALSA: usb-audio: qcom: Introduce QC USBSND offloading support")
This has to be a single line without folding.
Quoted 33 lines
changes since v3:
- Add the correct fixes tag.Signed-off-by Erick Karanja <[email protected]>--- sound/usb/qcom/qc_audio_offload.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)sound/usb/qcom/qc_audio_offload.c +2
-2@@ -825,8 +825,8 @@ static int uaudio_sideband_notifier(struct usb_interface *intf, } } -mutex_unlock (&qdev_mutex);mutex_unlock (&chip->mutex); +mutex_unlock (&qdev_mutex);return 0 ; }@@ -1865,8 +1865,8 @@ static void qc_usb_audio_offload_disconnect(struct snd_usb_audio *chip)/* Device has already been cleaned up, or never populated */ if (!dev->chip) { -mutex_unlock (&qdev_mutex);mutex_unlock (&chip->mutex); +mutex_unlock (&qdev_mutex);return ; }
sound/usb/qcom/qc_audio_offload.c static void qc_usb_audio_offload_suspend(struct usb_interface *intf, · line 1925
Quoted 6 lines
sound/usb/qcom/qc_audio_offload.c +1
-1@@ -1921,8 +1921,8 @@ static void qc_usb_audio_offload_suspend(struct usb_interface *intf,uaudio_send_disconnect_ind (chip); +mutex_unlock (&chip->mutex);mutex_unlock (&qdev_mutex); -mutex_unlock (&chip->mutex);
The above used spaces instead of tabs, and I corrected in my side. Such a failure could be spotted out by running scripts/checkpatch.pl. At the next time, please run and test it before submissions.
In anyway, I applied the patch now.
thanks,
Takashi
…
Quoted 1 line
Quoted 1 line
+++
b/sound/usb/qcom/qc_audio_offload.c
…
Quoted 10 lines
Quoted 10 lines
sound/usb/qcom/qc_audio_offload.c +1
-1@@ -1865,8 +1865,8 @@ static void qc_usb_audio_offload_disconnect(struct snd_usb_audio *chip)/* Device has already been cleaned up, or never populated */ if (!dev->chip) { -mutex_unlock (&qdev_mutex);mutex_unlock (&chip->mutex); +mutex_unlock (&qdev_mutex);return ; }
…
Quoted 1 line
In anyway, I applied the patch now.
How do you think about to refine this function implementation another bit by using an additional label like “unlock” rather than keeping duplicate source code?
Regards,
Markus