From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.172 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794267678; b=5W+Z3toevPYLD6JCgwsFoAU8ocbWd+u9Ji7dYPbR1Yho0TW+RST06gFPcHj+siBC3ZMk 9OBvTeWj/rUT8lMUAlx7lpA10ST+DfgRzZRQF1jkkf71iidLjW09Fxl9PMXhx66LfwQiY oMokUWhwkQ8xi3bFeXA6R5SRc4KfHn9NfxqJnjZ/koih8j1B2uEBEGkTF4Z9XiIpR/Dch Ui1ZP3vMmqtbxKjMFI1IyTC+225SA9krzrU0ZT4Vc7IsLKvKSp7Mqxz7u6Yja8uGYoydO hr8OxlqhGB3LVfWj2XkH5mRWPonKeof4wuIbJWU7hY3ek7QTINspn2Ozr9eLQEGH7WA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794267678; 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=5dEmHkVRD2X/L91gKqybdgPEq/P24YLt7vvLqNXdWXS67nwo2DmLpK9UHVlRAEf3BN2Y V/9zTfjVuFUnVXtol8zRB4aWvCV87rE9q4FM30KnjykZ0Ac5w2Nd4xo9RAJXnx52QCEPe o7Y7iXzzoziUkrKKxED+4KpR2PtBZJ7z+7g8gMkL6mo+exn51J3sUrMQgG5kZhgawz2PJ oS0AgCaH5mDvi6wTp4xY/Re7GaX5WOTXtwqwXbb+ytzbg83QWN0EiMuPvALLhaBX1pDF8 QPXKEcPAnTi3SJ8jF56gOtagRoHldEbZxsw2P/Jd3ndzJVji7W1CXJ3ogFtBddMK6Xg== 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=NPVg9SXm; arc=none smtp.remote-ip=74.125.82.172 Received: from mail-dy1-f172.google.com (mail-dy1-f172.google.com [74.125.82.172]) (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 84E8360A2629 for ; Mon, 9 Nov 2026 23:41:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 84E8360A2629 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=NPVg9SXm Received: by mail-dy1-f172.google.com with SMTP id 5a478bee46e88-36eb1cb7aabso2251851eec.0 for ; Mon, 09 Nov 2026 15:41:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794267678; x=1794872478; 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=NPVg9SXm5+iV5sGnMEj1Q01FKGJay0IJ45EhLcbj+a3h61gwHQG5opXGE9Chc80JiO CpW8uaeKqiHMlYbdecu+rtB9YDiFYHswyzBBeJPYoEZ6VVEeO8oFEvCQnDD7lXi2JQ0b kj5mZpCxgZKU4WI4Tuge3WJ0rmzSmAr5CXiaDH7SRkCR65/cE7YXbCKCaZLcGpA61gno 7jSZVbMJm8cad4cL0wUQTYCGUZlZ+goeCftLKrtN3LsHmpKBP7F3HKMpGrYFWaZe5T+8 JBSxwp0wrsR7InDeGHl06mvLs750bWSMvPvk3P3WyKrW4AHaaBmh/jjtzJzzsWVYNldv oFBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794267678; x=1794872478; 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=viPqYdmu3eEdF+zJyoU/Qtk1HqYCsybvwIG5F50H6mhNeOB8Ucl81fk0O4qhjiCp1v 0wJIoddLW1QwjPMEdnR6CO64Csq2BfHNtajtkmmlE17a8o/sZw2piP6mFPFU4eDd8Bns Fqgy9FeG0m5p8WbNVhu+eXCqgKL1awhHBhD6R3SI29VCtMiJPgjKMRH0WCQqyxlyNVih L2m6bZh0vAfzGJcCAFq2WXRuvhjxC0lx9EvflCf0nfES0VPFPwK+UyBxc2AwZ9TAXOfb uhxoGLNMV7zdmWYu0vVtmrhNcCnX2Xkk944UsPHUd6pj5lNdOQDWGW8Tm/LfoRYyeXYD kW4w== X-Forwarded-Encrypted: i=1; AL+hErE0maSkR42I1bwXmNClTVixpylfw8aJhGTRhLzbomCgHSC1MEtmwRZEmuSUHcAyFD2ERYoflYTpMIrUZrs=@vger.kernel.org X-Gm-Message-State: APuU4Z9gfy7G7RkETiick+/IvTBsb8q1IObGcxoLr73+fkCKUpfdMZJz GmI+MHVSmidZFht2jai91U3FhN7I1w+CKp6Ul+qghNrncpUhYlm6gGSU X-Gm-Gg: AYBFou2OpsGaNyU/NZNJyJha8YtbEfxAoC6OFa5EonN2sTwaZAUwYNOwlVenW0wPvJ8 iSMEPCd9wDfovrw3z3mDla1zUABvRklyoSX3I+JCMDOgzV2rvMUr9abwLET64uTEN77fvacYLZH 8KjFpEgrAMPCAEP7/VHlRWDo8ZzTC1ddAOEBAu9A1uB3UojJHogAgNjLxIacdFoqY/ViAtJ5NxX q3ysOrt3xvNYN4YqeSnjlBF4QJDFO0Wxba1gK1WQgo1mVWFXxLeji3nQmb7kDqhD9YsRwJyyhGw q4ZDwy+JkVwvas8gVdjhhU6fOQhuE2jDhhAeoCo9lSJpXpOlZZ4lFsSaIIhW3eFhD8AwXIpgO0S 7lDizZ3JzlBvjTiRE9BHA6/6EjrXa4N6Ve0wVZraa5j8+vHbpUCkKGEHpg5Aw6m/u5wkTT+BXIN OetW+46B8hDMAUiIFEJV1g1MfMtfV0yE8fkSa4416vCHjpetDRJmjOftTbvMcSz50yT3V9xK3E7 Fhf1L8AKTsNAynFBGcqJepR7dgCbjJ88EfF4FedP07a8e8VzhYr/bdseCqmp/++fUHeaReN6Ro5 PJoMt3tc5PN5WdKQOL8OLpqWTm5Z0q9/2uX4KSvt0JNJbIhJAemCA5ns3c2TcW/0E4XPCn5jJ+F VX0qx5SfEhFMCFXc7YCs7+/yR4FZgCxMgKwiZNP4ywOiZYHpw X-Received: by 2002:a05:693c:87c2:10b0:36c:f88b:caae with SMTP id 5a478bee46e88-37520713e86mr1216185eec.22.1794267677432; Mon, 09 Nov 2026 15:41:17 -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.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Nov 2026 15:41:16 -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 07/14] ALSA: virtio: Recover PCM state after a failed start Date: Tue, 10 Nov 2026 08:40:42 +0900 Message-ID: <20261109234049.79534-8-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: 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 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; }