From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.215.172 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794464720; b=l49HWkzFte59qqNa92W0JjsQPaJ2WjATpGkeDTHvYEyep2UA1CwygZsxg3zFeIJuSbba MtPpqVEWLeAoty3lNxsRl9Z8J2zQ8BlhmO62q4fMi9Y42jK0ojRd7dv+nOC8+iKVIjZ/M tXgKlwYBZmhX+ix21kzUAKGZp5y5SKH9pTrTigPKeclDM11ZTIsN8hxELL3ih/0jYiG5q 8cKnWaN3myBtBiYMe5LbYZaGLBF9S0XIgOQKxxYxzQEbRCGZSmR9n5Wbx3loPMnRcOkQt XwesqNgS3sY9pMkjJQ61OOA8/iCkkBQyhXHS+5oci+Z67YlI2Ofdx4QGJoATHHht6xg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794464720; 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=OvADnmlalzc3oVbCYXfUI12JOyTGtJgxLj4bDjkV5slCs9V2Qkhfs1ac8OwxRutmDvfE 4+QLpuhZ8c6QHtLau1jIKiD+tPeX/Vdk0VgufWURFfApkO1+JxsXzDakB0HQ2hJ75djO9 rZY6WynCAph+rwtmR3wIp/wSN083kmBnNfhyQKfEgICIniP521haCDz7ATmlLUYfvAl6k UYVP4/abBkcnCw0+IDe2M3FFHUpj/9rpzbL9dzNUvgGPktyiN6b1q9heXmBjnUDnv+0X4 /2VeF8GhsJm+pPuyriUZq+sz//I0SiTn3oXxzug+Y9mzqEWV8uvBuGVgCHAr7Xy1+jg== 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=xnWld2cm; arc=none smtp.remote-ip=209.85.215.172 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (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 0263A606A89B for ; Thu, 12 Nov 2026 06:25:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 0263A606A89B 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=xnWld2cm Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-cd61cef87f1so1878015a12.0 for ; Wed, 11 Nov 2026 22:25:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794464718; x=1795069518; 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=xnWld2cmMFvUvEXPgY2agVo7sWQGu8NXDIkpCbCLHfJztUCeK8lgt7UcViHVFO917A pL0eCj/KpH3qGYxDRwWQTNpJ4tMuPMFo+h43OwFrS3VgxyVlhWieMQd+1r+3m3bkc7n5 KgbiMG2Fj62VJJTjbmC91tHu51lb5PX7PUlNdIYWT8RPZ6OkSagWwE9J+vpxo3buOSkx 2qL/xsL6izgQNXb0nyR96d3wOMa6KzgtDL2lAteZ9NjxjffWU+dCJOriYJJZO/upEygA NPwFwpJGeroUlrpcgtxVf6Bt5GREX2pjquLov7a43d1OKDxhW0yOjPRCzVQLESCOlLPq IiRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794464718; x=1795069518; 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=LmfPa1l9JOIubt0eZJMqpKk3fRDC/Q7LNTj9+/2gozq7IpOz99xl2oyUvdbeV2UL7y /GHcwRK8Q/t/9/pb5zikrnrjg+DzKfQr8+IuRR5TLFM/k9BP7shWNL/aXfzjJmGOotLc R3kWROe/fez6A5Ef7n3pZg0CEwIaE6Fwa7Td0S6OnAmHSDpIMA02781B1N/aOHA/ICDj bCzLUFajhvOWe4nHgQFTyolVUbPjwxkm7xvU6nnyOuy9IUl5d3cZASs0CWpC2XMnO9Kk wBo4O2eGRRj3cZj7dYnout0nngYYuGZPle3N0bOkZmM8ifJqj7GYViq5KiPZM+16psWe kZ0w== X-Forwarded-Encrypted: i=1; AL+hErFhR935LHWqtaJlVnpJXgR9mjiGWIGa79fSqp13H1hJcA/C9SHmuHOhyfjbPThhV384BPx5U4pGl4E++o36Pg==@lists.linux.dev X-Gm-Message-State: APuU4Z95aWbE8GVg4bq9uJNf8P4beB9B62QHt5prIl1Dt6333Z3GworN tpPGnPoT3awLWYwQamvf58Rlk0VKs9q11S9koLJa+zV1Qy53Ob5Trpq/ X-Gm-Gg: AYBFou18DdCdWoiJFHjbVBZJ6Ofg8i+D5KV53BY38c/yKrh6MkMO5Lt2lx+SAt92r+p C0fX0KkWoVcN0uKuOXmA0xi/pvpA8kiogrJc2ozM1zb10kCdAGPsC8+6lYnG645Fs1XOutby9P8 qbHX0vQ19rNxcGUDYswh2LPRCihQNNLw+63PXctu6G4LLQXBDm791DxancAfeQGlmq2+kTrzTfQ rMosh29Hm2zC3FVZDjJFptzFWGG07b3gRLud9jqKYbKWGko8BFE1a6uo9J1Oq4oIN1tZVAxzRlY 9Zcodyk0IMSpKygpy6qkl5vU68Gjfbe4Xgt8QM8tKw5vuF4aOGY6yGu7WrJRovnGsUelb3g1sNx CwX5qA1x9MKv8IoorV6Q4DRY5/MOiAlvbG344WeiXT/ohY/U4QUIO5nrAaPr/B7GQmQoXLs9okE QCEIWuKpnz0mt0KVcNm7r8wNa6jCo+u54BPXJjh2Dfs+ZhZ2mHxKTdcO7NAeNlVwDXFCLkTjnET OZowF8R1jAgiAJVYdAW8JMz6NLGOABt72kxXdocH2FWokhu5mviFWf2Mzt72368V9B7mbRUsZt+ LfmKclpUZ3TZTiAOz+PAaMuAxgb/OV6osspwG4Ox7YnPQ8i1vEvAM/u5jJshHTjUs5itUvqGlGX TQn51WmsT6DXTME/HzjBmLDVaRp2IKFwA+pWRnUqOf+6WMsw= X-Received: by 2002:a17:90b:3b51:b0:3ac:adce:60ad with SMTP id 98e67ed59e1d1-3b182eec12bmr3841358a91.22.1794464718172; Wed, 11 Nov 2026 22:25:18 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2edb6a3e61bsm26979965ad.11.2026.11.11.22.25.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Nov 2026 22:25:17 -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 v30 07/17] ALSA: virtio: Recover PCM state after a failed start Date: Thu, 12 Nov 2026 15:24:36 +0900 Message-ID: <20261112062446.159-8-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261112062446.159-1-mynameisjune111@gmail.com> References: <20261112062446.159-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; }