From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.215.182 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794355577; b=j/+DaPjIOtWEGjvu4SzbLCgLoCEEkTzOKiZVrF9enPBy4VCvoHZEafASZL+SbXiFI/N5 HMxfWWTW1l2MssjQh0frhhMLy92JRRFDei3Q08Tk+SbsfwiSVB+1ynnkzxaU5pQ8yIpG7 leIh/zKZ13+GRdBc1N5hOf25AybJ7B2PAZfpCqVZQKvDxPt175HSiUjg5Wx5+xhkoSlfI h196yFVndHY6WJK5IZDnw0oIm/gd3CdM//Qr9IsV0JyQAeJvm7Ooow5xbxq8mHgvqFElN glvXawsAWPJFXXMPK82jvc1WhdU9CMLlskLL/GnkUgLNajlcv9x3RY5uYZiVfnW2HGw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794355577; 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=mhUxJnz0vNYax2T3Ie4YL5gAuOVi/JCfR/FUIEntZhQQf6/7TEX4AuUxBvVehQRDPhJz W6hLONn2acFGm9CyrjWZ0v4SG3S8VTZ8pasZqUm7p0Hlue2M7YZ8vFTzUhOeiprz6zZmr tF97vZ9OIJ3KMNHz99m1rSIcVgYmJeea53j781FsdnjuCHqyQPnDmpSDDk0JMtl+OK/UR HRV2hTLcZXYezY7Q3eS5Napp9evO9ZbDP7DUUaMKOwWDip9dzwWKo4o0QaGBHAdyUx6nM oFqEW3DzH8x6TZxc4YruyFmdL6iHHGxnebnk1lonI75aSN+PsvVK3h4UkGIgBewhiBA== 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=kOg4EhXd; arc=none smtp.remote-ip=209.85.215.182 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) (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 AAF2A60A2612 for ; Wed, 11 Nov 2026 00:06:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org AAF2A60A2612 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=kOg4EhXd Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-cdab8873d9dso1119088a12.1 for ; Tue, 10 Nov 2026 16:06:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794355576; x=1794960376; 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=kOg4EhXdfAY+2sk3ouaDRwppVvA0evkLWKqvCjM8S1qXliakH1wHHuye/NfgQuaBg1 zG35pS6b3thi6JGO5ETzUht8Vzz7E1gjgmZ9sFaYp4hek0ElmAEwI584UH9wKxRgKo1M 4bFRcxGjGbAUjeRphH2WqwsHAPgTkeLstVGavfyou2QlyJXj39OmBOLvT2jFVwOz67+c cVUXLbLv5U73SBfr4eUnTF20eimGK65s4xfKN7hAMaO1NQgEsBf7vrWEVA15d7osKRJO LuBTrM3JQSH2hRQTke/0nnD7w5L3/Z64YIwQL/IQoomzATTNeOSJ7wP35lysiCxZvtmH Q1YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794355576; x=1794960376; 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=MofR0fQBKCvMnE7UyMHVdea2HUbPnWgVr2ZGOStv0qOxqK2rkGMnyZKLJsdCPX8OOX KuubYtIkZ25O0YYMeZj5MJaLyhyFZPJVkJeD+3Kzq9AWEcVUVf+joweX+nCO5RtIpCTk ce8Uc+WSpHLJegNhFsvYm38pMl0ROnQNWLhx2MBK93Hmd3/tSyGDRmAOx7wiVFaNEy3N bEMdTFWnVA5xXHZ2dmwbQbuWi0dbIQK+9rtXfZOetm0c21wI2r+HT7vuAqsRDvzhhwOg bU5Mz95wlUX7KX11rnLdYEtj89XmacwuZ8SpYUdTYZzJZcVjycnxCyFhWgrwUu1XQReZ we9A== X-Forwarded-Encrypted: i=1; AL+hErE0p/efnvv3ItjOyV9ak12MA5G5HkMd7U4UHVPTKhG3oCH4JRCw+wSKSNyv+gLvzlQEdCbUEyDkgcOYWfiDDg==@lists.linux.dev X-Gm-Message-State: APuU4Z+0GfhcEntveGPASxTwud/wA6CN2t6b77NXewXMXFEnyLe4+qym 1XhI+fjAdYuzJ8H4qoEXsm6DL6zZO/oBBLOpmmesIMQdMlXQ7zd1mqca X-Gm-Gg: AYBFou1LL3IbqRSWBc/+tFdZ9C03Vyda0hK2u0OyKl6bQg6kCgDoyUm4TixKmrlBioD JVsjtlOBVDrbHfiu0E6SMZTABqveyvI5x/GWUOyq719x0K/TMsvRYyeX3/00flmH6Riq06zkm1Y P9K1cqlJlAVrRWFhRY9LKEUNV5sesToBs8yDvQW5sWQIDk1IHMdflAJJ86dNCHUw6mpqJliMjEG N4/y9hvC41qLAclPJbL1L7BDBAriOhv6U8NvPHX1gK83L0kgpNz0kUfaA0okmz9nYvxVb4zAKxV D/OLY+mZrixTQsEtRDubkQYGzJ97SPBoPG6ICEAydkxCPxmcbVryYX12k5BJa3qm/yIskiEtBOm d3ZmlaRv+FBklyVq0FjV6GDnKXYahxbmcOwNJcPTeS2woBGxUHk2vxaOG6FsXbqA/9vTbWj9mzC IrgI+b50HVCthCN/h1K4GCeT0RfIqeHpccZMo/0dl4xmaZQ1j5/ms6/7wX5XzxDz49/EdjdaPb6 sVv8p4oaEBczoM/uchMDOtbUkcfrf7zhoyaMAyF1XD6UnUyKpfbknjc90VkhmTcuJe7XhHsYama GkF2CTWAo0i46e/BaW26b9Or5KuCtTd3+7YSGoHkJp+4IjUvL91Xi6lwQh050XTZvDWgO2VCD7z X3tdIXYQm54UJfTNd6RJIPkZ5QrQ+ArdmIkGOVTFv0Z/k97JqCBmH21sdNnM2OW+Olb6p X-Received: by 2002:a17:90b:540b:b0:3ab:17b6:9a93 with SMTP id 98e67ed59e1d1-3b1830081ccmr580141a91.52.1794355576015; Tue, 10 Nov 2026 16:06:16 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3b1838e616dsm474361a91.4.2026.11.10.16.06.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Nov 2026 16:06:15 -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 v24 07/16] ALSA: virtio: Recover PCM state after a failed start Date: Wed, 11 Nov 2026 09:05:34 +0900 Message-ID: <20261111000543.28550-8-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261111000543.28550-1-mynameisjune111@gmail.com> References: <20261111000543.28550-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; }