From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.215.180 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794458137; b=36tQ13VoxftKKxsOlnr6tsg3f9zSC7IkB+xiE5h5bYyReXwIq4lhAk007G3/5iaou2xw wUfUgKMUmoXBTZNLrIR68QyrZ2FTaeBQLv8MPatq3639LI0T8CnP32x/9/iRRPhcyIjHW TUfJSpHDtXt/VWuS+232aZ5cMBYK+4QpxVj1epNZQZdnRTDkbEPkEQDZtEFzRDvm+ItTi psQkuhp2GusWFmyzWA6tO0xJojF8rYZjukpVhow0sU8THESLjQaL7nMNCnuKxOnU5BO8m ojX8C82VP7IFRp2+8jPU41woKd0vsDYNB5h56Vbvv1t4oEObL2mBBve510Fit0j0h/A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794458137; 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=cIIobyjhsnPdJOrPAX4b+lVxVAmMYLD5C2ETuyjenAVhuoZo9jEW1oRELX2MAEJdnjKC mdcwM+tuzUXBcLQfRwIMB3H7HZ0drx64Rs4NBA/5xdkY69eo6NBCTKjTvc2IsJDbcu5VE jjVJKDFHu/J75AYc9NldkkgZq3K2Ut0ehPx7Nmp6uYUMjWkwrP4fxnv/So5oOytyPrni4 G0vvac8RUXhGKDgUAkAXOfHaJHMMY7vbMig9YvCvTlM0S/0tkWkVFpTD/KMMQAYyIqZl9 cWLlVXeFm7bFKYarDatuLdshG2EfgbNYkQhoonsnuwOW7wFqWsF8sy+56rcDWoxrggw== 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=uYkQMShX; arc=none smtp.remote-ip=209.85.215.180 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) (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 C771460A2602 for ; Thu, 12 Nov 2026 04:35:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C771460A2602 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=uYkQMShX Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-cdab8873d9dso1669731a12.1 for ; Wed, 11 Nov 2026 20:35:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794458136; x=1795062936; 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=6WXLhdA9GsEkrddx60iks/fOWkdskBmQv8j22OOgMQQ=; b=uYkQMShXa2r3hpzCwDsEh0td39O5fpsJVeqfHQOULclwRb674JlW2orJK/MbVRBsa5 8PZbv9iGx4z5D/uShIlgeSUTBcE8dtAuUseHrG9CCMBtQPZXNkmDYfh2LpevAagrcX7s +N5WnzLNfQGoixsOWojSs/oKoNiQyq+cprxh7ClE3Q/wPFuzgpdgvwtNpsn8hj+lTZyN pum/zB7N9ZJvqW2q/do6KJekC316mvcKRWWcOXPlZcg8PmDZqSmnvINfpwrIUZbSoki0 MJ6Gi4tl/wx+Rpvuh8lrbWekRVmlpCmarhqoaKsjbvQe75ALMA9wKWiUbx6a8JB+XmkG T7qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794458136; x=1795062936; 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=SjFiAPWH1HX9suAHZ9PVtJ+kW58rFQY4WA/w+6+eUDN/m9gJSdUzvQ0a2P+AfyMj2Y ByTwCbi9+mCoURPmiYcoeOf/6RLKFMavsupes3H7eCYdf0KzD5Kb6zWvZuIPwdiCU+pb eiJvvWMcdrUUrRZTs+bHNjPN7kP2TrChnL0PMFpveXZzj+z+qgIqBA2KLcN3Nly4XQSf 8rD9m8N4le7Q9qfJNMmxiQZJkTlacMfk+5jEEqzBqR+tDrY/sO/aqGiowwOwdFF8OJE0 JJD8Q7xc5M2QnilcM9OEdE+WkD+RY5+ocvfV04VXRay51EcRb+scK41zXAgM2rV70OWj 36HQ== X-Forwarded-Encrypted: i=1; AL+hErHSIQMmB1nYSs7nnGqsZLMmSKmQ8S3acU4csbrz2G09nqiAOFjRTpzLaVSHF0QyhYhslaJJX6HdKMjr+wc=@vger.kernel.org X-Gm-Message-State: APuU4Z9L7doylIXheUDTchIpxxco8iECTN1P/TKJr4ei22CaohYlPVdX YyTrBgdAthlembcnykbruGVPBfjCnwjYLQaB4SCADxC9zihdpZHiyj4I X-Gm-Gg: AYBFou0ae+3aMvQy78f5UO7tJBd6IzU1JKaP/Byuv2vEFo48VCDD1yp+0d2LI0uXWxg Octyrc0njyWI9MY0ceWAFwy4n7ENSVQ9rZqtZSfKAEsCxK+jbEWB1N7BrGgQbfZ5AwygByev3Bm 0NrRshxC6ReJp35kIV402pKVJxGInw4tbzyAPsSeKkKHNeGyMMI6UtBCxBZKyxqsRgubVVI/Z/Q I/wQSUTUznM5rwVnFaVuRZCVJphIllVWfvvgVisoeVQ+d0eE8gobJHd2w+A3oEiqJbYY+idOGat dD1CP7dUaRaMIooYuBsrDvySs0dGX8Zdr0O1rOC3jo9KoOvWvaHqN497fPR80W2sIhAoouve0f+ YViGWMGSfuk0WByEqsjE5NEl0wPjj6QI+TBBXUZupbDPKDXFnFx3feEgcQ0QoUkV+0iy+BK+dQ7 UWViYEwGI+owgmENbtUJdPZhn5wPjag3vbn27q1zn38reWibj15+tWbr3ZR0gME1kgIo4QDq0NP k8A6kCJU2awCOJLPws/31kEdIRdYAPeEy8aAB7l0lw354brm+8bD4Ix/+19bk1HrMTekwRtpdHc so4Dyew7lCrq5TJGk5SKjuMnH3fn60Lclf9HJwKxKyftaJ8hTBtwg9KBkMtc+u+W/pr26FwpObw 2/OdG2Miuvt1UVVFqUPCATRK98pVB/8cgUi9SqS3AWaL78LU= X-Received: by 2002:a17:90b:1e47:b0:3aa:f4af:1e16 with SMTP id 98e67ed59e1d1-3b182e030a6mr4267995a91.7.1794458135696; Wed, 11 Nov 2026 20:35:35 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3b197c8b287sm2470466a91.15.2026.11.11.20.35.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Nov 2026 20:35:35 -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 v28 04/17] ALSA: pcm: notify drivers after linked prepare completes Date: Thu, 12 Nov 2026 13:35:03 +0900 Message-ID: <20261112043516.37010-5-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261112043516.37010-1-mynameisjune111@gmail.com> References: <20261112043516.37010-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. 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 }; /**