From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.172 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793156010; b=YwiOYRP7EsrYDPPeKOPZk2BcowLo2UU/pQ9Ct8Gt8Os1KrIdih/L7osMXR74TuC9wNAF bo59cunxdWqDL9nqHkXnBLjz9bWKPDN3b17/+JSb1eQZMj53cULC4yQd3eyr2jqODgb5B bg0lNRij3En2+IubE5TLj9fH4ulH83f1VhXYVuiRQflLHex3WYPfNDe/kCJ3u06KJLzVT MWF08FOpLkOcZ1/gdf20uHoqctHN2/KB19ogSTfU+GHcggpj27TAr/0iK9mT+mgGM0VA5 HNb0w1u6C+ZuovpuVZPIonUZXf0eyGv9qxu0NwDrrR2XzWyiKMbhhvw00QPo89gS9vA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793156010; 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=cwJJNaSJlKm/koK5kjoFQnQ8cfxssNfTJLq5LnG8GkA=; b=geMrrOoq/XqEpPAhh+/BceNejACjN/ggG5hNDGM0Rj3WLwD32FxI1dwvnoC5Dfp+MTOs OWxpz5NQjF0Q8LkKuZmkG0iCmMSpknJa0svtsJIjJHX39wKp5kyjsdbXj6znHdxg6wkdX jdOOpLDzPRbn39gXcQ1tj5s1mypZ+Tf9qaTlQ7ZuafnzkSmubdm2YWBLsd6Wsc5fwqeXB yCLmHCENNRxWvHZl5HlX6EkUL+J4xphtpgexgo54XjSbjTvD0GVitC2mGUZS33A++5Nw4 pOQ36+VEfJT4Q35TIFiQBq786IbxAxZnYhgJyujIkTiUr7ed3q0h6Aoau2Tkl3aRfbA== 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=pSo8NpAt; arc=none smtp.remote-ip=74.125.82.172 Received: from mail-dy1-f172.google.com (mail-dy1-f172.google.com [74.125.82.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 85981606A335 for ; Wed, 28 Oct 2026 02:53:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 85981606A335 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=pSo8NpAt Received: by mail-dy1-f172.google.com with SMTP id 5a478bee46e88-35cd4e8bdbdso563496eec.1 for ; Tue, 27 Oct 2026 19:53:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793156009; x=1793760809; 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=cwJJNaSJlKm/koK5kjoFQnQ8cfxssNfTJLq5LnG8GkA=; b=pSo8NpAtPGfqPDr7HjJ02bqwmTfxuDw8LQi9+235Pki+891dlOuGM+XzvqyS9Pa3iH irUjoKpeBI23haeVYiB99ZBXYN0fwrjUEhYwjcm8+UxENYwdRi0CcrSF+jlvbru3G6Jy f29xbhPcnPi7GXD3DPzMl04szCWUCWm9goxhBaxffcyyhFBbaSX0txUFpwLUVKiNZz0n c3u/6MUfD21PBFMcb+5r57dkyWEcNUTW2EVXq3/ayFxGN5XUQ5EXnw+W6/7tIPlUSpq8 QHXeg6Mh40pqqOtPm+e4bLV+OMrhg3Jdjukh5etkx4n4+cFNlzOc2nTvkR9ZMbadTk2o f11Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793156009; x=1793760809; 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=cwJJNaSJlKm/koK5kjoFQnQ8cfxssNfTJLq5LnG8GkA=; b=x+k9es1fr8wAq31YHsxd/i8KS+Bdze1it6Xw95ujnKNFXqdkiV/uD6Ia6JFgwTp0vv gvD4diuVId+eKM6bh37FkDGLFS8lZwWyRQniV/bjZt/Z3eK/6FZALb3oHRW6jZL+kpCs Mj5m4H41PQkS9CUWbR0RI81MLCx+5fBWrevEWkaNPLo1SRXLYMMGThLtTTJod1Twge4f P8gM4LI//9F/Jsh1sdxcANNgkPjJtkbIhsIkl986T5mslU3Z6ptxh9apSGSIS3f9mMP1 aRVBB5ufbxMYUeDZBMvFteKVkZ95xXwkqU+d/eaLWcT3AaHt/RrPzR7xslsBkeYkB14z PniQ== X-Forwarded-Encrypted: i=1; AKwUvBykTqwdcRq9UMRpkI8c2gY9PQyvgJOdccj7b18W8C9JkHvnKBEk8DTpMqFTnJ+DqMSsryqj4LqJMvScCvX6xw==@lists.linux.dev X-Gm-Message-State: AFq9FYJrclW8bfHT0fNHlfhlYd8Y6ZZFinRlbuWoXJ+6wJMUIiyi4ZHu Y1G20QurlGbgyFpVU2VOw5bIX8+aEnNORbCnRz/hRRjb/nDqajjTUXmw X-Gm-Gg: AYBFou08NKCWoyKpoVx5tQCGVqQFk7OIT/sQYMWx3hoREuZaLYfTvQ5abEW8xXOJ7pl R4h6DTfLvbyHQPDGtbw3gEniH7W/gyRtbihC++hyN/ReFXWemunxYrk+L0nr08zAGg2+785Uwxz 9QXaC5pG1RjA1lGB1PGCN3X0mjDF3hsOKwvDC8BAYoxhzKRjguyaO32PMRlMv9gRzROQ97WPI2y Ve3USSIb3kgHNLfkNvzq9jdWXJCTt3JfrvjwFAo16R1XeK5biDVry73m9cknV1ZpypLxcAhNSkX DydDQ5urUX/A/jD/8u6p21AQPWZP23LKyg5dOfXUyuxigkpX6piXPYgAfwlqucZdbFlXTdQBq2P 3z/8Dy+cbkIdP81fAGX234BU2MBPtZcRlUQj4RiKxMQ2cdsRkj3NCi1Dyk8/UgJFbg6+tn5qtWI Yi1hUC01yA/FzOyr60uP36bemQHDPzQjdg0avLsNq6ZVG1Bpmve/QqHOSATYZ4DqfhuUWfIJuY+ hAoTs+NZysgBhta3/35tfY4nPEGEkMg61OhIMgf2gt00q5dm/MBN46eAPZPD+VgJi7HKvRtiKb7 N+WistdzTW875kiieoiwyFkMFfWbl4nVPUs0pbShxYD7JFUF/3ZdgG67tmdE7Ay/+tGM4ybRzgu j7EvG69uzExsmqGfCOocqKa6dLL0soyh2ionqLrMk2k1pp7c= X-Received: by 2002:a05:693c:408d:b0:351:4d2d:af26 with SMTP id 5a478bee46e88-36a1ff8477fmr2101995eec.2.1793156008535; Tue, 27 Oct 2026 19:53:28 -0700 (PDT) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-36a239644efsm1711914eec.23.2026.10.27.19.53.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 27 Oct 2026 19:53:28 -0700 (PDT) From: Joonho Lee To: linux-sound@vger.kernel.org Cc: tiwai@suse.de, 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 v6 02/14] ALSA: virtio: Recover PCM state after a failed start Date: Wed, 28 Oct 2026 11:53:05 +0900 Message-ID: <20261028025317.92450-3-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261028025317.92450-1-mynameisjune111@gmail.com> References: <20261028025317.92450-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. Fixes: da76e9f3e43a ("ALSA: virtio: PCM substream operators") Assisted-by: LLM Signed-off-by: Joonho Lee --- Changes in v3: - Protect all stopped accesses with vss->lock. Keep the RELEASE decision and stopped transition in the same critical section. sound/virtio/virtio_pcm.h | 4 +- sound/virtio/virtio_pcm_ops.c | 81 +++++++++++++++++++++++++++++------ 2 files changed, 69 insertions(+), 16 deletions(-) diff --git a/sound/virtio/virtio_pcm.h b/sound/virtio/virtio_pcm.h index 8837dfc12828..8048b14e6c80 100644 --- a/sound/virtio/virtio_pcm.h +++ b/sound/virtio/virtio_pcm.h @@ -26,13 +26,13 @@ struct virtio_pcm_msg; * @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. * @suspended: True if the substream is suspended and must be reconfigured on * the device side at resume. * @msgs: Allocated I/O messages. diff --git a/sound/virtio/virtio_pcm_ops.c b/sound/virtio/virtio_pcm_ops.c index a40ea394bf17..970499fe419b 100644 --- a/sound/virtio/virtio_pcm_ops.c +++ b/sound/virtio/virtio_pcm_ops.c @@ -96,6 +96,15 @@ static const struct virtsnd_a2v_rate g_a2v_rate_map[] = { static int virtsnd_pcm_sync_stop(struct snd_pcm_substream *substream); +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; +} + /** * virtsnd_pcm_open() - Open the PCM substream. * @substream: Kernel ALSA substream. @@ -115,7 +124,8 @@ static int virtsnd_pcm_open(struct snd_pcm_substream *substream) snd_pcm_hw_constraint_integer(substream->runtime, SNDRV_PCM_HW_PARAM_PERIODS); - vss->stopped = !!virtsnd_pcm_msg_pending_num(vss); + scoped_guard(spinlock_irqsave, &vss->lock) + vss->stopped |= !!vss->msg_count; vss->suspended = false; /* @@ -217,13 +227,25 @@ static int virtsnd_pcm_hw_params(struct snd_pcm_substream *substream, { 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; - 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); + substream->runtime->stop_operating = true; + return -EBADFD; + } rc = virtsnd_pcm_dev_set_params(vss, params_buffer_bytes(hw_params), params_period_bytes(hw_params), @@ -273,6 +295,16 @@ static int virtsnd_pcm_prepare(struct snd_pcm_substream *substream) struct virtio_pcm_substream *vss = snd_pcm_substream_chip(substream); struct virtio_device *vdev = vss->snd->vdev; struct virtio_snd_msg *msg; + bool stopped; + + scoped_guard(spinlock_irqsave, &vss->lock) + stopped = vss->stopped; + if (stopped) { + dev_err(&vdev->dev, "SID %u: stream release failed\n", + vss->sid); + substream->runtime->stop_operating = true; + return -EBADFD; + } if (!vss->suspended) { if (virtsnd_pcm_msg_pending_num(vss)) { @@ -338,31 +370,40 @@ static int virtsnd_pcm_trigger(struct snd_pcm_substream *substream, int command) scoped_guard(spinlock_irqsave, &queue->lock) { guard(spinlock)(&vss->lock); + 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: vss->suspended = true; fallthrough; case SNDRV_PCM_TRIGGER_STOP: - 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; } @@ -393,21 +434,31 @@ static int virtsnd_pcm_sync_stop(struct snd_pcm_substream *substream) struct virtio_snd *snd = vss->snd; struct virtio_snd_msg *msg; unsigned int js = msecs_to_jiffies(virtsnd_msg_timeout_ms); + bool need_release; int rc; + scoped_guard(spinlock_irqsave, &vss->lock) { + vss->xfer_enabled = false; + need_release = vss->stopped || vss->msg_count; + if (need_release) + vss->stopped = true; + } cancel_work_sync(&vss->elapsed_period); - - if (!vss->stopped) + if (!need_release) return 0; msg = virtsnd_pcm_ctl_msg_alloc(vss, VIRTIO_SND_R_PCM_RELEASE, GFP_KERNEL); - if (!msg) + if (!msg) { + substream->runtime->stop_operating = true; return -ENOMEM; + } rc = virtsnd_ctl_msg_send_sync(snd, msg); - if (rc) + if (rc) { + substream->runtime->stop_operating = true; return rc; + } /* * The spec states that upon receipt of the RELEASE command "the device @@ -421,11 +472,13 @@ static int virtsnd_pcm_sync_stop(struct snd_pcm_substream *substream) if (rc <= 0) { dev_warn(&snd->vdev->dev, "SID %u: failed to flush I/O queue\n", vss->sid); + substream->runtime->stop_operating = true; return !rc ? -ETIMEDOUT : rc; } - vss->stopped = false; + scoped_guard(spinlock_irqsave, &vss->lock) + vss->stopped = false; return 0; } -- 2.54.0 (Apple Git-157)