From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.182 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794267666; b=mdyKP739qh7Dwt9Zg4bjkWXTARNxKBWWDNpSjFDTrIBo4U0gSy6XS3u8Hg61OxnlIEHy jDeuXxXfMyB7VTV0vxR6b6OZZF2JS1j4BG+w3RM/nmqv8wfjtVOft0cxLV5u6e9T+zuj4 GbjL4x3eO6gcM/zEwXxmG77A4IwkyZMiIwuxNhpcJN0jdEV7SAff5trjr9mNEEDMSe284 wZ2Y62id5YCMME5nZyoYYDTrG5WKVAwz2h27JkZxwYp6yjnnTpEf8k4M6R+anbDJauQAo xZDSEpJZPzWvD4tRWLwxVMBZaTL7vIKKbcG42B9kpgB/BBqZuhJVM5kJZxi8xokg80Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794267666; 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=Gg2vIzMEdybNIlex02QZ7Vn3MXaakx+B0gxwqcZG4aE=; b=n+2FQZEHr2wcssdWUuzdXoXtJJmiCC97qS4I9O/qSeP4VGsC/ngGC7cHzF8lhgMFb38B c7seoDvH2PMwHIop/huq2gI6YLgwFSMuWAAv8tyZ7YP4Df5wOnXsvLXRsLd9qroHDY5MS U4HOEEgxDmnFMSOMAPNa2FceqQThEGz6rk7+e0USEJQyZoAugNjFTJjaMxL+vaS0GGtVJ 1V4kLVU/1U91z/hRQxJ2Oyt2oEg65TfQXiwou1s1CqZhlgCIf9pg0KveLcA2IH8HCYzot ThEUGfXlRKRUXFraOHk+LSJu6f7nlIMWGCS+6mFCfe1GYbXo/b73QshXR7OAcJFQ+Eg== 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=QaGdQbPB; arc=none smtp.remote-ip=74.125.82.182 Received: from mail-dy1-f182.google.com (mail-dy1-f182.google.com [74.125.82.182]) (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 0048F606A331 for ; Mon, 9 Nov 2026 23:41:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 0048F606A331 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=QaGdQbPB Received: by mail-dy1-f182.google.com with SMTP id 5a478bee46e88-3712b6d9843so1154116eec.1 for ; Mon, 09 Nov 2026 15:41:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794267665; x=1794872465; 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=Gg2vIzMEdybNIlex02QZ7Vn3MXaakx+B0gxwqcZG4aE=; b=QaGdQbPBdo6bt/kMddKbFL2Ae3mxc1NOb+Zq0Zc/PIUuDsnkuhENvKyBsUO4hSK4vX Kz8MtG6YW2adKlw6vbl4nBNX0SX5D84rPNwBMuwjYbMsEJAlMz33gkCUhNZt7UUdYCKS J//1EGrTLZrf69j5l6iYIvJ2FDKI4XucPPV9dwSBEEcL6e2420bDMk2MZEqVxD0GYsnZ eAQBYjxymCF/2x37+MEHlxcbvxi1wH7mFtmzquu6bTV3w4CLAyJuCbSQ7wCh+Kc3Cg33 xKMmFjANvRh5fbinRA74FcAOyWKOb1j07mSOMNDd7C18UYv87nTxFlAVeuMe40yowlHR aP+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794267665; x=1794872465; 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=Gg2vIzMEdybNIlex02QZ7Vn3MXaakx+B0gxwqcZG4aE=; b=IKGxPmAVNQgE2tCvkThEtPZaX/k1ekxyhmVOWnaooVv1TK1rdtHudSvRpYGRjZ36RM +1VsoMcUad/kuQG/yjkg6xBD3LGgh3V1PNJcz61s9B8M7PfyLet81Q0kaiQkcj9VNm7Q IVYlFO50wnThu6Or1B5JXSBbfAYKp5qXmV5Nl/f3qR59PqNPUZ5Qmw9PBFQiYeqKPjrq RIShEw4HO7dhJq434U6aksKIcSPJGZOSaWqj9Z0Ak1sl17wVV6n6t6AchzzsX38YZG8/ YGWIx3HRmnpD4wP0DpAnR1/QfklWi8gIZmSky3Y9dZ8UuXSjqqOV3P3xXgghhBr0eSbX GpKg== X-Forwarded-Encrypted: i=1; AL+hErGhMPx9x5kKWKO/KkgFSx8QrvPTMEfyKFtnEXVUHDklCxIcokgKMRropa8g02p6bd5p4bpuMWLesNYYaiQFsg==@lists.linux.dev X-Gm-Message-State: APuU4Z/Hw8rbwMhuo883dieLEdnDFqxZXxbDcHZwCduQuVuQLzehvQDI iFEgHGy64Ntw+zksm1Foiy07LXF0R3NHsz25Z+hg5VhnxK2oYtJ1TTaq X-Gm-Gg: AYBFou1GvUs/jhJKtwcSTB+DGXCCS2Uon3DnkE6XIDcCz3bXVFra4qhNSZZKGrlb9QH 3jdNeMl19nYlTJYpPdVKyqjhvnKggNAN2RQM1dBvx92+WrwygcUBZjIP4qoupnSjWur9BsxmIWK +LPtIxATp+dzj2XQNIrklSbyNRCj/poBxmo7JCj5DFAPr7EsAajh630jxbqj0ac+ASH6a7EHIjA 2w4sQztytLiYKGqeFqzOxVBkruTMsXw++WyTW5wsNBf2Cm25H1N9FX4Z/Zed54ubp/Zd5gXYigZ 8kCIKmnFfrFVvCcS1STQVfx/66gE0FfIi462YaO2bTufdjT5FwYkt8QOSRAgNm2Fw6rjZsW5GUa kqEUWrgkH2PwgfEx1nwZTMnU7udDG2WDhhzavtmPxppUIBNgCmOLbdYVtR4O7YTmDTK99+6QLni MTUyNxHuZ+73ln2fV2oLerd8P5XOI89pH3zfP93G+QR+HHTaK/elvzt8lSOSdOuaKKFDat+WHa3 FIpdpP9mNMLDUx7gV5JFqS8iVABQyf3fLeEUDhWUDOBImwnHQ+aWEvUaNUmeaq3bcyHPfXHqgEe IXcAgG2yXoRHZ9T5RCXRA0dPdu3yQtRO5DK+/ixpCxNUIuA4JtfYMwRKjo/D65obLY/QhJV5nB3 hvxyq+gF2es9x0diUVeCQm0AZudN61JtL+pmwVEDxes+m8pI= X-Received: by 2002:a05:693c:41d7:10b0:36c:c483:7077 with SMTP id 5a478bee46e88-37520217b57mr1041091eec.14.1794267665005; Mon, 09 Nov 2026 15:41:05 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3751fe2ff5dsm1739049eec.5.2026.11.09.15.41.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Nov 2026 15:41: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 v23 03/14] ALSA: pcm: add an optional reset operation under the stream lock Date: Tue, 10 Nov 2026 08:40:38 +0900 Message-ID: <20261109234049.79534-4-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261109234049.79534-1-mynameisjune111@gmail.com> References: <20261109234049.79534-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 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 @@ -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); }