From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.214.176 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794182133; b=gZZwKj7al+x+IKzh99Z2hBYibZQT/YOgmXqK7wxgIUe3Ofu21ApNZXIrUy5SnJfvUq78 WCaVxZsTh02m4YQU4DNZ8EKZeCzFvNxECwO69luMbH8OQrsJDqi7oK7IqmIf33yDbcC7i T4KWyMVln7OzW+CGsS4qLZSI5/r4QOdd4UqOH/1287c8/xcQcCmQjmIbtwxgKIL9eXvwg cBybl7OtW3tlfGyybspPksItL8w19GeM7IBiBFEHv+t/TzYM4KYk5LLjmU66Xb5sgFoqO rpYClIdrmRdpTJXp+NT5hF/1/nXCjdw9T552CjOzVuxuHd+FecRJLR5OD5Hj5j2IkVw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794182133; 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=aZBypT7Ut3yA1huRROt9jJ/ijwyjCEpXOdrGtpkoISk7NW4zItYAoenxrU5bK/tG6rbW nPLcDMhEO4At12Appe+I2n1HSJtPKcAmlHoBYu08BxVhrtqrrnoobovg6Ten3rcWAhhyi sXe47hkS9TvU6lzR51wosUWjAfFmRJwwgtC+/tT4nD1/wUTcSwr/TzPxuoSBRBT+7AE2D zE+Q39wVLyVUZ0gy0p2F+d6P9CSQd/hkQ5NVC+w90w8cj0QB0Ge87ZBGaZEAYp4yr3rH+ ICYPC6HPrFVPXVXJ7ereeLtWL/slRqM+XSeYHQ6FIG7+vOKVPg6cIlBs9VJIZfyDspQ== 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=YZHPsUq3; arc=none smtp.remote-ip=209.85.214.176 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 6B3B3606A323 for ; Sun, 8 Nov 2026 23:55:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 6B3B3606A323 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=YZHPsUq3 Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2ed28bac8d7so1031915ad.0 for ; Sun, 08 Nov 2026 15:55:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794182132; x=1794786932; 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=YZHPsUq3RhNTTYQdJAqwm+2tYpw9rhLd4IuycPoIQp/qLGyMdEYCV8gcOu/VC546zS vhlirt1ch3bR31njSeE0v/AMXZAFU49rrl0cnc1VGtXjNPsKqxas2IgnYxqZyEIlnzlW cA172mOJ93+iktqL/ocrPOnWGiUdd8qmk9b5iG8ZeSE4SVT7QIJ+MIji3woJz+8xQDjq SVnkKSlbfbosd0H4LX1+lGBJWbyJY84WlhajOFDuyJgCMEhwJtEZmXFTgvS4pIdjw2NK TypSfRh+9jIG390DZDC1964VhE2gMmRdmJwaoiWRE9i9aVAal6eD+mwBprLnFLQ1O/Av BwbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794182132; x=1794786932; 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=wc3GP/xb/7IqmJZrqQcxvRJ1a5ZbsYDBCpTY2tlJzOkgVCNS7krNIYt4hCFi2V8yX+ gZDcwPNcBYi2MdG7d099d/izhGt3x7pCH+r8zMkr4Bi2kZrwePiTYejRPUcPbL8qSg9q deKlWw8wf5Y5ObJHxFhRacvUQyDhoHGBvdSG1I8tTIYGFq/sc1rQwtSRIxmaX/LhvhDT uuyCc4P3X8jpEznnifpeFSRQ3aKWvTjaJNjp+pzW//vkpZ+MqyYpe4fTxw1bs/lXIH/e KU/ztbgYKZ32uMS7JHxOHUraB6noKoqzjfAi2zkZqeODDiFqaRRzidDyDxODqzQHhfAc Olew== X-Forwarded-Encrypted: i=1; AL+hErFxzTgus2/L0nct236OwOlTJa3tv1SfFd9vccA+p4cU5eXY2Lz8hmBpod1ySYNG2HN9OSya8luqCWGaEPI=@vger.kernel.org X-Gm-Message-State: APuU4Z/tyRTTV8FJJ8cyLDwXmHgY5JWHtLjZ2B7MZyji09dE50d6luFI gJzUDHt325MxREP7RXIbM4mMs4CUHVbf2y2gqmGzH/aCIR5fGUR4/UHM X-Gm-Gg: AYBFou1ESux5ZYIXiOvDr8mAekMDYJ2sNd1UhXzqtqcuW5Xn5WQ+O56vUXEKZ+gXSpQ uRdfTEAZGD18nT1yXo5WZDRtJBGHR8AKsdzJULyADQSaBjV1LhwUSUBOTIRDzGyD18C2jT03JKI QvIcGq5K0dbcM/xMfEqldufkfGZgJkQYAcF2SI7jmwaA7SVkz6I5aFGVdoYfC1WM8tw/XUSA5E4 oHwVeQiw0u4HMiGw7XqgYZ23Pj35PVdqwFyGDKbR801RkmuOWSbExGCKoPh+7UC25tfNokz57BP dgL98IPWw1csdop5N6/1fiG2oKz/OfaP6mud49icmru/ex1BwrbbaoUThIX+gWAnDELOpKrtIzq hvKmv8SlUdNHgfi5YVl7gaeH+r2Waxx8JAQmVIQ1cQ+F+kEmzv7g/u2AXaNm6GxpiLljC6JKgHr 47Or6O1B4h8RkNFdc6s4cScJ0tZT+EacmVpmNkhbHuMNcCmCTTkDy3cCuvfm5W9EE5VT5y3JqzG LXIl/1rlEpnjSZDXXWyjitz81azRTOA+Huk6aHJu8xB0BjneR6IwjPi6IhyDzj0mkRZnCf0ZVyr PtgOY9Zs0RVF3F+eKRbd/EW1UceEX9mo8T7GPC5jYRz3AETEIRoy6qapV40iYeg/a//XPe/ezAH tKZKbJwg0tNLYCn2JAneOqGrfZXnCfcnyv3mviOghAdh2jPE= X-Received: by 2002:a17:902:fd85:b0:2e5:debe:cb50 with SMTP id d9443c01a7336-2ed67a21a47mr38941155ad.4.1794182131739; Sun, 08 Nov 2026 15:55:31 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ed81722edesm6095215ad.55.2026.11.08.15.55.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 08 Nov 2026 15:55:30 -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 v21 05/12] ALSA: virtio: Recover PCM state after a failed start Date: Mon, 9 Nov 2026 08:54:50 +0900 Message-ID: <20261108235457.12688-6-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261108235457.12688-1-mynameisjune111@gmail.com> References: <20261108235457.12688-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; }