From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.210.180 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794466202; b=gWIRK+4RQVvH5QtmsYhTrpkfc8wymuBGhR6niNu7Q4ZJis849kZm2aW+UOh5pMbSXyhl V1lKDRESdb8ZhuxI9/7RDO9hO7GIh5tpSb93pI56aKoDbyOr+oQ5hajrfxTDRqjjTEdgC /UH+ibJxzOK552EW2TZD43FIiGpyVAyMMBzXZLLhTu30baIgW61y71/S3Bh30YQKAhr8S YOtID0Zor0WuHeRGiPFsMtWx/o0OVmAEG+6IYQWofZlG2jENCmPV8jEQQWilCJWk48/zB vkOPM8FEw2Qi2i22AV9H/8k0lfWQX6k//TJByXF1bj2KQkEGCwaIT+HRMblB8mXT3HQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794466202; 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=MsI4m0uo6XJTpD5aQtetIa3TMpTeA9EBkJp0jkGREkg=; b=Tv9XfwqFmee1NJCRfjohxij/WsYsIUjXULMWneO8rSHA3q1u5Hmld+jObR/7vf+fnj+r pkjKr9pySesvZnLVnmBmiMx3TOciFCAxit+ehXePsaYmHmHT7HrSL/dLfNtRUvVwki3XM BMptHzkJzyAJcfkSg2enre/9Fb4Ts2ioIYa07dIcZY8vhWTnugB7FX/62fmsDXoLZMTwf slfeHRESSLMTWnogyieBWa/Hf5QoiP3Cvh1anOqK+BGxcV1oo4/FTp2Gvc+IDsKz32rR7 ywCy6B0R+/ZDspprA9elziYchQtYxiVQi28JmB+FVPUfArSxL+7EGZn0OgPG1bJ0Cag== 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=jWJ3A3dc; arc=none smtp.remote-ip=209.85.210.180 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.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 17F86606A88D for ; Thu, 12 Nov 2026 06:50:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 17F86606A88D 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=jWJ3A3dc Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-8b904d10882so1766665b3a.0 for ; Wed, 11 Nov 2026 22:50:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794466201; x=1795071001; 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=MsI4m0uo6XJTpD5aQtetIa3TMpTeA9EBkJp0jkGREkg=; b=jWJ3A3dcvL3sTE0GLxF8fyCuLVWhjcJXETjaXoyjspvRoHdG/5BmcAxzFjfKK8sqb4 wb5DqngVYtjL6tPLw0P4YnLIvvw74LzTSfaID7M94a0/LTAFlXeyJpEVHddVXKJQAShT SIOdr6M5jnJnA7UQGRkGD9SJak1SCht9Rvn1fh+8ViAnaNX8gqW4G18a6xdNDTQlgW+c vjHxeBhGFDHM7efgLBwt9RyFESLGr48RiLmloAjOEzhSEuUFcT/eSbywib67sBnmWmZO tjzmHDqW5jSO0R75FB12aicuBri+ojOqig7jvaRMQ6b7DZKjxvSNzRt5vsMYC4lNh6Sl eAVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794466201; x=1795071001; 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=MsI4m0uo6XJTpD5aQtetIa3TMpTeA9EBkJp0jkGREkg=; b=LKNOqVsksst5kr8Xs+itXIDY/dZFg/L1RyvXNwxRHaskedhgr8LNVGi7+hIvx8DkeR rIkUIcMZxYV+ODeLIw71riUpDepnc/pQSBKLhEx1GBQZc9k9KFGXh6aYLVSS3Aqr/MPX xR+aXy7P0DttDjDGclO54k3gUFMJLnSSreD/LTI8lZIMZnGlpxYGWVag35jv+pm1jR1B yrzsHjH4Mvb0OWvrngIezWCZKG3gZQIZlVx9TIwoM6TJ3gAVJSlciEUHAMo70o4lU3ak lRrsPgcim9yOH0AcPbRwJv+JfPQEVZvrUslpGcbNp/b3WGVCVOwtecX05eLllgfNnOd3 JjOQ== X-Forwarded-Encrypted: i=1; AL+hErG9bwyU0eCELImb5fw8XH+vYViE2gKMCRAyirdRs0AHCsFmVY4XbMoluQlRJ+55+ElwRKG5EQEfy4s=@vger.kernel.org X-Gm-Message-State: APuU4Z/ZMGus5k3jrzgDKJbCgbgprhdeoH/7YcpcZVrZbkwVAj23quvk dfsg3UZ7d5TveiHODKFbIeoH5fgpju8cxWsfal25BxDwql9R8Sl50fzJ X-Gm-Gg: AYBFou2YcarLgaCGKWMH9QwFLWmmgPyG9Z6hYhX9dHRBufd7f4fwY7ogcmjzOSld75I im3s4Vzayp275++1Ys7MwgDoN1U3d/MJP09q+299UbL/ubP1nwpKSYSM8TatGfy9WzSrjMkk2jM YPRKl8dBx2Qb+QgBf/Ght+EeatNCNox7MvECStWosDYkQ/HWVAEb6NifV/i8Xer5Wu9AIPQHTM7 FsRqa2LOvTfdtWoTaiYGuSCjIIupnIZj4wQ0/1MEPexmOpWdoOgTsXqmyw5jyVc9rXNXBdZjS3H GhJnypObnXpChO7KNfVlhGzAEn0gJY1xlPq8vikahLtL7m6D9lT+2BY5WzuHL7w395Gh9A2b0lq /xTKKW/MlQhAWNsud31ZqlXXlaGK+Ei3NBGBxh0GDFdLYivYlgZmiQXBJhi68DgCAJi7+P7b1Hv uSyKX36TyK56FzykjoX8Gz5JOqVZl8StdP+DRsBfR+RqqvdrjNx/53wWl9hgXWnzKh5slKChhkJ eiDlXNrGGiS6AqOT02NpdS94SXzDHs/bvOGEmB07XSVFtosL+bWXWCv+M5ibchpWvfx9TopEzQt avNK9z9fTJ/csWQ8fyv5P7a+3EBMg1eZ3CF+oHSerQWFOpcdnMLp32DesqMydN3TI9W8cH4auB6 q6JjmetzpwZFEwnjq+axh8gLZkp1PdKI7+syKt0nxeFGNj5c= X-Received: by 2002:a05:6a00:813:b0:89d:5a80:5256 with SMTP id d2e1a72fcca58-8bc1c59482dmr5040633b3a.9.1794466201522; Wed, 11 Nov 2026 22:50:01 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8baab1228e2sm3097511b3a.41.2026.11.11.22.49.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Nov 2026 22:50:01 -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 v31 07/17] ALSA: virtio: Recover PCM state after a failed start Date: Thu, 12 Nov 2026 15:49:19 +0900 Message-ID: <20261112064929.11211-8-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261112064929.11211-1-mynameisjune111@gmail.com> References: <20261112064929.11211-1-mynameisjune111@gmail.com> X-Mailing-List: linux-doc@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 Capture trigger queues I/O messages before PCM_START. If the START message cannot be allocated or sent, transfers may remain queued, and ALSA does not invoke the action undo callback for the failed trigger. Mark the stream stopped and disable transfers for every failed START path. Arm runtime->stop_operating so sync_stop releases pending I/O and prevents prepare, hw_params, or START retries until release succeeds. Latch a transfer XRUN in both playback and capture, and schedule the existing period worker so a running or draining core stream sees the pointer error. This also retires a failed playback START during drain, where drain-init can already have advanced the core state to DRAINING. The stopped flag is shared with ACK callbacks that can run without the ALSA stream lock. Protect every stopped access with vss->lock. Read the pending message count under the same lock in open and hw_params. In sync_stop, decide whether RELEASE is needed and mark the stream stopped in one locked transition; leave it stopped when release or draining fails. Always cancel elapsed-period work in sync_stop, even when no RELEASE is needed. Record the RELEASE obligation after successful PREPARE and clear it as soon as RELEASE succeeds. If the subsequent RX wait fails, retry that wait without submitting RELEASE again. Fixes: da76e9f3e43a ("ALSA: virtio: PCM substream operators") Assisted-by: LLM Signed-off-by: Joonho Lee --- sound/virtio/virtio_pcm.h | 6 +- sound/virtio/virtio_pcm_ops.c | 113 +++++++++++++++++++++++++++++++---------- 2 files changed, 89 insertions(+), 30 deletions(-) diff --git a/sound/virtio/virtio_pcm.h b/sound/virtio/virtio_pcm.h --- a/sound/virtio/virtio_pcm.h +++ b/sound/virtio/virtio_pcm.h @@ -26,13 +26,13 @@ * @hw: Kernel ALSA substream hardware descriptor. * @elapsed_period: Kernel work to handle the elapsed period state. * @lock: Spinlock that protects fields shared by interrupt handlers and - * substream operators. + * substream operators, including @stopped. * @buffer_bytes: Current buffer size in bytes. * @hw_ptr: Substream hardware pointer value in bytes [0 ... buffer_bytes). * @xfer_enabled: Data transfer state (0 - off, 1 - on). * @xfer_xrun: Data underflow/overflow state (0 - no xrun, 1 - xrun). * @stopped: True if the substream is stopped and must be released on the device - * side. + * side; protected by @lock. * @prepared: True after device PREPARE and the core pointer reset succeed; * protected by @lock. * @preparing: ACK gate through teardown and prepare's core reset; @@ -62,6 +62,8 @@ bool stopped; bool prepared; bool preparing; + /* Successful PREPARE still needs RELEASE; protected by lock. */ + bool release_required; bool suspended; struct virtio_pcm_msg **msgs; unsigned int nmsgs; diff --git a/sound/virtio/virtio_pcm_ops.c b/sound/virtio/virtio_pcm_ops.c --- a/sound/virtio/virtio_pcm_ops.c +++ b/sound/virtio/virtio_pcm_ops.c @@ -116,6 +116,17 @@ } } +static void virtsnd_pcm_start_failed(struct virtio_pcm_substream *vss) +{ + scoped_guard(spinlock_irqsave, &vss->lock) { + vss->xfer_enabled = false; + vss->stopped = true; + vss->xfer_xrun = true; + } + vss->substream->runtime->stop_operating = true; + schedule_work(&vss->elapsed_period); +} + /* Keep completed RX data valid while RELEASE drains the device queue. */ static void virtsnd_pcm_block_ack(struct snd_pcm_substream *substream) { @@ -148,7 +159,7 @@ SNDRV_PCM_HW_PARAM_PERIODS); scoped_guard(spinlock_irqsave, &vss->lock) - vss->stopped = !!vss->msg_count; + vss->stopped |= !!vss->msg_count; vss->suspended = false; /* @@ -250,13 +261,26 @@ { struct virtio_pcm_substream *vss = snd_pcm_substream_chip(substream); struct virtio_device *vdev = vss->snd->vdev; + unsigned int msg_count; + bool stopped; int rc; virtsnd_pcm_close_ack(substream, false); - if (virtsnd_pcm_msg_pending_num(vss)) { + scoped_guard(spinlock_irqsave, &vss->lock) { + msg_count = vss->msg_count; + stopped = vss->stopped; + } + if (msg_count) { dev_err(&vdev->dev, "SID %u: invalid I/O queue state\n", vss->sid); + return -EBADFD; + } + if (stopped) { + dev_err(&vdev->dev, "SID %u: stream release failed\n", + vss->sid); + scoped_guard(pcm_stream_lock_irqsave, substream) + substream->runtime->stop_operating = true; return -EBADFD; } @@ -310,7 +334,18 @@ struct virtio_pcm_substream *vss = snd_pcm_substream_chip(substream); struct virtio_device *vdev = vss->snd->vdev; struct virtio_snd_msg *msg; + bool stopped; int rc; + + scoped_guard(spinlock_irqsave, &vss->lock) + stopped = vss->stopped; + if (stopped) { + dev_err(&vdev->dev, "SID %u: stream release failed\n", + vss->sid); + scoped_guard(pcm_stream_lock_irqsave, substream) + substream->runtime->stop_operating = true; + return -EBADFD; + } if (!vss->suspended) { if (virtsnd_pcm_msg_pending_num(vss)) { @@ -353,6 +388,7 @@ scoped_guard(spinlock_irqsave, &vss->lock) { vss->xfer_xrun = false; + vss->release_required = true; } return 0; } @@ -402,33 +438,40 @@ guard(spinlock)(&vss->lock); if (vss->preparing || !vss->prepared) return -EBADFD; + if (vss->stopped) { + substream->runtime->stop_operating = true; + return -EBADFD; + } if (vss->direction == SNDRV_PCM_STREAM_CAPTURE) rc = virtsnd_pcm_msg_send(vss, 0, vss->buffer_bytes); - if (rc) - return rc; - vss->xfer_enabled = true; + if (!rc) + vss->xfer_enabled = true; + } + if (rc) { + virtsnd_pcm_start_failed(vss); + return rc; } msg = virtsnd_pcm_ctl_msg_alloc(vss, VIRTIO_SND_R_PCM_START, GFP_KERNEL); if (!msg) { - guard(spinlock_irqsave)(&vss->lock); - vss->xfer_enabled = false; - + virtsnd_pcm_start_failed(vss); return -ENOMEM; } - return virtsnd_ctl_msg_send_sync(snd, msg); + rc = virtsnd_ctl_msg_send_sync(snd, msg); + if (rc) + virtsnd_pcm_start_failed(vss); + + return rc; case SNDRV_PCM_TRIGGER_SUSPEND: - scoped_guard(spinlock_irqsave, &vss->lock) - vss->suspended = true; + vss->suspended = true; fallthrough; case SNDRV_PCM_TRIGGER_STOP: - scoped_guard(spinlock_irqsave, &vss->lock) - vss->stopped = true; - fallthrough; case SNDRV_PCM_TRIGGER_PAUSE_PUSH: scoped_guard(spinlock_irqsave, &vss->lock) { + if (command != SNDRV_PCM_TRIGGER_PAUSE_PUSH) + vss->stopped = true; vss->xfer_enabled = false; } @@ -459,26 +502,38 @@ struct virtio_snd *snd = vss->snd; struct virtio_snd_msg *msg; unsigned int js = msecs_to_jiffies(virtsnd_msg_timeout_ms); - bool stopped; + bool need_release; int rc; virtsnd_pcm_block_ack(substream); + scoped_guard(spinlock_irqsave, &vss->lock) { + vss->xfer_enabled = false; + need_release = vss->release_required; + if (need_release) + vss->stopped = true; + } cancel_work_sync(&vss->elapsed_period); - scoped_guard(spinlock_irqsave, &vss->lock) - stopped = vss->stopped; - if (!stopped) - return 0; - - msg = virtsnd_pcm_ctl_msg_alloc(vss, VIRTIO_SND_R_PCM_RELEASE, - GFP_KERNEL); - if (!msg) - return -ENOMEM; - - rc = virtsnd_ctl_msg_send_sync(snd, msg); - if (rc) - return rc; + if (need_release) { + msg = virtsnd_pcm_ctl_msg_alloc(vss, VIRTIO_SND_R_PCM_RELEASE, + GFP_KERNEL); + if (!msg) { + scoped_guard(pcm_stream_lock_irqsave, substream) + substream->runtime->stop_operating = true; + return -ENOMEM; + } + + rc = virtsnd_ctl_msg_send_sync(snd, msg); + if (rc) { + scoped_guard(pcm_stream_lock_irqsave, substream) + substream->runtime->stop_operating = true; + return rc; + } + + scoped_guard(spinlock_irqsave, &vss->lock) + vss->release_required = false; + } /* * The spec states that upon receipt of the RELEASE command "the device @@ -492,6 +547,8 @@ if (rc <= 0) { dev_warn(&snd->vdev->dev, "SID %u: failed to flush I/O queue\n", vss->sid); + scoped_guard(pcm_stream_lock_irqsave, substream) + substream->runtime->stop_operating = true; return !rc ? -ETIMEDOUT : rc; }