USB-audio disconnection race fixes
cover USB-audio disconnection race fixes
Hi,
these two patches are for fixing races at disconnection of USB audio devices. The first patch tries to close the race at open/close, and the next is for other PCM and mixer ops in usb-audio driver.
It seems working as far as I've tested with Matthieu's test cases.
thanks,
Takashi
PATCH 1/2 ALSA: PCM: Fix some races at disconnection
Fix races at PCM disconnection:
- while a PCM device is being opened or closed
- while the PCM state is being changed without lock in prepare, hw_params, hw_free ops
--- sound/core/pcm.c | 7 ++++++- sound/core/pcm_native.c | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-)
sound/core/pcm.c +6 -1
@@ -1086,11 +1086,15 @@ static int snd_pcm_dev_disconnect(struct snd_device *device)if (list_empty (&pcm->list)) goto unlock; +mutex_lock (&pcm->open_mutex);list_del_init (&pcm->list);for (cidx =0 ; cidx <2 ; cidx++) -for (substream = pcm->streams[cidx].substream; substream; substream = substream->next) +for (substream = pcm->streams[cidx].substream; substream; substream = substream->next) { +snd_pcm_stream_lock_irq (substream);if (substream->runtime) substream->runtime->status->state =SNDRV_PCM_STATE_DISCONNECTED ; +snd_pcm_stream_unlock_irq (substream); + }list_for_each_entry (notify, &snd_pcm_notify_list, list) { notify->n_disconnect (pcm); }
@@ -1110,6 +1114,7 @@ static int snd_pcm_dev_disconnect(struct snd_device *device) pcm->streams[cidx].chmap_kctl =NULL ; } } +mutex_unlock (&pcm->open_mutex); unlock:mutex_unlock (®ister_mutex);return 0 ;
sound/core/pcm_native.c +12 -4
@@ -369,6 +369,14 @@ static int period_to_usecs(struct snd_pcm_runtime *runtime)return usecs; } +static void snd_pcm_set_state (struct snd_pcm_substream *substream,int state) +{ +snd_pcm_stream_lock_irq (substream); +if (substream->runtime->status->state !=SNDRV_PCM_STATE_DISCONNECTED ) + substream->runtime->status->state = state; +snd_pcm_stream_unlock_irq (substream); +} +static int snd_pcm_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params) {
@@ -452,7 +460,7 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream, runtime->boundary *=2 ;snd_pcm_timer_resolution_change (substream); - runtime->status->state =SNDRV_PCM_STATE_SETUP ; +snd_pcm_set_state (substream,SNDRV_PCM_STATE_SETUP );if (pm_qos_request_active (&substream->latency_pm_qos_req))pm_qos_remove_request (&substream->latency_pm_qos_req);
@@ -464,7 +472,7 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,/* hardware might be unusable from this time, so we force application to retry to set the correct hardware parameter settings */ - runtime->status->state =SNDRV_PCM_STATE_OPEN ; +snd_pcm_set_state (substream,SNDRV_PCM_STATE_OPEN );if (substream->ops->hw_free !=NULL ) substream->ops->hw_free (substream);return err;
@@ -512,7 +520,7 @@ static int snd_pcm_hw_free(struct snd_pcm_substream *substream)return -EBADFD ;if (substream->ops->hw_free) result = substream->ops->hw_free (substream); - runtime->status->state =SNDRV_PCM_STATE_OPEN ; +snd_pcm_set_state (substream,SNDRV_PCM_STATE_OPEN );pm_qos_remove_request (&substream->latency_pm_qos_req);return result; }
@@ -1320,7 +1328,7 @@ static void snd_pcm_post_prepare(struct snd_pcm_substream *substream, int state) {struct snd_pcm_runtime *runtime = substream->runtime; runtime->control->appl_ptr = runtime->status->hw_ptr; - runtime->status->state =SNDRV_PCM_STATE_PREPARED ; +snd_pcm_set_state (substream,SNDRV_PCM_STATE_PREPARED ); }static struct action_ops snd_pcm_action_prepare = {
Signature · 6 lines
1.7.12.2 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 2/2 ALSA: usb-audio: Fix races at disconnection
In reply to Takashi IwaiClose some races at disconnection of a USB audio device by adding the chip->shutdown_mutex and chip->shutdown check at appropriate places.
The spots to put bandaids are:
- PCM prepare, hw_params and hw_free
- where the usb device is accessed for communication or get speed, in mixer.c and others; the device speed is now cached in subs->speed instead of accessing to chip->dev
The accesses in PCM open and close don't need the mutex protection because these are already handled in the core PCM disconnection code.
--- sound/usb/card.h | 1 + sound/usb/mixer.c | 45 +++++++++++++++++++++++++++++++-------------- sound/usb/pcm.c | 50 +++++++++++++++++++++++++++++++++----------------- sound/usb/proc.c | 4 ++-- sound/usb/stream.c | 1 + 5 files changed, 68 insertions(+), 33 deletions(-)
sound/usb/card.h +1 -0
@@ -126,6 +126,7 @@ struct snd_usb_substream {struct snd_usb_endpoint *sync_endpoint;unsigned long flags;bool need_setup_ep;/* (re)configure EP at prepare? */ +unsigned int speed;/* USB_SPEED_XXX */ u64 formats;/* format bitmasks (all or'ed) */ unsigned int num_formats;/* number of supported audio formats (list) */
sound/usb/mixer.c +31 -14
103 lines not on this page · raw message
sound/usb/pcm.c +33 -17
124 lines not on this page · raw message
sound/usb/proc.c +2 -2
@@ -108,7 +108,7 @@ static void proc_dump_substream_formats(struct snd_usb_substream *subs, struct s }snd_iprintf (buffer,"\n" ); } -if (snd_usb_get_speed (subs->dev) !=USB_SPEED_FULL ) +if (subs->speed !=USB_SPEED_FULL )snd_iprintf (buffer," Data packet interval: %d us\n" ,125 * (1 << fp->datainterval));// snd_iprintf(buffer, " Max Packet Size = %d\n", fp->maxpacksize);
@@ -124,7 +124,7 @@ static void proc_dump_ep_status(struct snd_usb_substream *subs,return ;snd_iprintf (buffer," Packet Size = %d\n" , ep->curpacksize);snd_iprintf (buffer," Momentary freq = %u Hz (%#x.%04x)\n" , -snd_usb_get_speed (subs->dev) ==USB_SPEED_FULL + subs->speed ==USB_SPEED_FULL ?get_full_speed_hz (ep->freqm) :get_high_speed_hz (ep->freqm), ep->freqm >>16 , ep->freqm &0xffff );
sound/usb/stream.c +1 -0
@@ -90,6 +90,7 @@ static void snd_usb_init_substream(struct snd_usb_stream *as, subs->direction = stream; subs->dev = as->chip->dev; subs->txfr_quirk = as->chip->txfr_quirk; + subs->speed =snd_usb_get_speed (subs->dev);snd_usb_set_pcm_ops (as->pcm, stream);
Signature · 6 lines
1.7.12.2 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html