All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnaud POULIQUEN <arnaud.pouliquen@foss.st.com>
To: Takashi Iwai <tiwai@suse.de>, Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org, Daniel Palmer <daniel@0x0f.com>
Subject: Re: [PATCH] ASoC: sti: Fix deadlock via snd_pcm_stop_xrun() call
Date: Tue, 15 Mar 2022 17:58:20 +0100	[thread overview]
Message-ID: <fceeff3f-7b70-15ad-1833-9d6ae9aa2776@foss.st.com> (raw)
In-Reply-To: <20220315164158.19804-1-tiwai@suse.de>



On 3/15/22 17:41, Takashi Iwai wrote:
> This is essentially a revert of the commit dc865fb9e7c2 ("ASoC: sti:
> Use snd_pcm_stop_xrun() helper"), which converted the manual
> snd_pcm_stop() calls with snd_pcm_stop_xrun().
> 
> The commit above introduced a deadlock as snd_pcm_stop_xrun() itself
> takes the PCM stream lock while the caller already holds it.  Since
> the conversion was done only for consistency reason and the open-call
> with snd_pcm_stop() to the XRUN state is a correct usage, let's revert
> the commit back as the fix.
> 
> Fixes: dc865fb9e7c2 ("ASoC: sti: Use snd_pcm_stop_xrun() helper")
> Reported-by: Daniel Palmer <daniel@0x0f.com>
> Cc: Arnaud POULIQUEN <arnaud.pouliquen@st.com>
> Cc: <stable@vger.kernel.org>
> Link: https://lore.kernel.org/r/20220315091319.3351522-1-daniel@0x0f.com
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

Thanks for the fix!

Reviewed-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>

Regards,
Arnaud

> ---
>  sound/soc/sti/uniperif_player.c | 6 +++---
>  sound/soc/sti/uniperif_reader.c | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/sti/uniperif_player.c b/sound/soc/sti/uniperif_player.c
> index 2ed92c990b97..dd9013c47664 100644
> --- a/sound/soc/sti/uniperif_player.c
> +++ b/sound/soc/sti/uniperif_player.c
> @@ -91,7 +91,7 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id)
>  			SET_UNIPERIF_ITM_BCLR_FIFO_ERROR(player);
>  
>  			/* Stop the player */
> -			snd_pcm_stop_xrun(player->substream);
> +			snd_pcm_stop(player->substream, SNDRV_PCM_STATE_XRUN);
>  		}
>  
>  		ret = IRQ_HANDLED;
> @@ -105,7 +105,7 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id)
>  		SET_UNIPERIF_ITM_BCLR_DMA_ERROR(player);
>  
>  		/* Stop the player */
> -		snd_pcm_stop_xrun(player->substream);
> +		snd_pcm_stop(player->substream, SNDRV_PCM_STATE_XRUN);
>  
>  		ret = IRQ_HANDLED;
>  	}
> @@ -138,7 +138,7 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id)
>  		dev_err(player->dev, "Underflow recovery failed\n");
>  
>  		/* Stop the player */
> -		snd_pcm_stop_xrun(player->substream);
> +		snd_pcm_stop(player->substream, SNDRV_PCM_STATE_XRUN);
>  
>  		ret = IRQ_HANDLED;
>  	}
> diff --git a/sound/soc/sti/uniperif_reader.c b/sound/soc/sti/uniperif_reader.c
> index 136059331211..065c5f0d1f5f 100644
> --- a/sound/soc/sti/uniperif_reader.c
> +++ b/sound/soc/sti/uniperif_reader.c
> @@ -65,7 +65,7 @@ static irqreturn_t uni_reader_irq_handler(int irq, void *dev_id)
>  	if (unlikely(status & UNIPERIF_ITS_FIFO_ERROR_MASK(reader))) {
>  		dev_err(reader->dev, "FIFO error detected\n");
>  
> -		snd_pcm_stop_xrun(reader->substream);
> +		snd_pcm_stop(reader->substream, SNDRV_PCM_STATE_XRUN);
>  
>  		ret = IRQ_HANDLED;
>  	}

  reply	other threads:[~2022-03-15 16:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-15 16:41 [PATCH] ASoC: sti: Fix deadlock via snd_pcm_stop_xrun() call Takashi Iwai
2022-03-15 16:58 ` Arnaud POULIQUEN [this message]
2022-03-16 20:35 ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fceeff3f-7b70-15ad-1833-9d6ae9aa2776@foss.st.com \
    --to=arnaud.pouliquen@foss.st.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=daniel@0x0f.com \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.