From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.182 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793862553; b=l0Mfykzku0jDGp0OTBGcSPFasseqY+otaqonD2vVapyQvLTv41PKfemNOfkYBVohsfS4 o7XXxgOGXq1AjOIsPbH/daS3u8rx8Oo5Imd2SBdXX3Q2lrDQp/HzSgO1RLK1SoBFOWTDu pqKy1KjH2sU2uRELm+zMwaw1QeUs9zuBhzlTWPcMjdUfhDTfuW9nCtYkW6W4WQSINhPNG ofLxJhQxPBOy4RAmIoP1Purmu4d86DGYseooKSJWkxQOtQ5r0GFzMyk4FtFEWSk944qiw wsYrcxrH3Nv76zeiz7sVOjVpNubJm2R/qVBpMUYaafSU/yQEO63g6B3y+bTsMV+5JKA== 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=5XfCptze6IJmnJSaNNX1EbOgPaB+woOvUhKpdpuB2gjKCvdF3p5BJenrcTU3aBBDw7Wc RdNr2CaaDYtJ8uadMx7Xrcvz6yQrdFgw3+Kq75JOH3Kwk8Wx94wFyzV4zbE+7JttzWKLH H8c2HRyCf7Vr2BkqoLVMZO093OY/Ybud6pDZAo4KkL3kHSqjIB4vB3nzXn+2Szmwv+rat /50dN9Bmoa/v++EmVIMbnWhGdrIcgU7LE9w3MM/gj1Xk2J0/LXcSg08C6tWWtNdJ7U24D ka0n+FaSXg40IifJtuo0cS0jkefD4Dsoc4mCvSE1p4OCSTXY/KxAGWooFQ0evtLks/g== 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=BLtEKDeE; arc=none smtp.remote-ip=74.125.82.182 Received: from mail-dy1-f182.google.com (mail-dy1-f182.google.com [74.125.82.182]) (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 D026F606A332 for ; Thu, 5 Nov 2026 07:09:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org D026F606A332 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=BLtEKDeE Received: by mail-dy1-f182.google.com with SMTP id 5a478bee46e88-36e99cf7bb3so155609eec.0 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=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=BLtEKDeEYknVhmYNRrv3ds6an3gub0UVqMz8tBKFzOgOYJWj4bPvTu5PNW1jBGICmK MU0X6FNigW/nOmigScTc9shVRiEz5TkmtnjKJ4yche6AoG7REZ97vub1lUEuHu6c+J0J El/XOWz9YUVeotlnV21ir9M3OSmqQomE2DNbcDpuR/r1ujawEUZUOBs3j87bPMl+HaRA Jv3aVP6DymS/idamCv2GTu94z3xzSf+bd911OplW1cZEHvG40Et8vV8HFkSjJ1TavUbL T2La2iqdF+2SnIVS2jJHMXGVcqJPDg3a4wRXQyrYFXUM/NZzPxqFZBYDpO8FlhwFjxxr FyIw== 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=tR2xy6Rtrtg3chv56Mo5r4AUsQ7gnqTADW0hR+7g6hLCOs8VtX7ET1EgyZ08D48PDc gViTdrreE55qxtnlpqJgdifD0kT3I0J4vVbx8ga9Uz6EuY+fzNGofyyli11paiiUF1Xz 1sbYotDMJX7bXa57qSZRT+Y25mr+b5tCvT41ZSFjsYiNxHJjvs6w+K60wBOcatAypTcj 9orvBKWAUK6asixtZzJpunLC6F0/AB0URvt3RtbcdBxAXpdk2pu3PIaeoIODb7GPHrgA L+/tmwf/UWmH8o8t8K6nWqdwYOzJxqHCsG1SSYSJfGPbWgOi63eRcwjYGYbsbQ0mefG+ kHxg== X-Forwarded-Encrypted: i=1; AKwUvBzPUBOeFgOdxbKTWxQWvMsXxPAejEA+UtZldYHlMu46TI12xluSkZUyIS1SSo9yIjwcw0I3s+VQSc8nJiQ=@vger.kernel.org X-Gm-Message-State: APuU4Z9uc57Iv6mQde8rx997fF3aVyu8OQXcgDHxh1Qfb9u0wfHI/M2f 3gAKInHhUF1e19Im3HWqFrTolphblAFJ79LaXXz+OuEwfkOrFTFoRlm0JP8EYg== X-Gm-Gg: AYBFou0A1ZhwzAn5d4DVtzOGL7tgMO24WUwHiiRwDoFT3T8YJ+GLxq68dq9rxV4GzyD KLfO/qGp9oKcYWR86slqLuJu8NcKDLnQr/k0q2BD6GApImPN15DpVVHW51WQnm2Wwy6rQ4W1ZFm copjQIfE9XRfkdeZAkS9JLgHDmtmlSA+hhXFAWD/DcWRiPgaxF/KXhXqNtMtzOM5lGT9aYusVZF N0sBAy2GUDx/3W2gXBtzm+8njM+IYmEkubLN0jZaisnsjvik8R/dVthRRa/JUQLLGu6QWf7F5HW 8ptWHrj4HkBBtuCiHJzAt1PGbpOvYp+N40f1+vT25aZDLdd4tHg09rJTSGhbv2DCYIl6BuPLHol zc1BlwYksnI6AZjmw7Dh5tLoSBgM/ihCg84cWHA8irD7Lcod1yZ9x+WKiXstD63svyZ8DNDOnMn OiDkyzPAQ+x3aY+40As5eT5vRrm8FYs4rE89IXf2c4bHNYraRV2w3U2nUNnHY51rEsTDFegFYdr OiqCuUZOVTcvUjFsAoyNW+Fb8ohcpuyBxLa2AWmvLzOlsaALOSgoEWM0DvJkQoczs5nSxScmkxs T/Q0ZbWG3B1CYueOIwywQZRhAUWNOEP1XVTtXsYgYU9qpjzLTB/imZgvkQgnCcAxv2q1vPWRB0S fIOH/rUvEsA4SC3VukGr3l1++netfBmw+Fw81WAkFKxIidMI= 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: 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; }