From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.173 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793693339; b=c3Fffi/PuEBgd4d7M4uGujMKOBJB37FY1PGWNcERcWerlDc5NjoLkkOn33pzb3p7CMKJ +9Kp/OR27wmgYXbh8w8wgCQ63G+WQgCJ3Mz++sViX1L1hqK2f23/IS0Q9EOF6MErrPKHL AXLI850X3liXe2fQKQVpkx2hQtriXXak9zODDFYFhyl6Vue6KPYjHHLhblK+yYxr3/o60 wVZfF6Hbe6s8/YmdAilkrt97ZYpxiukOPvajF7bAEljJ2izvZpGbJ4RmsmmSfa3NvInGO xBut7ALFKkUVMosu0it/3+ttufIkf6E0YU1WuveLcbUnvX0fnHXlzI8dKLmsrgRz0Zg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793693339; 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=hucEkfetCBC1eNxJx4T/MsrsrXcFb1G1sPDreCwELqE=; b=EpGFhZj3FMCjOcKS4GRFChQa/0mJaKWooRHaeJMYR8IazUx46lxjgxrTTiQ3JGv1jf7U 7Vimx0+AoWe1tNeDEjW7ERr/TuD0xUHKq+uHEV9LS+PdMwPegYz1lCgjRYnO0LmJajz0r An72I7675NpuXicvX1GHU3GVh8CFOfLu8qRAmJXMrEa7OU0CMPZNZR1IvqhqsosaKGe+K /qElA/0zH+5xa8eWWh1+eylUSHY4EwgAs7h4IuqZ2VXxOEuIiZub03/+iFFxj2LtHmB8N uExwDKEpGm3MgYUOz3D6vz+gcOdXl582RS/HICzP0Wl/OI5qJlaUWYVRizWQpasXKiA== 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=fblgGPOI; arc=none smtp.remote-ip=74.125.82.173 Received: from mail-dy1-f173.google.com (mail-dy1-f173.google.com [74.125.82.173]) (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 C8650606D833 for ; Tue, 3 Nov 2026 08:08:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C8650606D833 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, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=fblgGPOI Received: by mail-dy1-f173.google.com with SMTP id 5a478bee46e88-36a0f27c9f4so7318315eec.1 for ; Tue, 03 Nov 2026 00:08:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793693338; x=1794298138; 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=hucEkfetCBC1eNxJx4T/MsrsrXcFb1G1sPDreCwELqE=; b=fblgGPOIyRsWJM8ADsobdWBLGhNo/Ja7DwcWgbkGAB+LFeWj7+s5k/9XCp/gUhIcRz ggGofKTEjrzpPfpkfPE22dRBbU4QouY4NCXZkL2JWYfJPH6MyWxeSZQ2uv0BBJY6Z0o+ g4U5/96PGSD2neuJMekSbgMsdg/zkirrlf9Sy4VcNo/IGbkaj4cmioGrHZspH0ifo8DT DfQ/pMU2KjXED19LWRflHoHpUJHQgPc+GKNRXcSFc9DxTY9eNpHbYXNQGMKs3kcvqjt9 6ieNceIebN0VT9SAuor/+pfq1WqOGaR6oXSjSI/zpyyJvK9WoUJCc/dEDmXjwHbEFXqa 8nGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793693338; x=1794298138; 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=hucEkfetCBC1eNxJx4T/MsrsrXcFb1G1sPDreCwELqE=; b=k/kBtMNlnhybkehloh1wz8Efw+4gZkZy5cxPGTxKYDeibXPDYT8RVNsUakKAWg6WA4 Op9EYRW30260ROepWKxDHQNZHRJGJ/AVu/JSNqh21tdL4wzpLAtFrZLIybYLgwszDBYe XvT2KNfQqkS2kJOO1/SbHv71jSQfMKCSYRglQaAxyj6BHluPhn2d+0LFP5xuMOQyCi5E SdoKHYG1ULn33mzrrgpNbbBuwKKNcPxR9Gg25PKgQE49OYGmr5zlOhBx5hzoO/a8XGe6 ZepWbSDan8o+gSUB3bVdrN5LtWayQxdH+DKdwS5iDh9LKaZbPKBW6heNhIKStTZl71ic W4Ww== X-Forwarded-Encrypted: i=1; AKwUvBzvR67eIkIY6+yAcbq4DIgVWaxqERx5Gm/tYeHHWxUGBJIDOCyX4OIiu/1kCgjxepa3FAD5DrekFK0xVtg=@vger.kernel.org X-Gm-Message-State: APuU4Z92AGfiLnW2YvRFV+bUy28fhu/W4MD5S+KLEYSFzO+YNz8J3dW+ 94Zf+0FGOVoNRD/hfi3wemfwBWWW6NrKdOr5nt9yXlzwcENVynPRKdmZ/areJw== X-Gm-Gg: AYBFou14i4urEEr7fWaZ9Jm5ULk5qtCYiYNDdXqNXw21Xhsdi99PxaqYBaCqo7sqaBv hCEIlz2+kOqTVOOm5Bi0rsG24msBlQ+uP/WxtkHT+K0epZl/VaSZexV3ra6X4guy4bnOsuy4twm 34fFrHOr21g6YYqwiJ9gpFmuEVhS7ucIxrqpZKRibv1gU6/PN9lG+pwPTDQOG2JikKeC6ChRRs7 F6DhDdLYUi6c5ltDd7SMBKOU/FUk43qNhijelxqJAdNtMlVY7aySkzejUQZ1Tb8dXrMdSTRKV58 tE9uKgj4gO6bN1tvZgYmt5y/w5KdnqZyXgXy509Y3ame1yJWPqBF+z3D+HzInlH2Ffnmnf9MTf7 6MrE7mGJPVI9vYEmqrUJF3w130hU4NGD5YgFnmZAruSe95KkVCCaz6cv6OBqeKWMfF+PvUNgh5R r/Jg05Enm7NuY5HgX0J8SbATFlzk/yoLuNMQrxsgKqGynK+19yBONJ89MCp1wL7906clR5J52El TajGpz87Xi2bGYH9McSpjoablZn506IWZuKg/EELVB8V/31xc+Gwr96rNLtMmASfZxfdgM4a6J8 2rK1887RmQdVHXlypANr5/lhHuqHjaXSaUuIMrrav67MTjW3Dx5hTUUiKlrQjt/awNLndfTDl7z mQ3GPfzHyhkr0XZIW6cvXjhYdq9YwnFmmyTcKl5GfP1bXaVM= X-Received: by 2002:a05:7300:ce97:b0:35d:8c3a:38a8 with SMTP id 5a478bee46e88-36a42437327mr17179370eec.39.1793693337840; Tue, 03 Nov 2026 00:08:57 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-36a428fa380sm41468466eec.12.2026.11.03.00.08.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 03 Nov 2026 00:08:57 -0800 (PST) From: Joonho Lee To: linux-sound@vger.kernel.org Cc: tiwai@suse.de, 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 v13 09/12] ALSA: pcm: add an optional reset operation under the stream lock Date: Tue, 3 Nov 2026 17:08:18 +0900 Message-ID: <20261103080821.16983-10-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261103080821.16983-1-mynameisjune111@gmail.com> References: <20261103080821.16983-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. Atomic and nonatomic synthetic-driver tests exercised both callback and legacy members, mixed linked groups and later-member failures. The callback retained an acknowledged appl_ptr of 64, and finite-silence playback kept the written prefix while clearing the rewound tail. 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 @@ -1760,20 +1760,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); }