From: Takashi Iwai <tiwai@suse.de>
To: Amadeusz SX2awiX4ski <amadeuszx.slawinski@linux.intel.com>
Cc: alsa-devel@alsa-project.org, Hu Jiahui <kirin.say@gmail.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 3/4] ALSA: pcm: Fix races among concurrent prepare and hw_params/hw_free calls
Date: Wed, 23 Mar 2022 09:22:44 +0100 [thread overview]
Message-ID: <s5hv8w5ulgr.wl-tiwai@suse.de> (raw)
In-Reply-To: <s5hy211ult4.wl-tiwai@suse.de>
On Wed, 23 Mar 2022 09:15:19 +0100,
Takashi Iwai wrote:
>
> On Wed, 23 Mar 2022 09:08:25 +0100,
> Amadeusz SX2awiX4ski wrote:
> >
> > On 3/22/2022 6:07 PM, Takashi Iwai wrote:
> > > Like the previous fixes to hw_params and hw_free ioctl races, we need
> > > to paper over the concurrent prepare ioctl calls against hw_params and
> > > hw_free, too.
> > >
> > > This patch implements the locking with the existing
> > > runtime->buffer_mutex for prepare ioctls. Unlike the previous case
> > > for snd_pcm_hw_hw_params() and snd_pcm_hw_free(), snd_pcm_prepare() is
> > > performed to the linked streams, hence the lock can't be applied
> > > simply on the top. For tracking the lock in each linked substream, we
> > > modify snd_pcm_action_group() slightly and apply the buffer_mutex for
> > > the case stream_lock=false (formerly there was no lock applied)
> > > there.
> > >
> > > Cc: <stable@vger.kernel.org>
> > > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > > ---
> > > sound/core/pcm_native.c | 32 ++++++++++++++++++--------------
> > > 1 file changed, 18 insertions(+), 14 deletions(-)
> > >
> > > diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
> > > index 266895374b83..0e4fbf5fd87b 100644
> > > --- a/sound/core/pcm_native.c
> > > +++ b/sound/core/pcm_native.c
> > > @@ -1190,15 +1190,17 @@ struct action_ops {
> > > static int snd_pcm_action_group(const struct action_ops *ops,
> > > struct snd_pcm_substream *substream,
> > > snd_pcm_state_t state,
> > > - bool do_lock)
> > > + bool stream_lock)
> > > {
> > > struct snd_pcm_substream *s = NULL;
> > > struct snd_pcm_substream *s1;
> > > int res = 0, depth = 1;
> > > snd_pcm_group_for_each_entry(s, substream) {
> > > - if (do_lock && s != substream) {
> > > - if (s->pcm->nonatomic)
> > > + if (s != substream) {
> > > + if (!stream_lock)
> > > + mutex_lock_nested(&s->runtime->buffer_mutex, depth);
> > > + else if (s->pcm->nonatomic)
> > > mutex_lock_nested(&s->self_group.mutex, depth);
> > > else
> > > spin_lock_nested(&s->self_group.lock, depth);
> >
> > Maybe
> > if (!stream_lock)
> > mutex_lock_nested(&s->runtime->buffer_mutex, depth);
> > else
> > snd_pcm_group_lock(&s->self_group, s->pcm->nonatomic);
> > ?
>
> No, it must be nested locks with the given subclass.
FWIW, the reason is that lockdep would complain otherwise as if it
were a deadlock. That is, this is a workaround for avoiding false
lockdep warnings.
Takashi
next prev parent reply other threads:[~2022-03-23 8:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-22 17:07 [PATCH 0/4] ALSA: pcm: Fix ioctl races Takashi Iwai
2022-03-22 17:07 ` [PATCH 1/4] ALSA: pcm: Fix races among concurrent hw_params and hw_free calls Takashi Iwai
2022-03-22 17:07 ` [PATCH 2/4] ALSA: pcm: Fix races among concurrent read/write and buffer changes Takashi Iwai
2022-03-22 17:07 ` [PATCH 3/4] ALSA: pcm: Fix races among concurrent prepare and hw_params/hw_free calls Takashi Iwai
2022-03-23 8:08 ` Amadeusz Sławiński
2022-03-23 8:15 ` Takashi Iwai
2022-03-23 8:22 ` Takashi Iwai [this message]
2022-03-22 17:07 ` [PATCH 4/4] ALSA: pcm: Fix races among concurrent prealloc proc writes Takashi Iwai
2022-03-22 17:14 ` [PATCH 0/4] ALSA: pcm: Fix ioctl races Jaroslav Kysela
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=s5hv8w5ulgr.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=amadeuszx.slawinski@linux.intel.com \
--cc=kirin.say@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/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).