alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Vinod Koul <vinod.koul@intel.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org, broonie@kernel.org,
	lgirdwood@gmail.com, stable@vger.kernel.org
Subject: Re: [PATCH 2/9] ALSA: compress: use mutex in drain
Date: Tue, 27 Aug 2013 15:17:41 +0530	[thread overview]
Message-ID: <20130827094741.GV2748@intel.com> (raw)
In-Reply-To: <s5hioyrjur0.wl%tiwai@suse.de>

On Tue, Aug 27, 2013 at 12:25:23PM +0200, Takashi Iwai wrote:
> At Tue, 27 Aug 2013 12:10:32 +0530,
> Vinod Koul wrote:
> > 
> > Since we dont have lock over the function, we need to aquire mutex when checking
> > and modfying states in drain and partial_drain handlers
> > 
> > Signed-off-by: Vinod Koul <vinod.koul@intel.com>
> > Cc: <stable@vger.kernel.org>
> > ---
> >  sound/core/compress_offload.c |   22 +++++++++++++++++++---
> >  1 files changed, 19 insertions(+), 3 deletions(-)
> > 
> > diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
> > index 868aefd..e640f8c 100644
> > --- a/sound/core/compress_offload.c
> > +++ b/sound/core/compress_offload.c
> > @@ -676,18 +676,29 @@ static int snd_compr_stop(struct snd_compr_stream *stream)
> >  	return retval;
> >  }
> >  
> > +/* this fn is called without lock being held and we change stream states here
> > + * so while using the stream state auquire the lock but relase before invoking
> > + * DSP as the call will possibly take a while
> > + */
> >  static int snd_compr_drain(struct snd_compr_stream *stream)
> >  {
> >  	int retval;
> >  
> > +	mutex_lock(&stream->device->lock);
> >  	if (stream->runtime->state == SNDRV_PCM_STATE_PREPARED ||
> > -			stream->runtime->state == SNDRV_PCM_STATE_SETUP)
> > -		return -EPERM;
> > +			stream->runtime->state == SNDRV_PCM_STATE_SETUP) {
> > +		retval = -EPERM;
> > +		goto ret;
> > +	}
> > +	mutex_unlock(&stream->device->lock);
> >  	retval = stream->ops->trigger(stream, SND_COMPR_TRIGGER_DRAIN);
> 
> Why release the lock here?  The trigger callback is called within this
> mutex lock in other places.
This is the main part :)

Since the drain states will take a while (order of few seconds) to execute so we
will be blocked. Thats why we cant have lock here. The point of lock is to sync
the stream states here. We are not modfying anything. During drain and partial
drain we need to allow other trigger ops like pause, stop tog o thru so drop the
lock here for these two ops only!

~Vinod

  reply	other threads:[~2013-08-27  9:47 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-27  6:40 [PATCH 0/9] ALSA: compress offfload fixes Vinod Koul
2013-08-27  6:40 ` [PATCH 1/9] ALSA: Compress - dont use lock for all ioctls Vinod Koul
2013-08-27 10:22   ` Takashi Iwai
2013-08-27  9:44     ` Vinod Koul
2013-08-27 11:00       ` Takashi Iwai
2013-08-27  6:40 ` [PATCH 2/9] ALSA: compress: use mutex in drain Vinod Koul
2013-08-27 10:25   ` Takashi Iwai
2013-08-27  9:47     ` Vinod Koul [this message]
2013-08-27 10:53       ` Takashi Iwai
2013-08-27 10:16         ` Vinod Koul
2013-08-27 12:23           ` Takashi Iwai
2013-08-27 13:09             ` Vinod Koul
2013-08-27 14:03               ` Takashi Iwai
2013-08-27 14:10                 ` Vinod Koul
2013-08-27  6:40 ` [PATCH 3/9] ASoC: compress: dont aquire lock for draining states Vinod Koul
2013-08-27  6:40 ` [PATCH 4/9] ALSA: compress: use snprint instread of sprintf Vinod Koul
2013-08-27  6:40 ` [PATCH 5/9] ALSA: compres: wakeup the poll thread on pause Vinod Koul
2013-08-27  6:40 ` [PATCH 6/9] ALSA: compress: dont write when stream is paused Vinod Koul
2013-08-27  6:40 ` [PATCH 7/9] ALSA: compress: allow write when stream is setup Vinod Koul
2013-08-27  6:40 ` [PATCH 8/9] ALSA: compress: call pointer callback and updates under a lock Vinod Koul
2013-08-27 10:31   ` Takashi Iwai
2013-08-27  9:48     ` Vinod Koul
2013-08-27 11:03       ` Takashi Iwai
2013-08-27  6:40 ` [PATCH 9/9] ALSA: compress: use rate values for passing sampling rates Vinod Koul
2013-08-27 10:30   ` Takashi Iwai
2013-08-27 13:29   ` Mark Brown
2013-08-27 13:26     ` Vinod Koul
2013-08-27 14:27       ` Mark Brown
2013-08-27 10:46 ` [PATCH 0/9] ALSA: compress offfload fixes Takashi Iwai
2013-08-27 10:09   ` Vinod Koul
2013-08-27 12:32     ` Takashi Iwai
2013-08-27 13:14       ` Vinod Koul
2013-08-27 14:05         ` Takashi Iwai
2013-08-27 13:30           ` Vinod Koul
2013-08-27 14:22             ` Takashi Iwai
2013-08-27 13:41               ` Vinod Koul
2013-08-27 14:41                 ` Takashi Iwai
2013-08-27 14:11                   ` Vinod Koul
2013-08-27 13:28       ` Mark Brown
2013-08-27 13:18         ` Vinod Koul

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=20130827094741.GV2748@intel.com \
    --to=vinod.koul@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=stable@vger.kernel.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).