From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.54 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794444456; b=UUicD4uAgXKEpVd7aRlMUi+HGd66XznSPaGs5ES/C0ANxP9EtWLI8YC9z5PHzym7Zx4Y Tmd0nuGuxtUMWvZhxTOSFsGP41W2rDguzarGfD535HWA/oQXWNTh3yNQp9kmVEI/WhQWT yQjea8D39RQcMuINNZmJVOLGk12y+t7v7eLyGB7kcHC9fl2NCg7UAJCNQhxTMIwcaJuVk WYqM9zXjat+usGfxv1Oa6GAuD43s3hqzuh8i82RZRPf2JBoZBlGQHkKmpLvJ3WUtYEaKJ TBN7HqTdyWOn7Kp8Lrl/2wbS3ejEhMb+JdnS7dJB7sEuyQZcB0mrHdoaXFGF8cq+80A== 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=YYl+vMAxkfjwv0VU+FLGrrKdtRZWQ8M5ZdOe9WQtUf4RDhw57dM4wsH/llJoD2n663JU c2j+uCGBs6Dd8rJn9ztssnjH3uFIUj2xIkVDyzDRnF7ouiilxPvEW02Vh3FGiyU3hlsnd QvQmNTrAycvD0FW707XW4KqSudMvgsrf5cLWFfkTQBb5a0HxkzrnGxyRS6h3ed/Tzgb6G sQkwTPJVqVLi1Ruu9AkN/7K+CWRLOs/qXEwm2l3o5oS1CJq7QMEWOcQihGDemt9930Fgk RPhv3alkDLZIvbLNQDo2zmAnEEHPFy2YLcA6edyWoDQgKAzsGd+fDIu46bFsF/JsYgw== 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=vAaho7WE; arc=none smtp.remote-ip=74.125.82.54 Received: from mail-dl1-f54.google.com (mail-dl1-f54.google.com [74.125.82.54]) (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 0413560A6F6E for ; Thu, 12 Nov 2026 00:47:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 0413560A6F6E 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=vAaho7WE Received: by mail-dl1-f54.google.com with SMTP id a92af1059eb24-1a2761c69fbso6460627c88.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=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=vAaho7WE53YKg6cCmOEJKLj0qems3YLSaQzo5aL7QZ9LCDDJwtkJeAE/Khgmepse6E eWGDUxsI99KcInxNAEJ/UGD8+tU0YgkrcunH9yn0ipA3NvOsvsnwuyvx2FaXuld7mH7R YxXyp8zu3LzraPGmRjGaOoKRbKkKDu9nbttED8Wj/ihkwV/gnlVQpSbgU0yDO1jsdbU0 iH8UKgtceR/qdd8pp93KpxEsJlpLCk2WqThRCF88RZ87pAU1hfKWvsudPtIdbD5PIdbY wHyEn68z5isuQqcqvQHExvWWP9+bjMzQpf8jrUAiSkSYWAQJCfg7t7cNXWqcnsECj8Fk d8fw== 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=gA9bPu9sKVmzPs0WRwPYJ3usVCwvBQGWF2Df2h2q87r826fevHiiGeIvNOkPvYAGYm 6jUPHgstEuQVoe7w5Q3gkb1ZBwZZEVHf4cDl8/067erUiWTXDPuOSe2k9finVa85cyPT vCW3KK/lTOuwyP6ltRG1lxpuP8ngM1VWPtdyeElKzWO4k9pVcn1R1EjK9Gj2vD/9/mLi /aJdduvaqbfzyiZ4mSru/A7f74o9fZnRzho9PLoMSkEA8yxCwUvt4Ah1tuGX9g+qani5 gdS/tv/ZZdI8AZawvkRxMQJhwZDMUJ+R26J8Wdvr/hqgA4OtCjBx0Rcb8LENr3oTfKF0 AthQ== X-Forwarded-Encrypted: i=1; AL+hErEq+8lrtUGfgM2UAKUmoqv1f5XxvLT2/4lvGe25l7uH4l1GKQhVk3Ft1ZqbreQjtE5EsXaoJoVepvGSQ2JUIw==@lists.linux.dev X-Gm-Message-State: APuU4Z8Fgcr+/K/Tkt57zOQjMkdv+bI2GgblEPs4a8L0R5AlExIh6Ssc te5AHI2bzgP8quK8VsSiPH2OC36xqT7TGXe4pLolWHHd46Y5XjGd/BRc X-Gm-Gg: AYBFou215RRlLUQZ9f6zxPY1vohyE6PANkSvLOcRiKqqgz25njoI+zP8ti0slj1a/UE w4/9wVloCiWAPAYb05uWNDs9GS5TpD/QFaAmW0IDF+KaDDavjYpIFoQBg9cD5pQTsiswYC4ya0e 7Zx55bdb9JZrf6i7rbsQB17W5WAX7cnGp9uzZjHoeXAfs0hNBgi8OIPzvmE47MedsAJR0Xstvq5 9cu8CNHQRmFpg9OEVx3cu/RdKX6zRA4dJkr9wLVNAOwMZGRhLOmIytV52MPz+4SttQu3133ixJW Nqm7GtjEvLS7rrFmn9Vc82vkZcq1blml1yG8Y4bY2wD0fbReSBpnu5F3JJTslCukF0wXI7xXPp5 EvgnWb/BoINDsuHS8iZc/IkyIlIffhfIuU5cbwijgetbE/eQhkzZEAizN9hwJfPdz5nOG4j1C8Q Pd/OU3NDXwicoDRCAfgdfYceOXeKkDvs/tI0TqeUdUWpZZcb/t4yICGlJeiPuyxqDxkNbrbJmSj j8CHAdcsseaIwQBXHHNrzRfgXvHgX8OMLjkmTIcv/PnF0uHrDFexIFGHTwJpzsXyov6lCHlsETJ aWsAlSu/xWgGysfQbw75xQ/aSC5d9GNWoOYRllWbAGD0yg5KV5u2u9r3w1nrcaQTN/66aADyo8x +Gx9140/Vvf/aKrRzqkLBqyQfOCkRsc+nbF4egGe0puoVJ2k= 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: 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; }