From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.169 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794062085; b=rW7GY3mTMai3GABIuROcR6yF2dSgxHZQZECkUkaSwrdy5IQVjJw8IqvVeopqGGXnh3JF VWVYcqeovj43MIlbRxDI1PSjPszxh0scw0rJcUrDSb3VLhdBrqNxipoSzq9DxI7Ge4XEX O2OEQWZrdbNyXaE3S+UCBd7uEj5NkcZ4tQJrUfeBIlMmH3e9iRT/LM+SXEJwIF+0uD0ii d+aF9EfyO7VOkAWvxc0SdmtpzyUN8FyF5C4eCCzq5bvK34EXexpzaVDQ0JGloR835p2+X EsDlgq656bYvV7pEKI4t1zaDBgZCLEFkfJWFHbZW6Xnj4F4ffSEciei0i8IisDNfNuw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794062085; 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=cT6SmbiAarLHzIFP+w4+SFzXT4OHH+Jz48nU5ruo4ygFUah/qNXqBjjLG0jhjtRocvi2 wr1iZEztuSm8l70YI8gca8SjtCJOZZgbN+u0LyZg8gAAzoKMccvHR0px15itEUQ2QpurD NGaTCAEdFwVYDt4LA6pY26vvndG8GJFQ9etDH2hRp9Q3Q53TwHW6kPS9eeYXbDzYrHAZK tFNbRzvlT+AXCkX5LO9V9CIoSk5cX30MlqWR07iV8o0KA3JHzvUElW52vlLTlb+7DRcW8 eV0G7sTF6zfRpGMF7FozTAK3yZcGS9dwafKo4QwPUGHrYcJ89sGz6Xibz8qzg+byuXw== 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=NA0P30VQ; arc=none smtp.remote-ip=74.125.82.169 Received: from mail-dy1-f169.google.com (mail-dy1-f169.google.com [74.125.82.169]) (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 8B626606EEBF for ; Sat, 7 Nov 2026 14:34:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 8B626606EEBF 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=NA0P30VQ Received: by mail-dy1-f169.google.com with SMTP id 5a478bee46e88-3720addb068so25454eec.1 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=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=p2HQn0uK6b7S8WnZVO6RYFKBvJhyKWdKHL77ptFOkeg=; b=NA0P30VQ9n090XJ4TqVf7sJKhlaP/N+vgWf34jWuPYckEF4znBT26tNc6UGbLly9GO uwsnqszUOBGwiiZoZjHXkod6G3VxJ+zeVGspje5QLuBQrukexdCbdAtl+oKe+8o7p/v6 s/pY8SHahToDJWY9FPbsTkl50OoRhyqgmXXMP5RPBXQaQOycv6K0qZ/OaqlnEkHhIQtJ iXQ9dqciOtjt98mBiq623GYREJ3IhmNDa4rEUWsHzCwVE4v1JX4yRED1LQsItVJ8VE7L OM8slzcfV9WYcm4V7XvakpoBBYqAmxtOsAMsX1/j898ELm4PmFWXRZ5EUfyhvCsHWh2K ReBg== 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=vjiUDGXkRJB8dTQMlIRqj3ZsLLUWlxm0OAOvg6Y0SWvpfYQdo1LOO+VksqaPsmWI4a G8n10JWgLmfRVmSyjdVIOenw74R/7DUGQhuMmdra12adk/NQZcb+YXO3ogtDy9Fx9Ekb 2ljQQ2CN01N2dZ69ChSNqv/EyaImWW72WczU93QAuQ9hzNiDGdTlw6gyq47asP7oqO6C 6er67fMunkweNUWm3u5wUrZea+rdf+1frjFhmFeEIoHT8t/VTlCzlXLVeUCaxYMQqtT5 qJPYDq62C1JIZ23hqveMuL+kGgTEsUYZWQ6Bw2zqmwUzLLtBXeBxyZhlLPOqE4pW+h66 OVKQ== X-Forwarded-Encrypted: i=1; AKwUvBypxjgZ3/kBJFR9KApBx+lNEZvpt3YM0ZRiVVCKUlH+KEUoX5aOkRU561v769BqHci+z3AaKXZcKLsjlFw=@vger.kernel.org X-Gm-Message-State: APuU4Z+2JyEkWmVNXIeofn/buG1I4GXjwT05IbxZW40+bUz6sj2PhGEa bEje0iZsacoKbEkLlhcMX4TgJPHNTuWSv5KQAvCaOUB+ADeg29uWU4cK X-Gm-Gg: AYBFou1zAmETiqlzPK/GUjt1FZRQxSql7ybF8A2IDfAnE5ZxqxRLSVGoOPA2kq93gGh ZcDHz1FmK743F7L9eDPbZtLzvYKyHCGU1iD2IAcvp8U+1PK075iaJT2ufQyHr3YzXGbn6GqqAYu QSPSlh2jkHtqwFGnrgBKWb/FOKWxDke1av3eJFwcKIEfil/ZVcydimCm7Wb4tR6K/zgDExsLCOM U64DO77Ub6Sx4yAdAWgmzpt6Fy9wbXk7wNt2WxeRmHZBxWxsFw7ArqXiJXgGq6iJL70I4jZqffd sw0cEvP7wXepKfCmktg0qXbGgRmBZ8p3jPWXDBagAKgM63AXqmFHfAitPQOhOSa3BGUFb/6Y0ur xnRvOBfVk8ixL9paqmFoC9lBwm9xNM5h1GS01rTQQ6y7hILNAn0xNFxtA5/PDFLPO3JVseUAnuL RiSpwiUH2b9RuY/Z4kGs1xcMhUY1f5UYfpZs+ZeOt5DBNpQ0chEARbuX9nYP4/EVWfWs3E0i9/l adZq4B2du6XOF+eu2NKozMFAApzDRkZaq+hePxaWVkRflQ/pfzF9kGFrdX7nqu71wOApzOAdQh4 /KWJYLyPi//r+iDe5Rm2AvlckONWGVCxbEz8+d8wqBdqpLXdDST2DXiRvISm2B4EF1wOHe79uy+ RWJ5ZsDCmAdKXknYzaEX6cuRktrQlw1HRE39eh5ZPc2bAdg== 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: 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") 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; }