From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.53 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794444456; b=EGp0+hdDJPhy8rkOzHjAl16m8PfTs45W0V9jopZ5L4WxhIFH/Oks6JyT/9ujURRJUNze qjMr2Zq0b/Egpz9KVgGMWOeaLSRwRW216nru7F4zwOFnCSPHf1Disp+FMzxZonlbvZTWD UWtqPKOnnbsOzc4MqnK0fVcKN9iihU366JNqUX4fJd/Rw3ioFMaMjhqUtaOsIkffpTNdU Mgw/+odJBieaZ7oydEJ0itCONRIG0jq54/qLeLUS87gLkahPV70sYTzgBAIYYKzMetrxr ddha3tCCql7lvcEcYAUduKTO48vdBOse8/YOjrmFgn4EhGF38hZS7Cd72+5zzo1clTg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794444456; 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=RAis5kFGoRMNPajdhIzk1uNlVjtCLs9aS42/sQlgB1eUX6uSNFcmyUzP3+ihztZfQfLH 6OPnzknDj7Hj7Exlqr6ZlEjR8CtKPh75WJcJV7rMz0OCbrz82QXMAyArclQQ48A3f42/P 5dKUmB3CVNns8kp8SIlJ+/BgJWHTco8Zv/IOGF3NgBiSNSLxV9oFPF/Pyt30dGgLxr0zo Ea0WjVJxxdNIoqCNLbHIlR3D4I8J/RGjqofDGOUkoCo9wW5F3uxWDIorJaWmQ3bn+JUHe cuwn6PMbezOb+ToyC3ukYscL0jrXvVM0zrZ933soqbf1t4DJ30/RSnZ9Jaf9pSSL0Hg== 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=yySCu4Ka; arc=none smtp.remote-ip=74.125.82.53 Received: from mail-dl1-f53.google.com (mail-dl1-f53.google.com [74.125.82.53]) (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 F3825606A8A8 for ; Thu, 12 Nov 2026 00:47:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org F3825606A8A8 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=yySCu4Ka Received: by mail-dl1-f53.google.com with SMTP id a92af1059eb24-1a2761c69fbso6460630c88.0 for ; Wed, 11 Nov 2026 16:47:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794444455; x=1795049255; 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=yySCu4KahptcuVQKZHR5Hvach6XWDJ7o1Ylg/7vzT/qdGezH4DqQmX0iQQZiObfr5N 6mPm5O+iD1g6wpSBMLtrQZQ7igb+buLRXwHZqUKuQcE90Iu1ZVGSnQ/TQQ2lgI8OyV9L oUrAC6QWeSjunLQXo+My3YZkapnfd44qPYMu1v1AZi2wHXPOYEpXVigj8Btt8i1wPM8Y tYp7L/nEerzlIczvXwvWDN48Y7NYo/TWxkr1UrkicqZBQRn9btW+4jin52TE2luugtid EgiHGEk1330mx3rXVs3K0ax4vrlvT1FHIFuqLy4osLbXCCkWGELoe1EQ97RBqvMEgg1Q EGvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794444455; x=1795049255; 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=ZYkaSXhmOZFbQcK8Y91auj8j55b2foMPkq9J4wC2dvYY9kSluWT6zTNypOiYkEFojG N4UdSJ22fbe3hO3fixV48SmU4ynl+1HGEUM+mRwJ3EDHGseGl4MxOGfDXCV4nhGtoT3L K0YBL0gS/QUL0klVMCCjTYRHntEOEzatM8U9nlvlX1+bol9GbC1GgY1mxqgI6ewOcttn dInoyzjJjN9VUQq7qOywHgjzyacMgZcJydMBNsK6dLfSA9vcDdyQbua1uInZ9jT+XFG0 Q5gzNur3pj3/TOdErMI8z75eLs+dXKL0WB4+PL+4rplH+ALL/qaeaxUCp6JaD+wFIXQg 1lGg== X-Forwarded-Encrypted: i=1; AL+hErHptD3g+WN7/o0ISIxqQNB1IhZIVubxbdaq0iV8qbeCkF+7mRHwCiXpehBYiOp3wzPlgvWIDzG64GksZHA=@vger.kernel.org X-Gm-Message-State: APuU4Z/k3YbaCtrKamUO2WJ5stgd91vnCI3EWHIhZjNTO/yOdMQ1WsUN nGtstEnjigQeuC/bp6c0E3xRYpmguxPrqAweVYWXbJrPLCKweaGORG2m860DnA== X-Gm-Gg: AYBFou1geh5j7RD+DieAZqwbnzfXoVfinrIkltN4QbKs5EonDe0MlY6ENPHI5FEbjcm 5DQzk8pED2ZXDI5EwCrNVF3itnlSWLrDwDR0mryEpAdNwSuFm0/Fdo69L+k+DgQ1Xx8J97XLcoL BTeGwQHXjkZBO9t6dViSuirnxmlVjHoSccOaVNy+XmlP+yK+RaYFSipjSh6S8kDdrjoce9v/Kw3 XNqR8ewGqzK17hx4bsGP5M2uMFUTSObtL5aqS8BA1w67HDJSdt0wn0zGCSqGhkGeHE9epOmgKOP 10tqfJyybTI9nK6r2Ols6Swkbp9IxJ5/41Tlmh67IPAs0pQJfQTQwPnAJc5nYD7Z0gw7VaEnAtO LuHWC3eNHpXiXcdjzpgL3x/rpS0sEn+czIB8wMHbVeIpwo7oWopOn+DBjV/VmHjaGBZ05BBpiDk 6gPIYM0ZCIzkj8ku/UbsWE5XSvyI6LZ/i2ijSRvFQE+V8Fvam8baqxaL+nkpYRye6AJZv56LuAR pK66SA/WHjETmSMevYI29Pnk6r1DGE4zWM8wGUH1HBUsruQjoPCCpB4XL8fCf+4xDIaKgkLYRMR ZaQ69pk7fjqIB4O4wXjmHZKlbyDE2sf7884w92Gx2T9e6lji597aAErky+9ti/zhx1uid2Ev8hR B3ak8IFb0dMVOZgwrRZjkRNpZPhw437A/ksUdi/OuwEdn/RI= X-Received: by 2002:a05:7022:1e08:b0:1ab:aaf3:389d with SMTP id a92af1059eb24-1b3c023c0d1mr2953618c88.1.1794444454968; Wed, 11 Nov 2026 16:47:34 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1b3b5b2eeffsm20672163c88.9.2026.11.11.16.47.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Nov 2026 16:47:34 -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 v27 07/17] ALSA: virtio: Recover PCM state after a failed start Date: Thu, 12 Nov 2026 09:46:54 +0900 Message-ID: <20261112004704.49758-8-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261112004704.49758-1-mynameisjune111@gmail.com> References: <20261112004704.49758-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; }