From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.180 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794365847; b=tJyUZtOMgACBhZu00s0rv0pLqOaT5fGIiRNcx+wrPVFqIcoktyeEqw5iKDC8O2PaYXer 7QekBI55aFag+5oToTQ0uaT9rpMD6wcUbgI2c/vqCuvNpE4MpLaVqG0WX4STXeHhW//QF /MGEOoTGvHAOOsWmJoyyqdyaPgw1SxIQroFEd+PbHnSloNzJ8kf9FDQcMxD/Dr2NBm/ie 7BbLue0gwWsj1rPrQlV7aiRIbtik2NzFzFwMcovW39EaotQuuWItaIEPm5Z7vrTpz6bgB L6moDlq7EFSryuakmCn6Zt7oYwBTwji+LRyO2jtB+a1JjPlYLBOdtDOqwsCvKPGP7wg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794365847; 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=0f51mNeZYVTPJUpmTgME6TfC41pWOa5PhiEeT8cO5iZBx5XnxYLbhvZU//XaNddnnSdl fmIk/ZRuXEoZvAWcKvgT9eoRyfIPsh23q8FWo1zcVTKV030za5RkJzAzqL7ZYt1dft1I8 CpOO+zoMI5j+2PI/3BIwyIn8JRWTWgrFhcJoZSJ+N2TNfSctoT9HE2x0kLRPVqoF5Nb6x GjYdq1+bKsLmqO7KQjDWoKdI6PHZU64+AFEgtpLq6ZVkhvu6Q/GKRvIuC16MqoUnibPc7 M8/sVVTqKwnwctZwvRGuwdNKWvwBuqm+wNgOce8omoBXszr3w1ENRxZ+pzmadcg8Vow== 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=u9A0fZMd; arc=none smtp.remote-ip=74.125.82.180 Received: from mail-dy1-f180.google.com (mail-dy1-f180.google.com [74.125.82.180]) (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 6947260A2607 for ; Wed, 11 Nov 2026 02:57:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 6947260A2607 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=u9A0fZMd Received: by mail-dy1-f180.google.com with SMTP id 5a478bee46e88-36f8cdd30beso4467925eec.1 for ; Tue, 10 Nov 2026 18:57:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794365847; x=1794970647; 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=u9A0fZMdlFmWn8LnDtq08jzIAQ1Zm5uOkjq3GTZ63IFpX/rYXHlMSc2Y1iOmGOKonS rK7IN4ELYqta4/zA7/2jQQu/1CirFHFQ+dDZZdgpMHRiLiPWxF1WyoeL6UkQ8na0UikE 0E1MjMQv3fFMe8VF/kSE56FW/qhLcK5T+tqgzjLNB3xr6UOfQZSwSZzPksRYKN+iH6jG 7z+jDhhFttlpYclC3xMwP6QDk6yTK1i9jaM4dx1lI062vwDfE3zWMuvAZLAUwHZjlwnL x7a18lPChRi8wdFnCjzxRh+RaFPvB5bG3gLs20G9IkMyx0sYbTJOmKRmAZidIDAs4dqD Sg+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794365847; x=1794970647; 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=CPULQeUKlNegRw9EfYeI5FY/ibO1uMUDk2cAFmY4xZrh/+F0IMRjw/ZjupdHuIQp4Q AiU+tJWUmpApS9RM+D9AHRTD1/+qFn/lxMqHXZ2K+eOfYK0gx767COOvxbETuINN3Xyq /EDk9WGu/CKeSLzpSgHIgdSNmDuA1hK4KBJL8KkHvznmrDmw+Nn25HtWqjXio3UgK9zi GCKOPZ4MNpximGxF6OamSjpE8UL/vt/4mGdIq77ZxJdAvP8AdgWO+6ouABi0yypheb2V p1spLK3agWtp16RCOkH1l9AecOK7GUUPk7RxjElYShvaQD5uLZP/V+xDpbf0dlE/w6Vr 0Nlw== X-Forwarded-Encrypted: i=1; AL+hErFkHcK+4t3Nw208yHjRMrt8WKe5puxPn5tMJ4sv0nXZmB48co4AIhe4v6tzGocVlPYNvPW4olh75aI0xb0=@vger.kernel.org X-Gm-Message-State: APuU4Z9eZVVrWINk8vXdVSFvBNbg6/x/CgW82gXBKW5pK73UoIUQotQ+ 2ZGyG7KwFb4ZKUhIn/Pfclgawd1zlLXSA4BUe9SLvSDZDKJ00NMornDP X-Gm-Gg: AYBFou1Vq/30HulvwdrtOhEtWwdCb+K3tcRNS0nvk3taKP1Fh0JR5kiBL+zdSAtfVGY 7rsDhUSfjucb7LXx9DvR2l/NevbICuo6XGGAgCw5IiSWk5o/Niwb8iK0liZo7fDGSYuceoZdIMA HJU5huJzsisd+AHNH/HsosND0LWhzshJwmhsHTgstItVVY7WvoOcE4lLsb0yVgJZNvQXQyyKH9t WwmamQRtjj1QKbvoeGRRWg8J5DBT0wmqPdXBtXyh4ZY8J3YxlPeZ+D2H2h3nMDsNVwa6XxTjftQ E6pJoU7T9WnS9tVhuqKRFNUEjnLQQFPNEw9St0MnqEpVygmJxnQoeE5wavx7xuL/HyIkV1iO/B0 +o0HlEkSA8ocNGynoAWXXCCjN8E914ywpaije1lZH3cBtAYuK5ouidvdrQSSyDqRX6K0fR+tEY3 MXCGPXN2+ujfFVcTjqLD4+N8EYth6kSg1oP91mSInZ+176tEocomQPaXFEFbA0/gsGkuyDVb81p lPBMlyEjC7TY3JfQD37zlo2lqXGNObOk/kJQLDhgNiVHxBHIYhljKKN5v7J/lg2pvhXzFJz5Qre W3nX8zf991tQlsJ7wM3FhT6KAkRW8OW6toP0ZMOeyv1Ox4bK/q9rZzHDlw70+F3I+Z6V1xBOPTH x5U0YgsUXhPhZ+U1bW3RvWmWaoJGRCJ140TKuO5KONM19/Y8= X-Received: by 2002:a05:693c:8852:b0:371:ede8:3e9b with SMTP id 5a478bee46e88-3768721116amr1737539eec.36.1794365846430; Tue, 10 Nov 2026 18:57:26 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-37520cfdfc6sm12390018eec.17.2026.11.10.18.57.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Nov 2026 18:57:25 -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 v25 07/16] ALSA: virtio: Recover PCM state after a failed start Date: Wed, 11 Nov 2026 11:56:46 +0900 Message-ID: <20261111025655.63951-8-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261111025655.63951-1-mynameisjune111@gmail.com> References: <20261111025655.63951-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; }