From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.42 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794461707; b=rWXql7dCGygzL7q1EV8qAOEXWz2l4aRtDog08KTRMUnE+NzyZKJumU8g8Gf6hkusp1D+ 1zQcz1fknwZd3L5EODVLuUGDzgaIqCG88BNBOoljwgFEU2tUuroBGxoXMoRORM7exFztK CqeF3k/PrMOferKdqYqFRIEQdI2wGpTfvJ7/HhtBSTciE8zn1CS+NfEtvrJOToPfjE2rv XIusjAkkqRVt0Z8gHudsF8IM4oauIQNYttOb7HPGeuol5CcZrsERlQU0utitcyzU18goK 5fYWRsg4kkCszy3b0FIylDnmPS8w+sT7RB9A4Exmo6t5i6rAVng3D1bFIdr2c+Pm1nw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794461707; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=6WXLhdA9GsEkrddx60iks/fOWkdskBmQv8j22OOgMQQ=; b=3KCpxg2SrdrkJLSGhxh99LjDZRd4jhIpsz0p0M390xL/sTg9tzVBrfvwu9WoHuDplx2s jgfBjJJ9vfv789MpfpftG7Vqo4iVGgOoNkMhqHYJDjMCqrDj41+QY57Y8EJDv6bMTcJZD Gkm/SDVAJelKns0Ld0UShBtYr/D5bElLQfwnywuQ2A5MbkcDzG/dnVsFnk7enuQx+FVU0 Wle0psSzlrKG6Kb5y8FR0N5+oDt/80y9oZR02Fjv/tD3EIdDwrEC1RmGBbwW0AGCusFge 3hzS7lhiCf9oRoPdSFQmSBxy3vFd/tVkDF8VJMru8JC9M6ERC7Cisz76XypNXwVQ7MQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=Q05xelgz; arc=none smtp.remote-ip=74.125.82.42 Received: from mail-dl1-f42.google.com (mail-dl1-f42.google.com [74.125.82.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 53AFB606A333 for ; Thu, 12 Nov 2026 05:35:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 53AFB606A333 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=Q05xelgz Received: by mail-dl1-f42.google.com with SMTP id a92af1059eb24-18818daa3e7so237047c88.0 for ; Wed, 11 Nov 2026 21:35:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794461707; x=1795066507; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=6WXLhdA9GsEkrddx60iks/fOWkdskBmQv8j22OOgMQQ=; b=Q05xelgzK838obqIoZqtLKsIFTnBtog1SVKtu4SZjgHMzLd9AnjPsCplCU9Nccy+S6 yFO3G8Z6QoLXpKl7X+HE11RlsondqwN+KVI3ZxOwzZ+yg2cTJxx3STihCb5TdqXbiZkX 8ukb+Em3CIpE6NhulWMFb9xkn+DW8zN863jeobYMXS6qbxGl97Y/E29f+ELAAm+1uQOj wM3mpKCqlsN6o/vf0rYdnXe037Ah5nYoOIP1siebMRSsRbl1sqjDqnwltABkad+R2zHp 95kguUBFvHd5mZjMt/5COtGVhhqDTZoQaIl0pKPcrdPQXUkb5vb7qvsTV7XzQqIT3FwP Z6wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794461707; x=1795066507; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=6WXLhdA9GsEkrddx60iks/fOWkdskBmQv8j22OOgMQQ=; b=in8Tv1cqTA/Jngv9+09nygy7d0LOdx4m+MpXs06BsHSvkjclPxX8mM3CS94Or/PU3C w1NUUERkPyPfaDJdzdPyy7DIVifoNo+nrS2HaG6QD4Ih/Mz17SpkXBZOSzyu2WfvplG4 BCByq0kgLX0XkwNbKji/W6igRsD57UFvBauBi1c6dPirQIuOghnp/kjyJvZwZU09FFNr FU79CpgN5s/KxnyMRCJ4pYc5sRHl8WkL3t8yAmDAw98QOJwps8azTqJjqpAY+DQ0q7Ip C1xC/OUwTp9wZwlYqv2VwGn51gR15BTZiIjYL5V+YInZGirRoftbwIvT2UW9f3Eh4GAf rYcw== X-Forwarded-Encrypted: i=1; AL+hErG8JIcx9mIdfdT1vEbIYTukABURhH3x+8iCs7xU+D1TabSAegYUt3Dj4Vm/DKQuUX+ot2IQR/3h96lsLw/sjQ==@lists.linux.dev X-Gm-Message-State: APuU4Z/BYwmLEtZF7FEP6ihyI3aHXGt15ha36k1pkviuMAKJKps6b7P/ g8TwzfO+5RLoWWkQOzzki9vOoSeEouLaVH1ilM0uEbcfPVNPeHYk3ZX0 X-Gm-Gg: AYBFou2jbPsoKoVsqM+wrmRhnIn6fjvl288R+fnJAnbXe57nlEYuwAHs1F1HZLbzXW4 YfiHu75vRtsoqYcTHMiiR0TOGOMzs57u/WRawwMaPGRydyhPrM1Om+pceTsDu788/ylCIyez7fH eyL55amlln2S8LZIuYKohOvHfRTpGyWA0nAgLv8eMcnm7/aBtG8ayVm91L5GtfKeppasKLdCXea cTN/fPze+zDPnMQirDPqG9c7dGYuxuUGf+V6IkLEiTwX/MAvqvSovLxUuF7XXWSbxv31NFKEw6j DnZXZTCpbTNrRrrYHqaqhGTX3s3Q+18OApSIVx45bjFPgQg+sdH9CFRpF40INc9BeiWivezMe26 NZEXpMYSXneQVJYXHcn9puG3+EvTivHQ3lTBEZmrCxA1edxm/5/bgHu0EP9zvnT56rmkIbRP+mw 6ztCZkjIoDSAman85OAH+Z2Rq5cMqjqAwZq2N474KD+E1bW70Q+KpVcvERYmr8eBSnmFHJ9wFp4 F8yXK0h1Mmx7qBCmQVjvIUVuD0XbUgpvh6q8qCQTprspuzDORATUHuIrke8XEO27GOk76EvSEYF GW/dFudr7zkl75ZIyVqm9QXGIc+lCkgYnzPcHWCTpHqfbGw9+bg94J9Zb/3GC0oSicAO2PP7Lyb 8pG9eDmjlYD9RgW23FICX1PjZfX8CxmKksx20V3QWtXAtiCA= X-Received: by 2002:a05:7022:b0c4:b0:194:e9e5:11b0 with SMTP id a92af1059eb24-1b4f5f37813mr1424852c88.14.1794461706444; Wed, 11 Nov 2026 21:35:06 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1b3b5890c0esm21953240c88.1.2026.11.11.21.35.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Nov 2026 21:35:05 -0800 (PST) From: Joonho Lee To: linux-sound@vger.kernel.org Cc: tiwai@suse.com, perex@perex.cz, anton.yakovlev@opensynergy.com, mst@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, corbet@lwn.net, skhan@linuxfoundation.org, rdunlap@infradead.org, linux-doc@vger.kernel.org, Joonho Lee Subject: [PATCH v29 04/17] ALSA: pcm: notify drivers after linked prepare completes Date: Thu, 12 Nov 2026 14:34:33 +0900 Message-ID: <20261112053446.73504-5-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261112053446.73504-1-mynameisjune111@gmail.com> References: <20261112053446.73504-1-mynameisjune111@gmail.com> X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit A linked prepare can finish one member before another member's driver prepare or reset fails. Drivers that admit transfers after their own prepare callback can then accept an ACK while the group action is still incomplete. Add an optional prepare_complete callback. After all sleeping prepare and reset actions have succeeded, take the group and member PCM locks, publish every PREPARED state, and notify opted-in drivers before releasing those locks. Keep the buffer locks and access gates held throughout the operation. A concurrent DROP observes the group before or after this commit point. On a driver error, notify only the attempted prefix, including the failing member. On any revoked prepare, opted-in members in the affected prefix or group return to SETUP. Preserve DISCONNECTED members and keep SUSPENDED members suspended, but set both saved suspended-state fields to SETUP so a later prepare can recover. Leave unreached members untouched after a driver error. Preflight failures have no completion callback. A successful driver action canceled by a terminal state returns -ESTRPIPE or -EBADFD, respectively. A driver error keeps its original return value. DISCONNECTED takes precedence when a linked group contains both terminal states. Do not generate a stop-timer event while closing prepare admission. Ordinary legacy drivers keep their existing successful preparation and pointer rebasing. The new callback runs with the group and member locks held and must neither sleep nor acquire another PCM stream lock. Assisted-by: LLM Signed-off-by: Joonho Lee --- include/sound/pcm.h | 18 +++++ sound/core/pcm_native.c | 162 +++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 160 insertions(+), 20 deletions(-) diff --git a/include/sound/pcm.h b/include/sound/pcm.h --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -77,6 +77,24 @@ unsigned long offset); int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma); int (*ack)(struct snd_pcm_substream *substream); + /* + * Optional prepare completion notification. Called while the core holds + * all linked PCM stream locks, after prepare/reset actions succeed or stop + * at the first error. On success, the core publishes PREPARED for every + * member before calling this with true. If any member is DISCONNECTED or + * SUSPENDED, opted-in members in the affected group receive false. + * Nonterminal opted-in members become SETUP. DISCONNECTED members remain + * DISCONNECTED. SUSPENDED members remain SUSPENDED with both saved + * suspended-state fields set to SETUP. On a driver failure, called with false + * for opted-in members whose action ran, including the failing member. + * Members not reached and pre-action failures receive no callback. Standalone + * RESET does not call this callback. It must not sleep or acquire another PCM + * stream lock. + * A terminal-state cancellation returns -EBADFD for DISCONNECTED or + * -ESTRPIPE for SUSPENDED. + */ + void (*prepare_complete)(struct snd_pcm_substream *substream, + bool success); /* * Optional RESET operation, also used after a successful prepare. * Called with this substream's PCM lock held; atomic streams must not diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1310,6 +1310,10 @@ snd_pcm_state_t state); void (*post_action)(struct snd_pcm_substream *substream, snd_pcm_state_t state); + int (*finish_action)(struct snd_pcm_substream *substream, + snd_pcm_state_t state, bool success, + struct snd_pcm_substream *failed_substream, + bool stream_lock); }; /* @@ -1350,12 +1354,19 @@ ops->undo_action(s1, state); } } + if (ops->finish_action) { + ops->finish_action(substream, state, false, s, + stream_lock); + } s = NULL; /* unlock all */ goto _unlock; } } - snd_pcm_group_for_each_entry(s, substream) { - ops->post_action(s, state); + if (ops->finish_action) { + res = ops->finish_action(substream, state, true, NULL, stream_lock); + } else { + snd_pcm_group_for_each_entry(s, substream) + ops->post_action(s, state); } _unlock: /* unlock streams */ @@ -1379,7 +1390,8 @@ */ static int snd_pcm_action_single(const struct action_ops *ops, struct snd_pcm_substream *substream, - snd_pcm_state_t state) + snd_pcm_state_t state, + bool stream_lock) { int res; @@ -1387,10 +1399,19 @@ if (res < 0) return res; res = ops->do_action(substream, state); - if (res == 0) - ops->post_action(substream, state); - else if (ops->undo_action) - ops->undo_action(substream, state); + if (res == 0) { + if (ops->finish_action) + res = ops->finish_action(substream, state, true, NULL, + stream_lock); + else + ops->post_action(substream, state); + } else { + if (ops->undo_action) + ops->undo_action(substream, state); + if (ops->finish_action) + ops->finish_action(substream, state, false, substream, + stream_lock); + } return res; } @@ -1469,7 +1490,7 @@ if (group) res = snd_pcm_action_group(ops, substream, state, true); else - res = snd_pcm_action_single(ops, substream, state); + res = snd_pcm_action_single(ops, substream, state, true); snd_pcm_group_unref(group, substream); return res; } @@ -1501,7 +1522,7 @@ if (snd_pcm_stream_linked(substream)) res = snd_pcm_action_group(ops, substream, state, false); else - res = snd_pcm_action_single(ops, substream, state); + res = snd_pcm_action_single(ops, substream, state, false); snd_pcm_buffer_access_unlock(substream->runtime); return res; } @@ -1660,7 +1681,7 @@ int snd_pcm_drain_done(struct snd_pcm_substream *substream) { return snd_pcm_action_single(&snd_pcm_action_stop, substream, - SNDRV_PCM_STATE_SETUP); + SNDRV_PCM_STATE_SETUP, true); } /** @@ -2063,9 +2084,12 @@ static int snd_pcm_pre_prepare(struct snd_pcm_substream *substream, snd_pcm_state_t state) { - snd_pcm_state_t cur_state = snd_pcm_get_state(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + snd_pcm_state_t cur_state; int f_flags = state; + guard(pcm_stream_lock_irq)(substream); + cur_state = runtime->state; if (cur_state == SNDRV_PCM_STATE_OPEN || cur_state == SNDRV_PCM_STATE_DISCONNECTED) return -EBADFD; @@ -2089,20 +2113,118 @@ return snd_pcm_reset_substream(substream, true); } -static void snd_pcm_post_prepare(struct snd_pcm_substream *substream, - snd_pcm_state_t state) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - /* The reset callback path already completed this rebase under the lock. */ - if (!substream->ops->reset) - runtime->control->appl_ptr = runtime->status->hw_ptr; - snd_pcm_set_state(substream, SNDRV_PCM_STATE_PREPARED); +static int snd_pcm_finish_prepare(struct snd_pcm_substream *substream, + snd_pcm_state_t state, bool success, + struct snd_pcm_substream *failed_substream, + bool stream_lock) +{ + struct snd_pcm_substream *s; + struct snd_pcm_group *group = NULL; + bool cancel = false; + int cancel_err = 0; + int depth = 1; + + if (!stream_lock) { + snd_pcm_stream_lock_irq(substream); + group = snd_pcm_stream_group_ref(substream); + if (group) { + snd_pcm_group_for_each_entry(s, substream) { + if (s == substream) + continue; + if (s->pcm->nonatomic) + mutex_lock_nested(&s->self_group.mutex, depth); + else + spin_lock_nested(&s->self_group.lock, depth); + depth++; + } + } + } + + /* Preserve terminal states instead of publishing a partial group commit. */ + snd_pcm_group_for_each_entry(s, substream) { + struct snd_pcm_runtime *runtime = s->runtime; + + if (runtime->state == SNDRV_PCM_STATE_DISCONNECTED) { + cancel = true; + cancel_err = -EBADFD; + } else if (runtime->state == SNDRV_PCM_STATE_SUSPENDED) { + cancel = true; + if (!cancel_err) + cancel_err = -ESTRPIPE; + } + if (!success && s == failed_substream) + break; + } + + if (success && !cancel) { + snd_pcm_group_for_each_entry(s, substream) { + struct snd_pcm_runtime *runtime = s->runtime; + + /* The reset callback path already completed this rebase. */ + if (!s->ops->reset) + runtime->control->appl_ptr = runtime->status->hw_ptr; + __snd_pcm_set_state(runtime, SNDRV_PCM_STATE_PREPARED); + } + } else if (!success || cancel) { + snd_pcm_group_for_each_entry(s, substream) { + struct snd_pcm_runtime *runtime = s->runtime; + + if (s->ops->prepare_complete) { + if (runtime->state == SNDRV_PCM_STATE_SUSPENDED) { + runtime->suspended_state = + SNDRV_PCM_STATE_SETUP; + runtime->status->suspended_state = + SNDRV_PCM_STATE_SETUP; + } else if (runtime->state != + SNDRV_PCM_STATE_DISCONNECTED && + runtime->state != SNDRV_PCM_STATE_SETUP) { + __snd_pcm_set_state(runtime, + SNDRV_PCM_STATE_SETUP); + } + } + if (!success && s == failed_substream) + break; + } + } + + if (!success || cancel) { + snd_pcm_group_for_each_entry(s, substream) { + wake_up(&s->runtime->sleep); + wake_up(&s->runtime->tsleep); + if (!success && s == failed_substream) + break; + } + } + + /* Publish all states before any driver observes completion. */ + snd_pcm_group_for_each_entry(s, substream) { + if (s->ops->prepare_complete) + s->ops->prepare_complete(s, success && !cancel); + if (!success && s == failed_substream) + break; + } + + if (!stream_lock) { + if (group) { + snd_pcm_group_for_each_entry(s, substream) { + if (s == substream) + continue; + if (s->pcm->nonatomic) + mutex_unlock(&s->self_group.mutex); + else + spin_unlock(&s->self_group.lock); + } + snd_pcm_group_unref(group, substream); + } + snd_pcm_stream_unlock_irq(substream); + } + return success && cancel ? cancel_err : 0; } static const struct action_ops snd_pcm_action_prepare = { .pre_action = snd_pcm_pre_prepare, .do_action = snd_pcm_do_prepare, - .post_action = snd_pcm_post_prepare + .finish_action = snd_pcm_finish_prepare }; /**