From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.216.44 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793758691; b=WI1rQQqQnE1D3DyYuf5pGyeeWLmnKnPocBx1so8rGOx8t1eCPk45qsKO6dm7N79Opmq1 qkQOPJeCtChASWTwdyP1Fse/RUSL8EWRAl6hVsG814ZkVtTWPQf+SZsZB3io5wAmnRxw4 C2vntThFVPQ4tS6V384iZbVmwE91fK2rd73iWT9Ps9PH6bhvkMt5bFqIap2Z/EJO/TKMC 0XaPW/aRp4TqDsipXVyKaQausPhHevf1N/0uzLT0BsErbRCGi58QQW7NGbDY7Aswz9tLh Ag+FgHmt9hH2xQ5FGCO/vxdaK/bSaz4zcfVJEw9mkW5C7NTelW5L0GWSpasC2PrMZrQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793758691; 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=4/DGjjZzZ0GRb1AC8/DxRH3JZkBlPhNEmvZ3LAb6pIs=; b=Wbav0ePji5bkURqAkebPMNRAJIAnDZ4crk2fyRXAEIwX30l/1LlsbWhJc5dY962RoAmd IDZUNYTYbFR/CwadjRczTIgINZ9yA+20X14AYZheZJwiSQiumHCnEDvkEd+djno+QjRh0 g0XhxrVO52b+O+4p/PZJZGtQ+qhEszsnuHhc2KB0h5FH02FoGCOiLQoenkXLSLWi8h4K5 +5fjYREiDdCh3WHUrnhbTv10oTYX8ZSBNAm26uv0vbInT4f7GSmTIV08O/4j3Pi5a5m5r EmYE5EEhocW3WFbwddyf7AzKkshos2C0yIEEsIncTSDtYPGpWCSDm5bpv8SILQ5ub5g== 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=c3jBaxgM; arc=none smtp.remote-ip=209.85.216.44 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (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 5DBE7606A32C for ; Wed, 4 Nov 2026 02:18:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 5DBE7606A32C 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, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=c3jBaxgM Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-3ae1b34e0d2so700207a91.1 for ; Tue, 03 Nov 2026 18:18:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793758691; x=1794363491; 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=4/DGjjZzZ0GRb1AC8/DxRH3JZkBlPhNEmvZ3LAb6pIs=; b=c3jBaxgMypFVb+/t2Y+gg18pKHDqKGc9rOlDaECev5+XMwB7Xsw+A4RxvSEVTVnBCq rjE4ia3Icr0gpuUEkgBAeTSck5KP7z94PTaZ8+DMzPv+aYwc+F1tuaSdqQ40GMlPNKBU DAmQ0sT7zLvBFfnjMJ/NWAfAC8sx6HAtuH9VvX4ND1sRWu3mux/HGcnoiUBCBn3hxzZG 6cADjOzb0aByuq7rsCYXsBQBYblH9orgwOW7OGfpvkrfZD7c+s3FuurTTkohn+474WTt HrFlHCJoZUC+vydEe2ttQWRCZkBWZMAKRuj6hMRYIIkkPynkyssx7gt8AM+yx6xC3+0s 8FjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793758691; x=1794363491; 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=4/DGjjZzZ0GRb1AC8/DxRH3JZkBlPhNEmvZ3LAb6pIs=; b=T2FsX/YbotEKR/Thjw8BIENfp0d/H857VgOyoIx4o7chPI3v8SSDXpmrMnjXufnlzg o1OnKaoEOUA9w+1Drz17jedeBmvj8oh3WYC7aALWOJZ5rZ06ii9A1Z5M/9mHLeuxjoLh C8FyaVufVCCU2j0WIjLELfKIgA6QTEMJFL4Y8fBY5Y2LKRz1ifEPkVqnXfoPwH8OO5FQ 9SyoQUK+fOoC1qDXj8HkNkVf6gVepbC97U6pTZ9MEAPZf5HUF5XI8WHfHjC9I22dBZEy P7+jPADQvViz1ZNxgoiLmupBq3s4KpeYvKz+29QpA++BgGX6nPu0sKN0hCwU4QYt5gQ9 GzqA== X-Forwarded-Encrypted: i=1; AKwUvBxQoStLbk0fxQp+mqE8tfSxyf+SE0q5mpF8XV7+sBs1IH48mA4U9fKOCVX6r68VFG22UG2kn0hjUaYDEwPQzg==@lists.linux.dev X-Gm-Message-State: APuU4Z8aGFEqf1saWJLCYtnm8Dm5E1ZBDF6FLDnRBRwvTPyLMWg5hEwg pvDTDeM2Ma8PoYa+P1kgKD2t1QV+CxSjwXqIAVTj7+FD4vao9a7LAMIm X-Gm-Gg: AYBFou2Dm0dMGb+8X9APNO84R3HAOLO7czLwmsz09pLdGNskT/Ab2k9zw4PK20jbKnB diCkNWFPvpruPQUf2ox0kXJHzq993sKxjcgrg1evQNwxC6PZU/RYlFWljRP74OiOTm/MWM8wyVm ofUh8DZCKVB92Bp6oN5hD3WD8Mk6I3tPcwAFIaq5yjGb+llY4CSnyNVSZZSNagSAqdwrHIfNxbN FqkW2FLhSf/UBfwpXuaGq0RAAyOShJmgU6xeZh5EZ3O8nJMjC/KKRyVM8GSmrYH38Tvu/j40ffD OdkWR0L/vCSfkqXaZqPXB4KoxVvKNR0AaHqq3czr//R86SJCP+48T6evVoDiVlV+Up+7E56wc7h bl+v4+Eg6BRqmEgkl0bdN4cEbdkUClGGdSqNNxmOWO+SfA8O13V1JuGx1MjvuTtsJ1z17hz8XGP FVRq7Ki4jiJgaOOjiWpZNZyPcCGo7vxjnQfShJghX3IFO33+frRbNpTmhCHqzDFungyFzjCNzab 5sHqQu2IqEB/Uzkt4933U0ifjFkPpuw9pOlUvjMuQZ1QJwX4YB08bNbTAKXGZQk1y0uMy9n+89d yqn8jABRZGIkIipPSkuG6wUBYtsCrJl+NuhpxnODX/minvpwW+O5jP+iD90LeJs4PaL/gEnobR0 BMyxP9qGkjDX/gnYT93hHc8gCa3JheUCXWuWV325DsQp1ITU= X-Received: by 2002:a17:90a:d887:b0:3a8:23eb:d1d0 with SMTP id 98e67ed59e1d1-3ae6f043acemr12766619a91.52.1793758690497; Tue, 03 Nov 2026 18:18:10 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cdb46326f8bsm346131a12.0.2026.11.03.18.18.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 03 Nov 2026 18:18:08 -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 v14 05/12] ALSA: virtio: Recover PCM state after a failed start Date: Wed, 4 Nov 2026 11:17:38 +0900 Message-ID: <20261104021745.57733-6-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261104021745.57733-1-mynameisjune111@gmail.com> References: <20261104021745.57733-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. 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 | 107 +++++++++++++++++++++++++++++++---------- 2 files changed, 85 insertions(+), 28 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,15 @@ } } +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->substream->runtime->stop_operating = true; +} + /* Keep completed RX data valid while RELEASE drains the device queue. */ static void virtsnd_pcm_block_ack(struct snd_pcm_substream *substream) { @@ -148,7 +157,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 +259,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 +332,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 +386,7 @@ scoped_guard(spinlock_irqsave, &vss->lock) { vss->xfer_xrun = false; + vss->release_required = true; } return 0; } @@ -395,33 +429,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) + if (rc) { + vss->stopped = true; + substream->runtime->stop_operating = true; return rc; + } vss->xfer_enabled = true; } 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; } @@ -452,26 +493,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 @@ -485,6 +538,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; }