From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.178 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794062086; b=1VcqwNzrfrxgRvyH703CslsVy8lIi9svvrQfB8fQHjhqs6KZLMrqHpX4PQWOsnmjI0NC PfPN+9nIJMoy0TnpIOGyjX8meornoIApQt573fyF9tzqBiM7UWuLKmXm0gdSTuUUr6sGg ydO3a/zlJxM7MR6AUNhTanGtcunbtHoqSTowFp8GPFbi/rLfY6MDej8QAfTStSACJKnad h2cKTgQ9Y/OnMYtxQJICPjZk7alLHcc7XSrMxdPLSRtwoek6mbGO8Gj02mdZltGTDjP9k q2CZpNxl9o+jkFpBMOTfG9BpKIlivfDMjJEq+CxE/ZPeVjWrJ0NDY6t4W4AtZLq4KKg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794062086; 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=p2HQn0uK6b7S8WnZVO6RYFKBvJhyKWdKHL77ptFOkeg=; b=us91/uxSReJD2tgCrWUNyr0+VUzcmG2dL//Um8zSZCaxI+r+miElTpHgU2ikVRk57Vlx I0gizGSRL/hu+SkpqKL0j0/SMFkJotnliQId8Lbr8r6d497ewSd8UxpnHaqWXekh84sCU f1gHh8eFQmRZSFR/14Fn0fck1vPAxQAfGpNr7Eqk5OKrh+K96RLgHGWZvI9oU6IZfyJEa DysGjZIcgT6g8hKNc5DvdG4jYwicLXOlDMN5+Oj2GdTYvq1XROAB2AyI3LiGRfKZvm7qh EHm+/dOpFKglVJ850fcqCJyHxgs5w3ntajYOcXALO8CpwBubUzYdGiE5ISmOJkISikQ== 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=SqpTA6rX; arc=none smtp.remote-ip=74.125.82.178 Received: from mail-dy1-f178.google.com (mail-dy1-f178.google.com [74.125.82.178]) (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 9B9D76082BE4 for ; Sat, 7 Nov 2026 14:34:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 9B9D76082BE4 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=SqpTA6rX Received: by mail-dy1-f178.google.com with SMTP id 5a478bee46e88-36dbde64409so2160075eec.0 for ; Sat, 07 Nov 2026 06:34:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794062085; x=1794666885; 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=p2HQn0uK6b7S8WnZVO6RYFKBvJhyKWdKHL77ptFOkeg=; b=SqpTA6rXo42iKvU1+GD2jSTcXH8nXuApnjHKthzYeeme35CLX+OiL8PR6VHJEPf+DM DpR1PC7kdBlfGQYCqvlT7ow79cDPO5QgJ5IzBIBR03vyUg2rHbYA1aJvwb6PJDxiLJo7 w5EQ/oBid82N56bu1IwcOj8mJHrKS25eCVYHLVKoVIYTSAO6p3kjc8KDSfvBxgwi+KfX 5NmsER9jfw3RDVcdqvmVZdu/XzSlNOJ/2ApxX077JKurC8qzEuOVPee3LvyPP7B0ijw4 071hSUIKCa8c7jboIeP/eCG1K+5Im7NsPRYAMXnXCeFYG7jLZIbcJxo7dJPFDw+F50qS 31mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794062085; x=1794666885; 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=p2HQn0uK6b7S8WnZVO6RYFKBvJhyKWdKHL77ptFOkeg=; b=XH7Yi8sPIazeXEONgAaZyGIgR6R05ohwRBes1ffpZVb8sxPzERGAwzRo/EchyUVmyy p0dIvbmsg05ERbSq/5zgVRU/r3fUb0OXL7EPfGuLyHSPtzhqbw/uFi8AkmJEuQc4rvl2 k7QhP3pKhUUFMLMrVz9IJzHk9zmwrtrfZ3vSQ/ZDuJNfKqAvTsa7rh2rSojuYJxlBDnU 3tWx8aBx8bFQbVvnIEjXvK8DJBYEGKD/rqz7VSkRdV56pCqFA3dw20/PbvgGqVw3UWYW wEAaNb281Kge1bGMzgEBd8QRXRV3VzIy7OHS976uI4/wzFr14TPjohAoiOUPb8ylNEds JBRA== X-Forwarded-Encrypted: i=1; AKwUvBy1/BRyV4d2xP2lrKB5Og2yULvhWBMmX+OwdQQ7NodvQDdI6aPxB0BGufi1kj4QBgPI1Fm80zZzVPtOMMi6JQ==@lists.linux.dev X-Gm-Message-State: APuU4Z/fgLssExBfp8qvCZP3LrB3RM/6920Nl1RiJ53T6YJStnJ6gQ6L WCRqxEnq+yzfIINo89O6dlxlVxi2bCG7+cLrb/PhOlzXTYYnnTd8SoPM X-Gm-Gg: AYBFou3uFFcIDfrgWCsYZoe28vK0mMcZZ2Ekt02PuFOsZAJXbf3xZRKivb/1hi5Rrt+ 0bSGxqvZ1b4H8YiqwoppmUKSiWCGLHG25tu095upEJw2MkDhcnOOuwH5iVvX3a7f+FQ60ANTLTe p9S/5tuQEDK2sTqUkmby+b8bJuOUYD1bgNaB5bXcIrKHYW/GTElG1JGJWZeQJFC/86bN/2L4+Ug 6/ajHuHs3h7CGJvIhzcZo2IUEKAALkoj9KifX6kyOgNmBDEzmnRMQ10MQGM+KMbYiLBS7r0XMbi wIBJUNU+RG+eENDdRi/Zkgp6p+nhc5mTrmV1vD0VM509zyHvYKbhJ1XnfN4x2w+cCzxejIjWWZC SqqD3VQm/wRnXUQ+nYUHVKA226/wM04O+CsIubGhqub0lsHDv1bhxA2Rg532BQsoJMdjQpowozg nV8HI2Ln7Vsw+io8qMfutXT81x2vRHOiE5plmQw5M/e8e7EGmKD7RPPrmDQg2CnsV3gvAKLiUI1 fe/KUEAuQX7LvTfPj/mKYImaKgTkZq8rMP49IF+QW6Y/5G52GHtxBMhQ8SH/TVWwizLhBALn02a ImZxFhCL+S5YCvCbzz9f8sFLvihcsd1xNBOkb/hnN99+GzwYFLQD73JhTduQRqFBZMx0mzPsGen 5JomoIFtJiJGymp1yOWrI+q8pfZh1Vim86ycNrPsink55wg== X-Received: by 2002:a05:7301:a07:b0:36e:76bc:7556 with SMTP id 5a478bee46e88-36f75b2198amr7629489eec.16.1794062084456; Sat, 07 Nov 2026 06:34:44 -0800 (PST) Received: from localhost.localdomain ([180.182.24.11]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-36fa9aea75fsm27881873eec.15.2026.11.07.06.34.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Nov 2026 06:34:43 -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 v20 05/12] ALSA: virtio: Recover PCM state after a failed start Date: Sat, 7 Nov 2026 23:34:15 +0900 Message-ID: <20261107143422.29319-6-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261107143422.29319-1-mynameisjune111@gmail.com> References: <20261107143422.29319-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") 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; }