From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.41 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793923627; b=BcDVBJ7prJGs2gKvgeBEulymHw9SvQb1JqZ06aykS6KCoY4tniNmnhNDP3Lyi3JGWm8g pBR6uB9KYg23aDbzQMoG5dOmCy/kEK5yPC9looCrwH6+XLASeCDUU7iQTE7pfEg2aXXi5 aD//7LZLkZR3JT3/kbWpGKJSOxD9FSPjhsvhf4sHM9xVErUVkZrC4or08aTe99uFsSoRe lSaMcojmudelhkgdNV90WART3BswxhdYjLoLIbGVRgwkm7qG2WlDKkYZOu/9NuyKCWFDF Gv3tUbkN9aWWPuU0zygWrOwgpkpFkuOFV6cJAr2lQuxjKjn8C2ZGABvgSAqQKwPM7MA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793923627; 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=p2HQn0uK6b7S8WnZVO6RYFKBvJhyKWdKHL77ptFOkeg=; b=YfaOCDaS9FogR80WQ7puR+oVi606W9/PkEl6DQm2oHkEjD/xlPDjP+ws1PviPANOw8ra SO7nX5pxVYpG9u+BB6vUi0Gsxz4fVZyTQhy1yjVEGh9RKC3pzMdWglSfIEHqbXjoAfn4Z jotYHJ4slyGi0W2D/R9+LH5OWCYAAAKj7a/s+uPAHxrORaSfKkqeKTtg7YYqPsxc9xGD7 YlgMOfwvzmSdhcnLnhonwzaaZt6RxLTgc3rg6XDc27wUetS9L1cdwCD0srMM1N6Efnx8l Y4DdkxF3lOdF947fJwvVLjMZtinGIrXqaDTYIVF/LctZnKkNrej599N4swBJdg7vOkA== 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=R84QCALs; arc=none smtp.remote-ip=74.125.82.41 Received: from mail-dl1-f41.google.com (mail-dl1-f41.google.com [74.125.82.41]) (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 7F91A606A332 for ; Fri, 6 Nov 2026 00:07:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 7F91A606A332 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=R84QCALs Received: by mail-dl1-f41.google.com with SMTP id a92af1059eb24-1ae18eb9b69so183241c88.0 for ; Thu, 05 Nov 2026 16:07:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793923627; x=1794528427; 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=p2HQn0uK6b7S8WnZVO6RYFKBvJhyKWdKHL77ptFOkeg=; b=R84QCALs0Xy4f+Ql+l4Qf94qZ4++ixxq2JIvwOFsS7LfKXi8z46s+Z93oIBeaZPT6Z 0P1/VvzpBkhlafaC99e/SI02aOmZUi5yHx0snZXhI5bmH2x6QfU8ZZNFjdc5oSswxJ9l i4Wg+3CCNKzW1dQEzMRYDeTbXiM8D6KcSV7znAVtkNVCSc40FNBaDfdh9/TUC7NFe1gF qCcRRgrsTjzGStKuX4DyOKWwBgvHy306cxi4FHQHeGo9QeTqk7FXcBMpuLBZvEMwAHUu dJwbD5Hj7RfRWMzWfzM4PXV2Cj9rL2U/IuIp7Qgq5U7L/z3+GJhDuCMn9mUHCfZV9ZDb di2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793923627; x=1794528427; 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=p2HQn0uK6b7S8WnZVO6RYFKBvJhyKWdKHL77ptFOkeg=; b=tht16bQk1qwxhW5RDtw+JBQMmTG/SzA+QbeV7lo1RXanjh+ia07PZKx6/QgSVZANFu mS4bL8I+UHSpWKvCz6ZhWJZyIrC3tGP540518sR0/9FugbGO0AEzOQIf50l00VL+14nZ gjnRnmv5+Tvc/AGh2LdsnNzr61V9QaZwOPp61lWncQ3pjwh4SVwPMisTBQW5GV8XEzaY e2QifyT8YBCBMYgWIpIuBgFVaoEyH3bWmpZ0e+sA/O+AK66mL4CLZIbTHrZ3IGDl4zhM V6u0PR3+Dy7s3cQMDo32YsM9ip5p1BDMc+qNOuK8pnULsj9OtRe2sCh/8c5qtkDcowik Cb2w== X-Forwarded-Encrypted: i=1; AKwUvByj2P4X++qXeeKMLZ96zGyHZmBam56s9nLcl7ReSYcDIqujeQzP3sZ409+8DqQZ8pkIw9SVyacMt/S2BQQ=@vger.kernel.org X-Gm-Message-State: APuU4Z/xe2ytmECT2FRES0VtHTqySMa6bQl1KDta9fUrpsKsP3Jpnp9W 46gzc8RaV8QrVJF6RECu1I0kQiDv/nlNicLTeJSULQlERL22yE7V3mqZBZ0O9Q== X-Gm-Gg: AYBFou064dUoA/h7PAW1vhh2s8omcBeSvYvm8zJYRUG4KKwP/Y4Swt96E5RXg4Ej2AO 8yYW39Ul2CE27ReTCKV3gtJvsSC38DlAFEkypkig5h+5INsyFlGtxLL7CsnFUQQ5vG8WR/KoeWD WcKVxgMyM9joyMDWgz1y6pKcw73I6PLeM7OI7L4b6dBrT4KFx75okHWgvyfjm3M02CQnVNJEzYZ iaaJFRiismbwn/2jaZ55RD0Gp8C4RXO7TLT2eB5j2fiMZYctbeCylNOWZydtAx0ui+TYSJLPACi vNykMo1IDgiQy+aa4bmrqun6tFO/7uYOxYlCblDIso4PSsL4Y9qEjbjS40zFVp7VVDiLevIbt2P Zu17VtoS8+Hf2qjPlo2YxaDykV8RjGtHFu07GqEiPpzZjepIj6rb1DcxV7Ttc+GlhLvg3g05UWr H+dv9+/H4y0Hj8Ln9lr8R57peXsePXS8hnSChyl97PF/+hF5LmXGxque+7JkQjNVj1Zq/5S3+r4 YIi37p/brVTv+6T/abI9FoC7LUHa/W4DpFkPNOAm204I+ACmqrA7/n2Jakw+tWVDzfThjA2Y+Rx 4VSEky4uBop9vqM5XJAVVaJFbOOxYxVCAOuYjKccRIaRil5GsEuVz2+/6BI1liMLnHMlE67I8DL 0U0+JS1V2J/zItJ+deo4whVLIz4Of+AuXmNfnE4an0gYP4WA= X-Received: by 2002:a05:701b:4251:10b0:16a:1fa:58cb with SMTP id a92af1059eb24-1b25d287191mr832185c88.1.1793923626429; Thu, 05 Nov 2026 16:07:06 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1b25e4e079esm371165c88.19.2026.11.05.16.07.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 05 Nov 2026 16:07:05 -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 v18 05/12] ALSA: virtio: Recover PCM state after a failed start Date: Fri, 6 Nov 2026 09:06:37 +0900 Message-ID: <20261106000644.20460-6-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261106000644.20460-1-mynameisjune111@gmail.com> References: <20261106000644.20460-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. 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") Signed-off-by: Joonho Lee --- sound/virtio/virtio_pcm.h | 6 ++ sound/virtio/virtio_pcm_ops.c | 107 +++++++++++++++++++++++++++++++---------- 2 files changed, 85 insertions(+), 28 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,15 @@ } } +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->substream->runtime->stop_operating = true; +} + /* Keep completed RX data valid while RELEASE drains the device queue. */ static void virtsnd_pcm_block_ack(struct snd_pcm_substream *substream) { @@ -148,7 +157,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 +259,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 +332,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 +386,7 @@ scoped_guard(spinlock_irqsave, &vss->lock) { vss->xfer_xrun = false; + vss->release_required = true; } return 0; } @@ -395,33 +429,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) + if (rc) { + vss->stopped = true; + substream->runtime->stop_operating = true; return rc; + } vss->xfer_enabled = true; } 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; } @@ -452,26 +493,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 @@ -485,6 +538,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; }