From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.178 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794267678; b=ak3OaDNC04i2TSkemknFcMqLN38znF1jCN8yWvZ3DZtZ9DeA3JHEszat+XqYutQ0/EC6 JFLviOlD12sMjS3xocZ4SsSk1QTDvYSU8ewDKef0OKAbXA5wjn8tS1POW3Cqma1RWMfBx LSakJC8t70/4DTfSJv34LSwbnUBUchFMs9/8Ub9ggjRIw++jWT/L+S0evqw4JAwtTWYXo 2mj/TMbGVwFEK3zoHllqOETYQ9wIhIO35lOWU3Q+ATsi5PrfpGmZUi+FdxuPT/mE2tQcd tH8UOZdU7XIf3mUVgwLjcVJB91ouvK9OrRddQKP+i+Ru4kwMn3V2BO7ITDVPzX3M+xg== 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=EsMhcg7sG+rqBaRgrUhs7Of0r/fnhkX71RRk4QcX91/kaW8Zi0xPrLu/EX3oA7POxpPi 3YSMmGT4H163wDw951r3nX5609YuKihwz/J37UoZf+21Fr45kkl/tmQ6P5hYhbYPy2KqT kCwZethOm+/VHKui5uvH9TX57cieAp74aASmudLhZclANJnXOTO8+xFHbavmGEOTHh8// NrgwhSEcbv5HhWBvBrF/CzyTnx5x13DWouLRy1ZqvK9IF1+vmxTLBbDWKXfn/M9HrKLyY heaUE8jSTEUC6GNlK13xo1Qft5I5peUiiMCWStVxfuqNiJsE0Vu/Kw/a9V17LIjUSAQ== 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=jtu5fiaU; arc=none smtp.remote-ip=74.125.82.178 Received: from mail-dy1-f178.google.com (mail-dy1-f178.google.com [74.125.82.178]) (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 7F2C560A2628 for ; Mon, 9 Nov 2026 23:41:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 7F2C560A2628 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=jtu5fiaU Received: by mail-dy1-f178.google.com with SMTP id 5a478bee46e88-3712b6d9843so1154293eec.1 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=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=MsI4m0uo6XJTpD5aQtetIa3TMpTeA9EBkJp0jkGREkg=; b=jtu5fiaUeJY5SOT6ZTpmojJ1MR137MrD8YWjt4LdCBZRvjFN/bdz/9I+rzZ8z2xVD7 +fqadGnbj34a6s1+sM4GvsmN9zg6/91eXgZKFa5GWEfV6A1tQbbBXTs4Nt5UdYTDIs46 gHD6U8Lh2MOY3VKklY1BxjNWiadYCZvVK5AUK6YSUbwsEH7HvTt6mAzTCEhweBOZPWxJ qB0+nh8CFpSgMbQs2JjNrU2CmR86SB8qQBT6kYv87NucXJWmtBmK6ZqD4swF7zh04CpR 8kz0yErtjGhU27DPFj+Jjwxl6dAe/l9moE1oqtVt+xAeiJ2HjVlfHixbGNqHXvUbrqlf EKrw== 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=0H5CtU+D4jJls5A/mATWXck94b0zK64CZ7AfECBpmCdHlLght4TjR2DgsYMbXe1kRy 1GnyJ+ixmBv7ljx+qML/46GOjMgReYCdiuaZJNtudZ35BUtTAzQ937NMMGWjIlmKwuk/ Fz//MkDKST5tqMHITkkjgVsmpusJVU8PGligOw0+tHHjSfcETx3JSeSSduLY7qsvKRiK 5tj6OrHH90o5VDTby0dtG9qSYoG0hVsvGRwwaKsqECznCvq62y/DThpmdV9NNgtaNZam GIS5c6iIGYtJ+P5N3a+gy3hzNYCaAaYBAjWlHt23OeL1LVBcN7fKAZAbTkU3zevCvL0n DGgQ== X-Forwarded-Encrypted: i=1; AL+hErEa1aSQUn/YY9K7r1RPm44X6yFYQyP8Nupov8R7opZB7Upb1Ad1xOslNuXeOGuLWvYOGmzo5GvDPIhEIOIbxg==@lists.linux.dev X-Gm-Message-State: APuU4Z+NAOS8jzi+nilya1Yxd2e9oX+JjJ2FEv8ZNM9gWoD67Hm1t/ms aucix5KpXDyMqu+neD+sXvrtGQkHTfu8sZHJfYHlGOXJpLSsmtyV9Tvm X-Gm-Gg: AYBFou129F2rGDu9DfhXeygzLdzjjln1ANUccOEiDuNcqmYy3okwiHq5MiyVSkhSi76 vUeIuFQLKfV+6JNHNecZ1MhwiEmaGO3TY5S/UmKesnjVoB+re4VNGGAbLTJOlNCiy8ZKxDT+qGk eODK5eEYtjHmoSkc5jSEhEMN4GX2UzWyqygqrtfxtelY8TevDcvfEAWOdOvq3PUTdZRf+2e7Z3w ivvrx0H36k9gpBCOb3Qx2vw+up3IEOG4s1KXt6GmT4QD91NPh9R4nIdSj7uJqxGzvtPanUhHvlt LbN11U1KsdpaUqKbVjjuiZRMVowjC0nlSGaT8mVAmATnk8GYuilSmVmVw8TzoIJN70Poqp+W3Kw zuXLeZSwoWhPIePCFIjYFduNrYQ/EFpwpNNoru3LPBvrinYouufDuPzVAspINfa/7yi3vbRlop9 E3j3+FjbUBMX5aBxiFuY5at2E7NlRqvZfSfvBaLyHLGh86daz001Id9gJDVOHmydM29tdXHZ98d zuFiqZwlUXZXBt9eZmCZsiDuEee/P/Tv72h1UVL0cc8TxHdnreYMjVy+BIybIgc8QGfQ9nAdeRR aSWZ0sHNH/i8Cr0ne/zabV6X9l4wWip4D/457VNtb8Q75zyXQYUPhveoZr0r0X5RNKcilopVXfP yZTbTVvC7K4DBVrxVEDmZaqz/PZEv140mcfr6sODe483IeI4X 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: 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 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; }