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=1794444442; b=pvPt1wKVN5jH/uwuoNTzeGi3N2aRKeNJgRLo21FBcKwXJt+oR5sANBHvnwqKpJouqxO6 nnZW0/GMzDa/OL3kg8oF86wddeqwkE4y4hJseygwLk7EKEoSxh4ChWI+EBAFA4XF1a8X3 IG0Esoxpk93A23r91DKzcTmFq1WHHAaRcdPiSY+V9Ap+I0IfP+xzfMMJMOoNAlN7oV8By fHWS30qajRHKqoA2biqRSRGkE4sRwLlcaYIOZf98qvsMh09Mfoc+lZbC7bORoYOmatJ5z 9Tk3cCeCgA9fZ5GTq2eagzOwwvm4qcWn72sE5HpkKYnYrp+x3XjWeuSz3YUzRjYfF6Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794444442; 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=6p3+pqMhjDImkIJEr0R5v0U340Sy0+dzECuu9p3HETc=; b=KIuo/ape2G7VJ+44kX/LhSUNFnUfzr3vf21OWLunMzAeHh3oqY7bQcmRMMPW4x9UgYm0 EKPRLMWDwGa5qwCrHDPr/AJeNa1EpmF5ZVHNyXcRiI0isrxwrvzAdWIjc+sBI7cjESAWb GVmrzsvl1b7n2XpE9XbJvRnZDWRj2bDbVfULNKbSse0W7QTJiZFLM2eRLN+ar/G2WENsV HSAN0hGwd8xLxgDT/WuI6XZjCKonYzqgH9qwbtQovVIFGYbgsrRj9VHQEgUX7n2u5xFow wII4MKVsAL6QMAbGjCCLe2xh7hPwgMGcSglQqzydMpODanaqb6oCokxGzJEOCRzA0dQ== 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=wtoEhLsN; 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 1A960606A33E for ; Thu, 12 Nov 2026 00:47:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 1A960606A33E 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=wtoEhLsN Received: by mail-dl1-f42.google.com with SMTP id a92af1059eb24-14394530ec6so5008389c88.1 for ; Wed, 11 Nov 2026 16:47:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794444441; x=1795049241; 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=6p3+pqMhjDImkIJEr0R5v0U340Sy0+dzECuu9p3HETc=; b=wtoEhLsN96phhW3fc5mW7EDBDVplBTqA2Q/7Ou9csGKXNoW8LgEHrigOhJWSJmFe5R NSGxwuvgk2pVZuHXUI3DB3uvqAqq4C49DCYBynUw38CjauWWPxYlOmQ8oLDpP0OZBB13 Ar6MhdpN3DEXUh8MfsE5qAx+ENajNjyezk6mrPsJDFgz6plgdgeMRxOXm2DhARjGIGO6 Rl4PYnr5sPALQpq/rCVMw2AvD1/b0RtoOhfP52fQGqlMs93SwutbHrIYYFWaiCTwO9PQ nKXFl6gTDn049+oDnuYn7G4RSuEG8Sja4u1NyvijprMX7Sz+67diZk9fSm/a40DHl1Ue xMvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794444441; x=1795049241; 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=6p3+pqMhjDImkIJEr0R5v0U340Sy0+dzECuu9p3HETc=; b=kzpAMYXdDweGcwzKKt1/2dcKhCJgC9Zsu857n8YUqfaQ1DcZ6kYKKMQjBjGc8hPqAd w+ynN6GqKeeiTP3CvNZqqn1Jv+TkazVwHHxgC9boAGPSg3P294wn1QdXcf0biLfcceZj eFwHt0oIYdf6Lnjk09TOCxR29sMq8Tmo8jP55aeNwOqML6lcDJMH9Oo0PB+9nqRI3xeN CvIqzfLv1a+0DwUXnYjAIcF7kYyjRGaOOxvqZQwqNt17+WlxI5pnN7NPWuY9PkCTub26 tzOYyCVbMUNNCkt75yEqjPj38JU6zX8t0Kzq+wwA3m68eQxQ2/h1fHZsf76yMjDEq8VT ZvAg== X-Forwarded-Encrypted: i=1; AL+hErHu0PJy2hwNCN3J+WB50vytie5zn7uFcoNMUyAlaSKvmIh04GTYtcPOf3hRuETKUhFe/ciWR4+20agOFKE=@vger.kernel.org X-Gm-Message-State: APuU4Z8cDut8imLF0GYjvIxzx8LHsIaUuMU6M5YRJhKlk5Q11GXp0zkP v0Ma+Ceh+KvPf1MWxvHk5m2YyRzcSvS+rJdz8Da0C1d6bquUR4JSVQJw X-Gm-Gg: AYBFou1cKS0jXg7LKGjDEx4iLwC+vaYZdD1v8UxsoMmOAVI8NqbI/KPvxsPytp2ATut tHXrMLIwhDmAJ9lAqCI75IPZrogGJNcbloDCeGAdSTyFj36HdfQsqzNBBjAd4o3mhsTiR/jlVxx ZM4E03x/d1FywuJObG/iU6z3X9RLVYyNcriU+CPEXq7kKTmuN4W0gcxRwl7mqy3dnt07x79Ze8Q WWVtNr/pP3icpQjhB+Ddwe6SAAegtZ0JPy4aqveTPMfWiHOQNK+N8OpiHcEiHe/xdwTpAxn+h3L xcgVQi9ARGBIRGk4hLBMOPH4Zzv/1OjNUz9gbj9FDc4EtRlyv4IjBHjyEp0+KiPLiWIfLYWe8tG 3AI6qJnmP1VRKHinEIDT6KIiFRkzNoKCevQphEzFr2fxiulbbZ6ddLxlRx45Q8eYAYh4Hp4wbz0 Sj9/DT7nC4wywDL7elsmkyAJtZYSnI1R9Gcg4t7ojqOc8ngt/rENSM2BxaF6Vf8AI2SiZGIGTrQ 302CGxFCWiNhhJ1PHJfIVbc1/WhpHrCdEU5TlZ6C9swbf9oJwh0IQasMpZjr7aVJeRAJuDPyDXX DQeevjEwM5IEQpZYxgPX4IUkzyp2VLwmKIIk2ekKsMyPjEnCDOOyleZQvEMXB2Rizrsi0jaHXwP +3vQZFm9zMiPUAtoTA/+DutxC3BPc4wx/vqLNO+sme/FcRAc= X-Received: by 2002:a05:701b:454f:10b0:143:2719:f800 with SMTP id a92af1059eb24-1b3c039a6fdmr3462458c88.40.1794444440977; Wed, 11 Nov 2026 16:47:20 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1b3b5b2eeffsm20672163c88.9.2026.11.11.16.47.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Nov 2026 16:47:20 -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 v27 03/17] ALSA: pcm: add an optional reset operation under the stream lock Date: Thu, 12 Nov 2026 09:46:50 +0900 Message-ID: <20261112004704.49758-4-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261112004704.49758-1-mynameisjune111@gmail.com> References: <20261112004704.49758-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 driver may need to synchronize private capture accounting with the common RESET pointer observation and the core's position rebase. Add an optional reset operation called under the member's stream lock. Expose snd_pcm_lib_reset() so the callback can retain common pointer and time handling. On zero return the core completes that member's rebase before unlocking it. Drivers without the callback retain the ioctl path. The operation is also used after a successful prepare. Zero permits the position rebase; it does not promise XRUN recovery. A negative return skips the core rebase, so a callback returning an error must leave coherent pointer state even after partial work. Linked RESET and prepare stop at the first error without rollback. Earlier callback members may already have completed. Legacy members keep the existing post_action policy. Applications must recover the group after partial failure before relying on shared positions. This adds an internal kernel operation and no userspace ioctl or layout. Out-of-tree modules using snd_pcm_ops need to be rebuilt. Complete appl_ptr rebasing once in the callback path. A later linked member can sleep in prepare while the earlier member accepts SYNC_PTR; a subsequent unlocked post_prepare assignment would overwrite that acknowledgment. Keep explicit RESET playback silence processing and leave prepare-time filling to the normal START path, preserving samples written and rewound after prepare. Assisted-by: LLM Signed-off-by: Joonho Lee --- include/sound/pcm.h | 21 +++++++++++++++++++++ sound/core/pcm_lib.c | 29 ++++++++++++++++++++++++----- sound/core/pcm_native.c | 45 ++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 85 insertions(+), 10 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,26 @@ unsigned long offset); int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma); int (*ack)(struct snd_pcm_substream *substream); + /* + * Optional RESET operation, also used after a successful prepare. + * Called with this substream's PCM lock held; atomic streams must not + * sleep. Do not reacquire the PCM lock through snd_pcm_lib_ioctl(). + * snd_pcm_lib_reset() provides the common pointer update under this + * lock. The core completes the position and appl_ptr rebase before + * unlocking a successful member. + * + * Return zero to let the core complete the position rebase. As with + * the legacy RESET ioctl, zero does not guarantee recovery from XRUN; + * callers must still handle the stream state and subsequent I/O errors. + * On a negative return the core does not finish the rebase, so the + * callback must leave coherent pointer state even after partial work. + * + * Linked RESET/prepare + * stops at the first error without rollback. Earlier callback members + * retain their completed reset; legacy members retain the existing + * post_action policy. An error does not guarantee unchanged state. + */ + int (*reset)(struct snd_pcm_substream *substream); }; /* @@ -1179,6 +1199,7 @@ { substream->runtime->std_sync_id = true; } +int snd_pcm_lib_reset(struct snd_pcm_substream *substream); int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream, unsigned int cmd, void *arg); void snd_pcm_period_elapsed_under_stream_lock(struct snd_pcm_substream *substream); diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1766,20 +1766,39 @@ } EXPORT_SYMBOL(snd_pcm_hw_params_bits); -static int snd_pcm_lib_ioctl_reset(struct snd_pcm_substream *substream, - void *arg) +/** + * snd_pcm_lib_reset - Reset the pointer while holding the PCM stream lock + * @substream: PCM substream + * + * Context: PCM stream lock held. The caller must not hold driver locks + * acquired by the pointer or XRUN callbacks. + * + * Update a running stream through the ordinary pointer path. Other states + * start at zero. Pointer errors keep the existing RESET return semantics; + * a zero return does not imply recovery from XRUN. + * This helper does not update appl_ptr or acquire the stream lock. + * + * Return: zero. + */ +int snd_pcm_lib_reset(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - guard(pcm_stream_lock_irqsave)(substream); - if (snd_pcm_running(substream) && - snd_pcm_update_hw_ptr(substream) >= 0) + if (snd_pcm_running(substream) && snd_pcm_update_hw_ptr(substream) >= 0) runtime->status->hw_ptr %= runtime->buffer_size; else { runtime->status->hw_ptr = 0; runtime->hw_ptr_wrap = 0; } return 0; +} +EXPORT_SYMBOL(snd_pcm_lib_reset); + +static int snd_pcm_lib_ioctl_reset(struct snd_pcm_substream *substream, + void *arg) +{ + guard(pcm_stream_lock_irqsave)(substream); + return snd_pcm_lib_reset(substream); } static int snd_pcm_lib_ioctl_channel_info(struct snd_pcm_substream *substream, 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 @@ -1984,11 +1984,35 @@ } } -static int snd_pcm_do_reset(struct snd_pcm_substream *substream, - snd_pcm_state_t state) +static int snd_pcm_reset_substream(struct snd_pcm_substream *substream, + bool for_prepare) { struct snd_pcm_runtime *runtime = substream->runtime; - int err = snd_pcm_ops_ioctl(substream, SNDRV_PCM_IOCTL1_RESET, NULL); + int err; + + if (substream->ops->reset) { + /* + * Complete this member before releasing its PCM lock. A later + * linked member may fail; RESET has no group rollback operation. + */ + guard(pcm_stream_lock_irq)(substream); + + err = substream->ops->reset(substream); + if (err < 0) + return err; + runtime->hw_ptr_base = 0; + runtime->hw_ptr_interrupt = runtime->status->hw_ptr - + runtime->status->hw_ptr % runtime->period_size; + runtime->silence_start = runtime->status->hw_ptr; + runtime->silence_filled = 0; + runtime->control->appl_ptr = runtime->status->hw_ptr; + if (!for_prepare && substream->stream == SNDRV_PCM_STREAM_PLAYBACK && + runtime->silence_size > 0) + snd_pcm_playback_silence(substream, ULONG_MAX); + return 0; + } + + err = snd_pcm_ops_ioctl(substream, SNDRV_PCM_IOCTL1_RESET, NULL); if (err < 0) return err; guard(pcm_stream_lock_irq)(substream); @@ -2000,10 +2024,19 @@ return 0; } +static int snd_pcm_do_reset(struct snd_pcm_substream *substream, + snd_pcm_state_t state) +{ + return snd_pcm_reset_substream(substream, false); +} + static void snd_pcm_post_reset(struct snd_pcm_substream *substream, snd_pcm_state_t state) { struct snd_pcm_runtime *runtime = substream->runtime; + + if (substream->ops->reset) + return; guard(pcm_stream_lock_irq)(substream); runtime->control->appl_ptr = runtime->status->hw_ptr; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK && @@ -2053,14 +2086,16 @@ if (err < 0) return err; pcm_qos_req_update(substream, period_to_usecs(substream->runtime)); - return snd_pcm_do_reset(substream, state); + 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; - runtime->control->appl_ptr = runtime->status->hw_ptr; + /* 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); }