From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.170 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793862553; b=cSA+4z4wEiY0CsxHlmh3ArmK6NZ+zJR8qiyOQiEmadYNdMRt7C/DSfwX6Y/HDdSNh5Nv ak9bZr2fxfLTHcqW8C4ji02uf4lX73k2GP0iPhw7vDgg8cKh86rbUt7auMt3r4x550dPb 5zDueHgr347pe0YPYlMktzyJJKG7u1qt258XPI5PeiUJpVoqK519/f853lsyxiLz7hroY PboUifL32UEiQ7I/CXRtqr4Drj4VbfG1oma1UUARduhGYRlIUv/gUMDZ5xu+QKhH7xsp/ Y4ACrihInci7Gk0w082tr73pjZzB7eVbUWzH7ZPgMPfMiJ/+N87QK+buXn+jNPbuH/w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793862553; 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=qAWEWqqRZ910a804C4bUnkIEKGTA7qNIwRgqVFTU7be4ctyciF/VQDqD+diHjd2yz3z7 d2rkB8DUC5pqYpf8J2ps1lSMBoOwnhtfL22s96m62sjPitHguATMsdCksHKDy/eUCanKi tekOCwMXR2WqCmoZ0gmGo5+ESiFeoL9uEedbvm4JYOY25QMiUY7HqYztfq21Q4uUyv9os U3zgzQ0TrXgIfLfaHIv3xfwZs6V9dvwnBt/yu6jU24KHXXps+mc1v7ALPzRkaynR65Lwv RornTNNHT5+Ycu5nxkq4TNXZeVlpzpCw5q6zHtWeycSCHzAJy4sfISWuH2rdDLgnrYw== 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=OMZKmTtn; arc=none smtp.remote-ip=74.125.82.170 Received: from mail-dy1-f170.google.com (mail-dy1-f170.google.com [74.125.82.170]) (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 BD383606A32F for ; Thu, 5 Nov 2026 07:09:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org BD383606A32F 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=OMZKmTtn Received: by mail-dy1-f170.google.com with SMTP id 5a478bee46e88-3514b90bb89so2986799eec.1 for ; Wed, 04 Nov 2026 23:09:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793862552; x=1794467352; 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=OMZKmTtnQ+f0h/9256F4AcTYXrbGTTCrV47+4nTtqCmUB6t9SB0/648zkiFfHMROfm IwwYzqm4Z8aFpQsloCrci80/NGo4qnS1VZ05LZ2Pj30XfLBq8sOBEvMKgkC+jlpqumoZ co8O/Y93YlRdwhwwCXpZgCB6GfbOoQW+mWiLXf2TkCHs90RGwgkOt8Zx5PaHurRjd6BA McdMmqJc2BFc+D0LhyTLbd4QTPEn1I6YpNZ7ZdKo04/4ZaleqywAzLgkJUbxT4UrlPYE ctRuqho9Z9djd1XXGrmN1ZlDxTwlW0UONWqCeY66d84IE21x6f4hNaR5NYWGdXCZtTrl t32g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793862552; x=1794467352; 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=U2IdhaiNDzIB03vwekCFThugJDrx2NGZq3x1PRD2u5kjTnibaO9xE55Sk6qV/3wngs SBQ2Z7C6d/CYsT3ISjXZcY0GWDuw3NyYzRGp6JXq8aJY+yUgjD182yU4m8gUqii/zckC aVN5Q1k8jT3j7NsdEjsqnMJC6x5pnhreX0Sdysud0RzOWpDPCxPyJC/NY0ZEDdsD7YPI 8kkAO8vOwwAk6OSZiEHhR/rLjvWolXZRTarA9ZKdTnf8KeFhAlN7h258WB9PusE7Krkt diWti8B0Xv9iRTWKsnAQYOPwf9StWz0vJc4BwU8HvLkcFVyyXZHD8lCXRF7Z8+mgkwyJ C9gw== X-Forwarded-Encrypted: i=1; AKwUvBylNeETDYJCAoc+ok9GDlSPRCjiNQC4IlcRsqfn+mIOlacIHDvRmNfn/Vo8kXRVBggrhJa7fk3znxd9MuwAUg==@lists.linux.dev X-Gm-Message-State: APuU4Z8+nS4aWB0pbjPKdAljmI33x3fHP4GaASXZyxi22iVeISbJ1liM MmxGDfGlDVudx/PPOoJLiR0p2mpt5Qver7GvyvuD9mOxhWfz4UiUH0Wa X-Gm-Gg: AYBFou3gh1moONsN6S9WAzzTMT0d3gzrKylcX1Q3ITT7Jer314Yzne698rK/+nNEC0b 6AalZESbA4GdV2p3F5rF/pFTmvZmDC5bZR29sH42Rje0jNn9PBIGwE5g2PAVZz1i7u9j/nyFoZk wJiSnPtiPLJfaHVCq4nomVr2yIf6YFt4/XxsCM2/eernxx2V2bhO/kl/UToyyR0e8booLC/wkhv M5UkrItPS9OqHkTpysvgh2QX4fxdDypyMLMWfZSAA1XVqawabh9Ui7lklsDDfDZ3rpHkb51W3UQ fVRltO0w32a9zLUu0yXa0NNS63uKaiKvj/8l07juC7F7Ips0DLY0tcFcuqpQXm1wcYfdFNqMX7d wVGbjH7ftaC0A/AirrOjlJTISjWL6t5K9DNW7u2SSBTuBirByGuD6PjBML4a/1PVrUfcvo1bfhj GtSGWYsvG3CetA1eu7dtD8flXnXTwPuHD1rJlYTenhjYiklqj+cTvM77WH+w9CMUhAm1VVypgvO TW02Cy83LQ3/dNi5PAF0VEa/+Gusqo6ZDSVX3CDwdYp2F5sIdFGCzDD41hiLrYzJvlEjdg1cKp3 pFfh2EprSKyR5dFzjRvsKvYiEjg6EacHyPOdcVdmdEfKnAi6zCiyZqpMK9/9fBsNTVUtItdZk2W uvYPUiYuCt83CqYX2Cn43Q6LfWRnNdROT83Lzjtda4soSLpY= X-Received: by 2002:a05:7301:4548:b0:36e:3336:2cd2 with SMTP id 5a478bee46e88-36e33363a62mr1555604eec.7.1793862551614; Wed, 04 Nov 2026 23:09:11 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-36ca3981ff0sm16812286eec.24.2026.11.04.23.09.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 04 Nov 2026 23:09:11 -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 v17 05/12] ALSA: virtio: Recover PCM state after a failed start Date: Thu, 5 Nov 2026 16:08:38 +0900 Message-ID: <20261105070845.6449-6-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261105070845.6449-1-mynameisjune111@gmail.com> References: <20261105070845.6449-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; }