From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.216.51 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793180511; b=WZ2N9wiIj3UskCjA1PvDBL2lmUxlTbA0hVGT1JrBDjtHvpAgz1ViEi10W0pb2ehFbUqS duzblr+cK1CMtC+t0D/zprXPpTx+po8rtPcCg1iz7k75qFiyJWiVpHSUL3t3WmTqHWpPN t1Rkbgc5WSpKPIjNvtXI8exfQrz43APfLPSYTf0R3ksO/aEBoCQUnaFznUOtl86VQeFlw CgAdBpxf9ef64aloe7DiXgB8EtreSeNhXiHhpjgqnDP+rI+gHsaBJf6DTG5DhiBBJ887n hiLiyYSAUq0aIYvBskIQUSCjnClVE0t7z0vHcvImuXUNgtWzQLmBp50TCBVwTHmcvXg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793180511; 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=JhpmC/Uc/PbS3eydMZOwQvVnE3o7hoZ+spCQpzSOEEE=; b=zd9giRlfNp9cQwuoNw8Q50exxQkkTPZYBWH/w6TZCS+dQ6H9SDfTuNc95wyO8q7LhO1x /QXrXPzIuiTOq8onwVfezlMlvHBAsFwslklES9uexHMYRBlzXfdbSmQwzyc1AAbhRGawO x/lB6hrtb5+Oh/YGIsS3/Xl/9j/9MxGkOGJDkdZSIiEEJpxLcMA9o1wOFWuRqSWtCEgSi q7LhWRbZI+s+H8ARUSDUbX/dOAT+kRBwA2MbP50yFg8eecvL8GcmKgHddFwUbpUZf4CyX ziAmpti68TM2eI7bcj+lmCraygWunXLJxHZy5+Ib9kwkh1pRZdUFSgJePuj/OkJuIbA== 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=PXKdZRZg; arc=none smtp.remote-ip=209.85.216.51 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 285FA606A326 for ; Wed, 28 Oct 2026 09:41:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 285FA606A326 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=PXKdZRZg Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-3a4b3ac8fb7so470743a91.0 for ; Wed, 28 Oct 2026 02:41:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793180510; x=1793785310; 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=JhpmC/Uc/PbS3eydMZOwQvVnE3o7hoZ+spCQpzSOEEE=; b=PXKdZRZgUaIipCdSX0x1iPowTGU6ZcbU44n/4w41LzsTQckO0bo2QflfHozBU5uQ3v eVUOPu12QX+9ZffLtdbB0LRYA0G7BPR04zl/wjASxE/YYPJIufOXYXMtlclt7WVoHy3r FXsEe9C1SLZfPKkSDzB4XcdE5PFsN+Nih4zVT1TDExqwld5kdcNfKTBHUG3LeKJvegnt HOlXyzZwMngkHeRKW9ZV3xsk5Q7MIBNjM3ow9cW9/iPgJ0W12P0ye0vHuFf8MQ9jLKgR iAIVxKAUzxIGfkNVaT2n9ysMhxvjBJLMamFFjFSug5R5Om/VpaRa1YaoEZvMbwGblYSM sXCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793180510; x=1793785310; 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=JhpmC/Uc/PbS3eydMZOwQvVnE3o7hoZ+spCQpzSOEEE=; b=CfW4d3Hs1qCTAzO87kEX0pi5Wr/5R+NcmFPrr/rHswMZK1ZDutME00M4oOjKKtkSve 2wzCOZZ5EaG7LViQ6LHMGvjs2rTWBj6T72+M2+CfBU5Hch9fuPp7f77SefmJPDCaKvGt v7fhea11W+6k7R9DRCX6PqGcFCNpbTgAyY5zpCku9bqG/MG1CPHPHWURsfh8/go2UNP1 f+WMep0VpFN428Hg1AFLvYboW35+R9xcLqp/y8JZ6JjydGVluFlob2urw8w2FwKheGbm 7xUaR9Nzq+Rh1Tlvt21S9Sih0AKw2q9j89UXY1GCdXGigGt49Iw0frT1CPJY095iqjnF 6gHA== X-Forwarded-Encrypted: i=1; AKwUvByny23JGVhVKQ0e/Cj3PA6nwCAM97wkUoOOSWc/yZ6NDfEFfKzQKgol1EwNxeQBrOyNM8TQxdaeKSIYrQ1SWw==@lists.linux.dev X-Gm-Message-State: AFq9FYKE38EWgXHpRx9VXyTKn80wxPHqs8eS8bUFAlJ1jGZutKmpvqjW WfS8cRoBqKZer0cfWgXI/Z5lNijGMv9DONRM8SdQAj7Ps18FhPxRiIGz X-Gm-Gg: AYBFou0wlb1YspjdDr7UudPmQw1MXP3NBjIukNEU3sM682gkNTG5IcgaUCDiaMDxdS1 CfEitWv4O5FxndSahW69BVlqyDyPCBGSdlstuIWib8PuA2VhdkCZ90NQoikgeQplPjHMP7y9sVt UQezbWCJrX/wHraD75rE3TeahAkuItxHmnpDLHR/71sVbCpdr5cB5QaNRNsoSBZA/DqytShyGjZ Nr4TE/f64rixBUoxa7VNXLkqUatGpla6sH/f30AmzsxMXKQsOzAZCATuYnE24YUz3rRtUp6hiJQ 9LgD1U5XG4EKDgvpU955vD7pvFOVAZoyvKPnk//2IvY60KbgZ8ONC0+/a9+pzolbzy4MZpRQITA BDxaT7wHLaHaD2a8Er21G2QP/eJ4woPAIN39jm0gGme7Jitg+ObNW6kfUF2vX3INP9PwHCkqUgK HyWHHWYnWgQP3qupaTGXSs4yvyfRCsbzfl3nWw8Er683hJI/l2x9PRJ4jsc5opc4vOo0joqT9j2 ZRO4uWPFjTSHxn3gjZGwl1L+FqUPPRygflZ+sotvyieZ9JMkQ9fhScZgA9Infp6Q7uup0GebwWE j/E7QD3YCj8FcXvU9LajMBR94dAM8yXjIQYvCTXfayuQ7CGDa88/QWRqaHLP7mKlB1ZKqsbzR0l vdil0nbyGGp7nlg6u8cFwwTAtDN1LXzWP7FCnu/tBzfG0tJ4= X-Received: by 2002:a17:90b:4f84:b0:3ae:2961:14d5 with SMTP id 98e67ed59e1d1-3ae5824a0d5mr1388250a91.42.1793180510416; Wed, 28 Oct 2026 02:41:50 -0700 (PDT) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3ae5a93b3f5sm2242377a91.5.2026.10.28.02.41.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 28 Oct 2026 02:41:49 -0700 (PDT) From: Joonho Lee To: linux-sound@vger.kernel.org Cc: tiwai@suse.de, 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 v7 03/16] ALSA: virtio: Retain queued messages through device reset Date: Wed, 28 Oct 2026 18:41:19 +0900 Message-ID: <20261028094132.20364-4-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261028094132.20364-1-mynameisjune111@gmail.com> References: <20261028094132.20364-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 Keep the control queue available through snd_card_free() so close-time STOP and RELEASE commands can still be submitted. Block new control requests and mark pending messages canceled before reset, then release their queue references only after reset and queue deletion. For PCM queues, detach each remaining virtqueue buffer after the device has stopped DMA and retire its message without reporting a normal completion. Detach all queues before deleting them so outstanding DMA mappings are unmapped and no token remains for a late device completion. Fixes: 9d45e514da88 ("ALSA: virtio: handling control messages") Assisted-by: LLM Signed-off-by: Joonho Lee --- Changes in v3: - No code or commit-message changes from v2. sound/virtio/virtio_card.c | 44 ++++++++++++++++++++++--- sound/virtio/virtio_card.h | 2 ++ sound/virtio/virtio_ctl_msg.c | 62 +++++++++++++++++++++++++++++++---- sound/virtio/virtio_ctl_msg.h | 4 +++ sound/virtio/virtio_pcm.h | 2 ++ sound/virtio/virtio_pcm_msg.c | 29 ++++++++++++++++ 6 files changed, 131 insertions(+), 12 deletions(-) diff --git a/sound/virtio/virtio_card.c b/sound/virtio/virtio_card.c index 6f35276416fe..df7091b74a52 100644 --- a/sound/virtio/virtio_card.c +++ b/sound/virtio/virtio_card.c @@ -337,6 +337,38 @@ static int virtsnd_probe(struct virtio_device *vdev) return rc; } +/** + * virtsnd_reset_vqs() - Stop device access and unmap outstanding buffers. + * @snd: VirtIO sound device. + * + * Context: Any context that permits to sleep. + */ +static void virtsnd_reset_vqs(struct virtio_snd *snd) +{ + struct virtio_device *vdev = snd->vdev; + unsigned int i; + + virtio_reset_device(vdev); + + /* Deleting a virtqueue does not unmap its outstanding descriptors. */ + for (i = 0; i < VIRTIO_SND_VQ_MAX; ++i) { + struct virtio_snd_queue *queue = &snd->queues[i]; + unsigned long flags; + void *msg; + + spin_lock_irqsave(&queue->lock, flags); + if (queue->vqueue) + while ((msg = virtqueue_detach_unused_buf(queue->vqueue))) + if (i == VIRTIO_SND_VQ_TX || i == VIRTIO_SND_VQ_RX) + virtsnd_pcm_msg_cancel(msg); + spin_unlock_irqrestore(&queue->lock, flags); + } + + vdev->config->del_vqs(vdev); + for (i = 0; i < VIRTIO_SND_VQ_MAX; ++i) + snd->queues[i].vqueue = NULL; +} + /** * virtsnd_remove() - Remove VirtIO and ALSA devices. * @vdev: VirtIO parent device. @@ -349,13 +381,14 @@ static void virtsnd_remove(struct virtio_device *vdev) unsigned int i; virtsnd_disable_event_vq(snd); - virtsnd_ctl_msg_cancel_all(snd); if (snd->card) snd_card_free(snd->card); - virtio_reset_device(vdev); - vdev->config->del_vqs(vdev); + virtsnd_ctl_msg_cancel_all(snd); + + virtsnd_reset_vqs(snd); + virtsnd_ctl_msg_cleanup(snd); for (i = 0; snd->substreams && i < snd->nsubstreams; ++i) { struct virtio_pcm_substream *vss = &snd->substreams[i]; @@ -383,8 +416,8 @@ static int virtsnd_freeze(struct virtio_device *vdev) virtsnd_disable_event_vq(snd); virtsnd_ctl_msg_cancel_all(snd); - virtio_reset_device(vdev); - vdev->config->del_vqs(vdev); + virtsnd_reset_vqs(snd); + virtsnd_ctl_msg_cleanup(snd); for (i = 0; i < snd->nsubstreams; ++i) cancel_work_sync(&snd->substreams[i].elapsed_period); @@ -412,6 +445,7 @@ static int virtsnd_restore(struct virtio_device *vdev) return rc; virtio_device_ready(vdev); + virtsnd_ctl_msg_enable(snd); virtsnd_enable_event_vq(snd); diff --git a/sound/virtio/virtio_card.h b/sound/virtio/virtio_card.h index 3ceee4e416fc..bd065bd00d25 100644 --- a/sound/virtio/virtio_card.h +++ b/sound/virtio/virtio_card.h @@ -47,6 +47,7 @@ struct virtio_kctl { * @queues: Virtqueue wrappers. * @card: ALSA sound card. * @ctl_msgs: Pending control request list. + * @ctl_msgs_blocked: Control requests are blocked during teardown or suspend. * @event_msgs: Device events. * @pcm_list: VirtIO PCM device list. * @jacks: VirtIO jacks. @@ -64,6 +65,7 @@ struct virtio_snd { struct virtio_snd_queue queues[VIRTIO_SND_VQ_MAX]; struct snd_card *card; struct list_head ctl_msgs; + bool ctl_msgs_blocked; struct virtio_snd_event *event_msgs; struct list_head pcm_list; struct virtio_jack *jacks; diff --git a/sound/virtio/virtio_ctl_msg.c b/sound/virtio/virtio_ctl_msg.c index 6433c870f271..7114bea4033a 100644 --- a/sound/virtio/virtio_ctl_msg.c +++ b/sound/virtio/virtio_ctl_msg.c @@ -15,6 +15,7 @@ * @list: Pending message list entry. * @notify: Request completed notification. * @ref_count: Reference count used to manage a message lifetime. + * @cancelled: Request canceled during device teardown. */ struct virtio_snd_msg { struct scatterlist sg_request; @@ -22,6 +23,7 @@ struct virtio_snd_msg { struct list_head list; struct completion notify; refcount_t ref_count; + bool cancelled; }; /** @@ -100,7 +102,7 @@ struct virtio_snd_msg *virtsnd_ctl_msg_alloc(size_t request_size, INIT_LIST_HEAD(&msg->list); init_completion(&msg->notify); - /* This reference is dropped in virtsnd_ctl_msg_complete(). */ + /* The caller owns this reference; send adds a queue reference. */ refcount_set(&msg->ref_count, 1); return msg; @@ -134,6 +136,7 @@ int virtsnd_ctl_msg_send(struct virtio_snd *snd, struct virtio_snd_msg *msg, int rc; virtsnd_ctl_msg_ref(msg); + /* This reference stays with the queue until completion or teardown. */ /* Set the default status in case the message was canceled. */ response->code = cpu_to_le32(VIRTIO_SND_S_IO_ERR); @@ -147,12 +150,17 @@ int virtsnd_ctl_msg_send(struct virtio_snd *snd, struct virtio_snd_msg *msg, psgs[nouts + nins++] = in_sgs; scoped_guard(spinlock_irqsave, &queue->lock) { - rc = virtqueue_add_sgs(queue->vqueue, psgs, nouts, nins, msg, - GFP_ATOMIC); + if (snd->ctl_msgs_blocked) + rc = -ENODEV; + else + rc = virtqueue_add_sgs(queue->vqueue, psgs, nouts, nins, + msg, GFP_ATOMIC); if (!rc) { notify = virtqueue_kick_prepare(queue->vqueue); list_add_tail(&msg->list, &snd->ctl_msgs); + if (notify) + virtqueue_notify(queue->vqueue); } } @@ -169,9 +177,6 @@ int virtsnd_ctl_msg_send(struct virtio_snd *snd, struct virtio_snd_msg *msg, goto on_exit; } - if (notify) - virtqueue_notify(queue->vqueue); - if (nowait) goto on_exit; @@ -187,6 +192,11 @@ int virtsnd_ctl_msg_send(struct virtio_snd *snd, struct virtio_snd_msg *msg, goto on_exit; } + if (READ_ONCE(msg->cancelled)) { + rc = -ENODEV; + goto on_exit; + } + switch (le32_to_cpu(response->code)) { case VIRTIO_SND_S_OK: rc = 0; @@ -227,9 +237,33 @@ void virtsnd_ctl_msg_complete(struct virtio_snd_msg *msg) * virtsnd_ctl_msg_cancel_all() - Cancel all pending control messages. * @snd: VirtIO sound device. * - * Context: Any context. + * Context: Any context. Blocks new senders and marks pending requests canceled. + * Existing senders are woken when their request completes or after + * the device has been reset. */ void virtsnd_ctl_msg_cancel_all(struct virtio_snd *snd) +{ + struct virtio_snd_queue *queue = virtsnd_control_queue(snd); + struct virtio_snd_msg *msg; + + guard(spinlock_irqsave)(&queue->lock); + snd->ctl_msgs_blocked = true; + list_for_each_entry(msg, &snd->ctl_msgs, list) { + WRITE_ONCE(msg->cancelled, true); + } +} + +/** + * virtsnd_ctl_msg_cleanup() - Release messages left after queue teardown. + * @snd: VirtIO sound device. + * + * This must be called after device reset, buffer detachment, and del_vqs(), + * when no queue callback or DMA access can still reach a message. The queue + * object and its lock must remain alive until this function returns. + * + * Context: Any context. + */ +void virtsnd_ctl_msg_cleanup(struct virtio_snd *snd) { struct virtio_snd_queue *queue = virtsnd_control_queue(snd); @@ -243,6 +277,20 @@ void virtsnd_ctl_msg_cancel_all(struct virtio_snd *snd) } } +/** + * virtsnd_ctl_msg_enable() - Allow control requests after queue restoration. + * @snd: VirtIO sound device. + * + * Context: Any context. + */ +void virtsnd_ctl_msg_enable(struct virtio_snd *snd) +{ + struct virtio_snd_queue *queue = virtsnd_control_queue(snd); + + guard(spinlock_irqsave)(&queue->lock); + snd->ctl_msgs_blocked = false; +} + /** * virtsnd_ctl_query_info() - Query the item configuration from the device. * @snd: VirtIO sound device. diff --git a/sound/virtio/virtio_ctl_msg.h b/sound/virtio/virtio_ctl_msg.h index 7f4db044f28e..d917435409d0 100644 --- a/sound/virtio/virtio_ctl_msg.h +++ b/sound/virtio/virtio_ctl_msg.h @@ -68,6 +68,10 @@ static inline int virtsnd_ctl_msg_send_async(struct virtio_snd *snd, void virtsnd_ctl_msg_cancel_all(struct virtio_snd *snd); +void virtsnd_ctl_msg_cleanup(struct virtio_snd *snd); + +void virtsnd_ctl_msg_enable(struct virtio_snd *snd); + void virtsnd_ctl_msg_complete(struct virtio_snd_msg *msg); int virtsnd_ctl_query_info(struct virtio_snd *snd, int command, int start_id, diff --git a/sound/virtio/virtio_pcm.h b/sound/virtio/virtio_pcm.h index 8048b14e6c80..e31f090a0124 100644 --- a/sound/virtio/virtio_pcm.h +++ b/sound/virtio/virtio_pcm.h @@ -120,6 +120,8 @@ void virtsnd_pcm_msg_free(struct virtio_pcm_substream *vss); void virtsnd_pcm_msg_reset(struct virtio_pcm_substream *vss); +void virtsnd_pcm_msg_cancel(struct virtio_pcm_msg *msg); + int virtsnd_pcm_msg_send(struct virtio_pcm_substream *vss, unsigned long offset, unsigned long bytes); diff --git a/sound/virtio/virtio_pcm_msg.c b/sound/virtio/virtio_pcm_msg.c index 5371f4985fd0..762480363b86 100644 --- a/sound/virtio/virtio_pcm_msg.c +++ b/sound/virtio/virtio_pcm_msg.c @@ -307,6 +307,35 @@ unsigned int virtsnd_pcm_msg_pending_num(struct virtio_pcm_substream *vss) return vss->msg_count; } +/** + * virtsnd_pcm_msg_cancel() - Cancel a message detached during device reset. + * @msg: Message returned by virtqueue_detach_unused_buf(). + * + * Reset cancellation retires the queue token without treating it as a device + * completion. In particular, it does not advance the PCM hardware pointer or + * schedule period work. + * + * Context: Process context with the PCM queue lock held. + */ +void virtsnd_pcm_msg_cancel(struct virtio_pcm_msg *msg) +{ + struct virtio_pcm_substream *vss = msg->substream; + bool wake; + + { + guard(spinlock)(&vss->lock); + msg->length = 0; + vss->xfer_enabled = false; + if (WARN_ON_ONCE(!vss->msg_count)) + return; + vss->msg_count--; + wake = !vss->msg_count; + } + + if (wake) + wake_up_all(&vss->msg_empty); +} + /** * virtsnd_pcm_msg_complete() - Complete an I/O message. * @msg: I/O message. -- 2.54.0 (Apple Git-157)