From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.173 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793412547; b=wCCRjWqtjebyOreXg0zpKrPhzVQWBQ5uKr4Q2F73RiRlVVMcLjvoboiAy/pwj8X3ofVK /p/R8z05Ec+ibTuvsTc9/3QxyoH4A5t9V1EE5tzJSyoJVUksDQonOMtI7bmoxxvW0KK3G lv+K3FFm9ToGebx4UR36ZurKlT2y2WWmsHYw9lswDu/JmhaefW/eo3eo4xEvUwNQZyXPB 2w84K7wDyqIbgtxwnjRhsgYn/829gDnNsjQXXB9vTt+uPRqxkn8H3qeVoqIunAcoEiRNZ 6jLUfbRaRxr2C+A3NIxWuClEmBwTB1epACdqKXs3FPeB0yC5FvSKhYfLFRZfvZfgxag== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793412547; 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=pPsijI/WFroQ3WU8JWBkdFg+dO3cPuO9jwy6Y07G2CQ=; b=xXnfvCn3a9gXTVyVPebB05oOu5za9koQiSZTeWLaplGALB9L7ADV7vwGYhSsnls/rHKa lnmh5WuYMQX/SOe1JG488Xa0WFQdAFJdbhthdbwG3sM93ik+SCqN9oFaUFaGFGj44cnP/ 9+6GIjF+pqUvLkIJ7tiEYK1nZpA2Uqx8OvbH79vHj5kRBSVws7akBDUmXEawyCDIB+riV vlGsKTBuqjxja6sewUvjGwBRlxhAJ+uC7rHO7OGeQlsklVbRi0FRm5gHpiIKWpkdZvmsL IsroHSEmXdnyKtRJsjQ/8oz84Q98rglzhk/ZKkahkVRQgVf355VcVv1oWPHUs9aFibQ== 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=si3PVKTy; arc=none smtp.remote-ip=74.125.82.173 Received: from mail-dy1-f173.google.com (mail-dy1-f173.google.com [74.125.82.173]) (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 12972606A31A for ; Sat, 31 Oct 2026 02:09:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 12972606A31A 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=si3PVKTy Received: by mail-dy1-f173.google.com with SMTP id 5a478bee46e88-33bf40b0c8bso751685eec.0 for ; Fri, 30 Oct 2026 19:09:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793412546; x=1794017346; 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=pPsijI/WFroQ3WU8JWBkdFg+dO3cPuO9jwy6Y07G2CQ=; b=si3PVKTyQ2BO+TPbxT2fFaK4Vo3+xbQq4y/3vBnM977TD3eUh6ZGepMtfQlyNCiyZa j4+2DaIdNTgTsv/33jVuSE5fuwo2EALss74/yb42NJizhkCViR4KdYR26670pdao6XHx iErsUAPp3d1Jsdgz7dGWmHdZppqj33Tg8mL9qfZ9IY2OitMXRwEeqmst+JaQO3KHOivW GnOaj1QaTa1LyZTCTxmR/2586oBYbXS/JiYAQwutQUZFIeHVLnY115VWreMSF+4Mss7s kRMBBUIUM5/xZJLBvUpxJEui1V7yR9ehTNIgtf9LY5cVtzjYP16jBcuGyZX6dg+SEODP D0FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793412546; x=1794017346; 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=pPsijI/WFroQ3WU8JWBkdFg+dO3cPuO9jwy6Y07G2CQ=; b=hiiQgDP6zBSoL97NosKhiRJx2qCUXrA6tnqtHVrfOHHNwBpVfWhHZ2iCsAZDySlr+l 1QTpPEKE+jilYCK1W8azg3nxWMClBy3aNhmG5zAMRrbWOWFwua27+cCg6khvQaffQgNf gG2HZCc2hSp2hjSIiskOB8Kk+rKeB+zk8b83UfopIELeHv+qcG5RL3y4FVTP2+8qtLlX 9zDuq4DYI/b745RiXv2IimBk166mdUXUiCr5I0KH36rJZFFGbmZjvpyxez2vloDY6Y0I N53Ftc7epOpaISZUUWiM3UpPyZX/4byPhgmpqPLE4GHxE71g9i4/CJQRW9HxIPRAHGRE Zz9w== X-Forwarded-Encrypted: i=1; AKwUvBxsjhF5pYWPrFZRTJp6vA4RwbWFgmyIul/tqRYIijVQjq3kj5999Csu4vZfKD967alc2zr2l6VQNviA2N4=@vger.kernel.org X-Gm-Message-State: AFq9FYJazy6Jo82im6Fp/9/NMcM40yf2bW7Z2tJRE77j/pbJSxsrkJcb HjvNekehFhUgPJsyDenB4vJS7nu8Wn7FMh7ZZt+zXhftX6MgyHLjSQbr X-Gm-Gg: AYBFou3dIs79AxO1TWhIcnvmFSkDjmfAw4cpjlY1EOn00Izyc/X61GnV0ZnQGwISw/e dPdxA7TFS/40zqwiUKccgB1RN9TMWno30p6BqpDg0m0JSTUXAkSr1fKzdjXwGIywUWtdjLokQn2 6Am06XHIRD32imu4+vIqXibo0swy7iHaEHpehBRjK+LcxEnGyprDO1EeLsPokUkG/IiDcqW+tDt r5nDp87sWAf0QlOh2USDuOpqN+WBv3I0Vrt2FQZxWSOHTI/qM06NUDosx2NHXaUzcC617DNDsPQ H9RwfI/6ZQ1y8IrB6SyjSgO/KypoCEVhckKpUTngwc92GvW45hSpezL+yBPr7unnXawfC2HgR8H e5RJ92Pc9HmSCyePyQCUM3ygaISzRRZaGDrw3IW4roLa0i0W5qaus9zNou+ud+Fyx0TfOyAIgKJ 7myPj8nWDWT26HAdeBwWU7ny3fEvVUW0A10KzhqGQ+ij+C2NAx3LSd1pB4YpOTsCnCqeZJ8sil1 AOSCtUDcD8urfxe/unbeOg5Xz0S/CFyz7Es/Rb0jvwwwtsDpjTR4pJTTHvO77+y6J8GuMZ9u8Pn rtky6bRKuwI52fFa3vDiF03TVKq0hPvGy7UASAAHSsFiGCshiRKsXC0GzlTUeTgeU0V5xN8J7kR Rq1fUQiDsSzk64KA9E2OQW4fV0o2pQP6SPj/1ulQd3oH76A== X-Received: by 2002:a05:693c:83cf:10b0:36a:1427:3933 with SMTP id 5a478bee46e88-36a4236e7bemr6531801eec.16.1793412546048; Fri, 30 Oct 2026 19:09:06 -0700 (PDT) Received: from localhost.localdomain ([180.182.24.11]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-36a42a77c0dsm13214096eec.26.2026.10.30.19.09.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 30 Oct 2026 19:09:05 -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 v11 02/14] ALSA: virtio: Recover PCM state after a failed start Date: Sat, 31 Oct 2026 11:08:43 +0900 Message-ID: <20261031020855.2402-3-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261031020855.2402-1-mynameisjune111@gmail.com> References: <20261031020855.2402-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. 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 --- 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. * @suspended: True if the substream is suspended and must be reconfigured on * the device side at resume. * @msgs: Allocated I/O messages. @@ -56,6 +56,8 @@ bool xfer_enabled; bool xfer_xrun; bool stopped; + /* 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 @@ -96,6 +96,15 @@ 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 @@ 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,11 +227,23 @@ { 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; } @@ -273,6 +295,17 @@ 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); + substream->runtime->stop_operating = true; + return -EBADFD; + } if (!vss->suspended) { if (virtsnd_pcm_msg_pending_num(vss)) { @@ -311,7 +344,12 @@ if (!msg) return -ENOMEM; - return virtsnd_ctl_msg_send_sync(vss->snd, msg); + rc = virtsnd_ctl_msg_send_sync(vss->snd, msg); + if (!rc) { + guard(spinlock_irqsave)(&vss->lock); + vss->release_required = true; + } + return rc; } /** @@ -338,31 +376,40 @@ 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 +440,34 @@ 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->release_required; + if (need_release) + vss->stopped = true; + } cancel_work_sync(&vss->elapsed_period); - if (!vss->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) { + substream->runtime->stop_operating = true; + return -ENOMEM; + } + + rc = virtsnd_ctl_msg_send_sync(snd, msg); + if (rc) { + 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 @@ -421,11 +481,13 @@ 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; }