[PATCH v2 1/2] ASoC: Intel: avs: Lock substream before snd_pcm_stop()

Takashi Iwai tiwai at suse.de
Mon Nov 14 14:16:46 CET 2022


On Mon, 14 Nov 2022 14:00:12 +0100,
Takashi Iwai wrote:
> 
> On Mon, 14 Nov 2022 12:37:28 +0100,
> Cezary Rojewski wrote:
> > 
> > snd_pcm_stop() shall be called with stream lock held to prevent any
> > races between nonatomic streaming operations.
> > 
> > Fixes: 2f1f570cd730 ("ASoC: Intel: avs: Coredump and recovery flow")
> > Signed-off-by: Cezary Rojewski <cezary.rojewski at intel.com>
> > ---
> >  sound/soc/intel/avs/ipc.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/sound/soc/intel/avs/ipc.c b/sound/soc/intel/avs/ipc.c
> > index 152f8d0bdf8e..07655298b6c7 100644
> > --- a/sound/soc/intel/avs/ipc.c
> > +++ b/sound/soc/intel/avs/ipc.c
> > @@ -123,7 +123,9 @@ static void avs_dsp_recovery(struct avs_dev *adev)
> >  				if (!substream || !substream->runtime)
> >  					continue;
> >  
> > +				snd_pcm_stream_lock(substream);
> >  				snd_pcm_stop(substream, SNDRV_PCM_STATE_DISCONNECTED);
> > +				snd_pcm_stream_unlock(substream);
> 
> Isn't it in the interruptible context?  If so, you need the _irq()
> variant.

Correction: when it's a non-atomic stream, that doesn't matter, both
are identical.


Takashi


More information about the Alsa-devel mailing list