From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.215.172 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794355566; b=vWmu3o/kVKBdYDzF4zuFe8ijswiz3UhVGAaeb5BSgDNmY3kMDQeVjD7hiJaEH8YyLtFP zLwjU/3R7DK0qsxvNeB/SOgzZcLgVGjn/nNwCYKQnibYW+g2nYbKRulXTBL2kyZLHipmu PA50iyt9IV0I36sLkT1gXTGDj7xpMBsdaxZeQPBA2MoSyVJ6GUxjjLTVj0qSmu53FIj5Y riaU0Ts7Zlx6oD8lvP9A9ZZl/O12q57HOVvTxjzOB2eUJxEX9pRO5tapcbsmHtAt10TVj CNBqaFVuaTC2PJzAcEmFPxlgKCuCAPYOivZSys5dVlFhbYEpD2hxOKp8nIQDSX3Gseg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794355566; 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=zmiIgqy4cjH0UGo3VGOzKAUEYd5iSjgfVUfTajSB4Yc=; b=2dDGAEzWrj54FKve1vrfPKmxPYVJSycubKkKoJCGJcWAr5RCEyDSuBj6IhMVWaedCK8F QjH3E4sNXgJ08VGMksAz0gBKf9p9RUfmw6GPKada+9OCJRFkCWcaDtJK7XPedZYQ9h2hr pSJdnqK3wPDWU8rGc/tcw1FQZBB0yYlI4chAjMDdPLdWYXHQnbuP2pus1K1gxvDIaBhQN rC2Um57/M+bh9XKm5GBwsI877UePSQi8Cor0SiWWKPC2o5sc/vHHmXWGkAWRZ7gcgOoUJ /HANauFJwW5hKY9hFQAFMjUtiwg2GK76GwA6D0iNYgTr9aVsF4ERHo1F71pEBQhxHRQ== 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=p40HIf8P; arc=none smtp.remote-ip=209.85.215.172 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (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 B8D6560A2608 for ; Wed, 11 Nov 2026 00:06:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org B8D6560A2608 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=p40HIf8P Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-cdb45e96d2bso1085219a12.0 for ; Tue, 10 Nov 2026 16:06:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794355565; x=1794960365; darn=vger.kernel.org; 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=zmiIgqy4cjH0UGo3VGOzKAUEYd5iSjgfVUfTajSB4Yc=; b=p40HIf8PTKE1+AKyvOW512m/Kx3Pc3fEJ7dfhbTeVawaBZ+6oZlruXFzRt4fPISqFq SBGS8NQEfAmDqdYmOCQYAUhlxsKUCGUlP84HtIKwRJF6SwNxjVyhWyc+Eu+pN51xFk/1 HzpPuoxMWvokYmFdJBPd8AbwDn06ktO/KMty27p2DtpV8V5yHmY1EgsELIZa6DPoWOoq mvcmIcCg2c9+ye1+Ttlwh+vDP9uLBOgY3jpn0m84YGQXRh3/ZXLj6q1LpwhySNQB08ao sFhX1LqGi4EPM0MMIaQK/vbe17Uh4s/+nKZoxmEivWldjDWdxkt2FoXqYdE9Lkug9OlU aSgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794355565; x=1794960365; 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=zmiIgqy4cjH0UGo3VGOzKAUEYd5iSjgfVUfTajSB4Yc=; b=rLNBkgtXY5++TV4yE3dhnpf0RmJ9Qro5Nmpttc9JvBuRvWfLEwYx4TQ7dm3b+mwNJp pdlSZcwd6ZkSOFm/yEDXJMx5nejRZ036TkANThHhAWioX5F7+v9E+nf/SD/40i/DA4/Z oDg7fb531y6kPT1LCYlPBoAEouR2jJMF4TI/5Q/+9ZlvNOx1D//UDiHFPwp/AizVEWdq ii08QWe9o67k32f8VehtIjXuaCZpC3Fxqx9vpd3YXwqF/E7N99uvm+ybvmytq+0W7O6v WSnV60OvK2ep3DaDVf1F+3qa/kiZF++TMIXUl86h40XQ4pqOTiFaU9Erk/iH8qv54v4w F3aA== X-Forwarded-Encrypted: i=1; AL+hErGtq0AQLTp1tQGHRAL7W61/XivUCfVEBd5c2Nq5nHw+pkoLLCLlDAL0E/lt3Eu+YC5r+3gzVGrDXibXg+I=@vger.kernel.org X-Gm-Message-State: APuU4Z/ohPSouiHsJccps4uJUWQIaShoQIYo1CLKIquhX7YGWPcT5JAG VD3djvWrSomYhXwO67cH+Eye92qWh7exTwE6306ejdgYk4cbd7Q960jS X-Gm-Gg: AYBFou0vG1WJvlcvUaMrfLbg2BJGVIgJARGOmIQ8NlTkQRBg/OEqNOh4rvWF0M8J4IC KnWrglovdKDvMhFI9bNC3SCN54K2luid70oTnOQEGqIoLYSBSdPTMzWpMBPe+o4GXirZ/ZlDALE gmUiwo4AspPjqeLDOs7AzYlEtoxl6lCp+Dl/MTvjzpjf+7cJQdXSwPo40dcQAqK/JUWuQv/qk+m Ge7JUUaKLDMTZOMDns2I8N6oNwqTJNMT0/UtZK4eSYasbrFOY/jBzTdmVxHGU6UXKkt1dVcVA3x 2q64ecAJbVIuxmyZoAGjoaf9yc4culHGwwu8J8+y83MDJvIO3KTGfpD/y5PIx/lgzYHcUqF/iPQ 4boMtjqPCsGbxePzKq+mzeKSisMqoKGasl7pzfPZI/auQrmsQwO4Zh15UKWMLudFQgg1xuxj3cq cipB4xgOVow6HU6TNEGrZKOtBx0A9awO/JSf37XDQASv1TpJTmKTw23JNf7tAxpahCW1bLr2XNk vXGK/ZPuX2azvXFkJVbOlhBJB4lGLzUm5LK0C4n28FNCgf+7wMOCKGqf08hqhgFWNPYHKFn+N/F icB4A2c68rLeBaOnLXoFLDWejWWIWLm9chFmfJfCpNmBgptdKfo7B7RrocvjHa8HxdozMkalW4n PbVhsALu2icCwkvsGYKy6kkcTO2JfxTF0rLYueFJDRbfJrqg= X-Received: by 2002:a17:90b:562f:b0:3b0:b64e:1e34 with SMTP id 98e67ed59e1d1-3b183005a9emr637940a91.51.1794355565026; Tue, 10 Nov 2026 16:06:05 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3b1838e616dsm474361a91.4.2026.11.10.16.06.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Nov 2026 16:06:04 -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 v24 04/16] ALSA: pcm: notify drivers after linked prepare completes Date: Wed, 11 Nov 2026 09:05:31 +0900 Message-ID: <20261111000543.28550-5-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261111000543.28550-1-mynameisjune111@gmail.com> References: <20261111000543.28550-1-mynameisjune111@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org 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. Opted-in members in that prefix return to SETUP. Leave unreached members untouched. Preflight failures have no completion callback. Preserve SUSPENDED and DISCONNECTED states if finalization finds either in the affected group or prefix. Successful driver actions canceled by such a state return -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 | 17 +++++ sound/core/pcm_native.c | 152 +++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 149 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,23 @@ 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, all states are preserved and opted-in members receive false. + * On failure, called with false for opted-in members whose action ran, + * including the failing member. Their state becomes SETUP unless any member + * in that prefix is DISCONNECTED or SUSPENDED; then all prefix states are + * preserved. 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,108 @@ 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 && + runtime->state != SNDRV_PCM_STATE_SETUP) + __snd_pcm_set_state(runtime, SNDRV_PCM_STATE_SETUP); + if (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 }; /**