From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.181 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793412551; b=V4badUbIWwcMs3DqhwEfrsHunliD77CkcVj1YCYAAJGzxjYmtWH0L9PnqVV9n1Z6PjkF G8vsUzuMKph5irw3EAcgCAxhtBg/xhhjroY0IsGqoNY9pYYRkYJdEwUmFG7eMXa6tIbhT 0mj+PKImraB0u3n4jewmSiXUlbWwwtQpkeKWbiyofbywmqAdN8TtwqakVH+MGTKUVP6x5 4gbv77CtWMKnQndfbhE4MiRGBXHXujKJTp8Y6UbjxverFYZbYNpmbk13b6ThmxMazHrbx G5gF6dpkWLgaQVrgkZ5L8f+fVA8OYWyn9/e9bpkbr5cxEVLX8YHK5Ut94Z0vubizoPw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793412551; 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=jX5Hr9a1YgN6sFSMNQNakejxbLQYKa9FFruwyL5x1dg=; b=Zy3NeY6B3pAcbEZ/2TiMKbdqF1N/CVejGnRh0hlIH7O8Gt0gvSAyKxcoKB+RQxhzpO5V b0SK/OlZnd7Y9AqZZnV35oNgVFLVF3TM9WTb+1ipESwRmdY7g8F2r//Ho+hxMZvC5GF0N 9MaM8bUZLur2FMcjZVlyboDSFUI4PfQBSXo48ffYEKgdW1g1Rr9OOV5WcQz4tNF6uDUr9 2PcPVIA2c1S5GzbS98SIjaJk0SB0cft2+AdZ4BZu9sJzx74e9rP4Uk+3ikknd7jbQiE+E 90yjVIAkVwVLK3hp6Lr53TzzaA9zLl0m3AvffPJlmR1VBpE0iTM1fC1JRIXqIRclv1A== 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=aYGZEPW0; arc=none smtp.remote-ip=74.125.82.181 Received: from mail-dy1-f181.google.com (mail-dy1-f181.google.com [74.125.82.181]) (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 6926F606A325 for ; Sat, 31 Oct 2026 02:09:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 6926F606A325 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=aYGZEPW0 Received: by mail-dy1-f181.google.com with SMTP id 5a478bee46e88-36a1947498bso773004eec.1 for ; Fri, 30 Oct 2026 19:09:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793412550; x=1794017350; 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=jX5Hr9a1YgN6sFSMNQNakejxbLQYKa9FFruwyL5x1dg=; b=aYGZEPW0GfFI72uaI4xC/p8YWd11U5MAxO9IO1avtCUuwz9GbO+utlQkSVNL1mkbOn fPl8aPIp6qoprrIpSN0i9Haj5Ag6XwAjmNDpDd4UZDjKdvjGQZ3gZkCs1v8R0WL/uU20 URtdag8DqE6M+dFanGzPpWfro52kl4TNB1ADoK2H0skLiNiRha9iH51wyavgmYYLesXv RjiakwbHwsvn+sS+g6ynM6vEg3yoAkM9LtMwFF0fa8R3dN+6bUfrzJcvNIUXXGyN02wK 8xB9NRKgxHILbCD8orbOyILkYx2/eu3hyyTKS9GKGO/l6GZ9sffc/gU6FuoWtD8IoKrz rINw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793412550; x=1794017350; 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=jX5Hr9a1YgN6sFSMNQNakejxbLQYKa9FFruwyL5x1dg=; b=JRtbcymITKmOkqCLrQtws7AUoqA+VSqE9Gb6tM0m8+jIGWyFE9sjxx/+nSKJLyXvbi Kb8+cjvYyeKVQvUdSG3/mothO5Z+xGSQvGqc2lgw4z9G/4/jO87fejEgzm+U5YW2CzfD JhLzo1Sv1A2pzBV9Z8l7OCzcMlm6qMJ8MXUdymQIUyxN5oCQISWXIjPjm6NVVdE/Vxem oUDtekKB1VEInv9I26a9HV0XIeO1CZPLE05ur+bNUtJTvNodReEtUSJWj4tboxKZhTAP J1pb6OaoHZyaQ92LyvEvRiP4O3zp9BhH83YxBIFdxse/iRgDHHajDYZW426eYFc3G7QH 8C4Q== X-Forwarded-Encrypted: i=1; AKwUvBwmU1RbXby5feIEBJrfW5yVMTTkQUEq0rcDuaVsVYxu9EKDbl9nIRk+THWffAWEM3/KYjZK+z19mu8=@vger.kernel.org X-Gm-Message-State: AFq9FYIj3gAo5gSg4tsDm91lSxtHPq2+nKZ8AZQdg60MG0egSzTF6oUU Sk4NMoehx8W8ao6kJUBf0yq16VWt5h+PM+eaXYLBtOh3T8N1GXLiRP0T X-Gm-Gg: AYBFou3+ohTId6dBuMet1HrCIBZQ8t1+eCi8s1zxyZU9Cv4HqNItW+I6xjIdZASy7On GTP3li9nGk3wbiTwuJ5PJDOPlTtS1cD/Ls5DHzGz6Z/0xNd7XYwcsd67As1l21fIBjOCX8wTcac rAA8ze8/xsQQrFhFvt8Az2U32aPxuRAbC0uFA5IYKAUpIrx7QKm6ezQayVFSJv5e8Oziquh497Z uqjit74qL2SX+c5pk/pguB6xZcCLmH1ZXoBzoBCX5SZVPwVbAMLA6KCNTzdxbGIIgIkV9P6B95E VmGGBjG787PukTU0ymONx3HxlEGXN0QyY3IiDu2YDEicU4AoCWtzGYUd4FlqkE9kNWswIBGVUXo sE87Yc0iG253Dt3NXTydOt0VZcD6YqSB8qaruCp3BUlXDOMC3vDki9+sGea6G9NpM5P6RRhMQN3 xocPlbivpM/fROsvLfcaHEju5VoCIYse8VwBMR8YR5eXQYZuzGsdjf6/nzRtojOx5PKs0Y7HB5+ 59MZ4uttsIXIi89Ui8F+hesqbj8WXz40mvm0NYS77yummQNXNp+C3fNhEKbS9XAfArxKh/U5rBz HzWU1oJWd6OwPqUngcS/ZVSiBeD6Jtgij+p2GJg/92WNkRjOmXzQ4WFtXcmBv4mcLqzUlHQ9rEZ dpbtdUzQoN94+a68VbjvGNevI6ib9D8knDaWPS9P0h51HFg== X-Received: by 2002:a05:693c:8806:10b0:369:f97f:72c1 with SMTP id 5a478bee46e88-36a4241bbd5mr6261048eec.36.1793412549349; Fri, 30 Oct 2026 19:09:09 -0700 (PDT) Received: from localhost.localdomain ([180.182.24.11]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-36a42a77c0dsm13214096eec.26.2026.10.30.19.09.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 30 Oct 2026 19:09:08 -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 v11 03/14] ALSA: virtio: Retain queued messages through device reset Date: Sat, 31 Oct 2026 11:08:44 +0900 Message-ID: <20261031020855.2402-4-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261031020855.2402-1-mynameisjune111@gmail.com> References: <20261031020855.2402-1-mynameisjune111@gmail.com> X-Mailing-List: linux-doc@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 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. Clear each queue wrapper inside the same critical section that detaches its buffers. Check the callback's queue identity under the wrapper lock for PCM, control and event queues. This makes queue retirement explicit through teardown and restore. A forced callback test passed on both versions; the proposed detached-ring IRQ failure was not reproduced on the tested PCI transport. Fixes: 9d45e514da88 ("ALSA: virtio: handling control messages") Assisted-by: LLM Signed-off-by: Joonho Lee --- diff --git a/sound/virtio/virtio_card.c b/sound/virtio/virtio_card.c --- a/sound/virtio/virtio_card.c +++ b/sound/virtio/virtio_card.c @@ -87,6 +87,8 @@ u32 length; guard(spinlock_irqsave)(&queue->lock); + if (queue->vqueue != vqueue) + return; do { virtqueue_disable_cb(vqueue); while ((event = virtqueue_get_buf(vqueue, &length))) { @@ -338,6 +340,38 @@ } /** + * 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); + /* IRQ callbacks must never see a detached ring as live. */ + queue->vqueue = NULL; + spin_unlock_irqrestore(&queue->lock, flags); + } + + vdev->config->del_vqs(vdev); +} + +/** * virtsnd_remove() - Remove VirtIO and ALSA devices. * @vdev: VirtIO parent device. * @@ -349,13 +383,14 @@ 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 +418,8 @@ 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 +447,7 @@ 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 --- a/sound/virtio/virtio_card.h +++ b/sound/virtio/virtio_card.h @@ -47,6 +47,7 @@ * @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_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 --- 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 list_head list; struct completion notify; refcount_t ref_count; + bool cancelled; }; /** @@ -100,7 +102,7 @@ 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 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 @@ 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); } } @@ -168,9 +176,6 @@ goto on_exit; } - - if (notify) - virtqueue_notify(queue->vqueue); if (nowait) goto on_exit; @@ -184,6 +189,11 @@ rc = -ETIMEDOUT; } + goto on_exit; + } + + if (READ_ONCE(msg->cancelled)) { + rc = -ENODEV; goto on_exit; } @@ -227,9 +237,33 @@ * 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); @@ -244,6 +278,20 @@ } /** + * 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. * @command: Control request code (VIRTIO_SND_R_XXX_INFO). @@ -295,6 +343,8 @@ u32 length; guard(spinlock_irqsave)(&queue->lock); + if (queue->vqueue != vqueue) + return; do { virtqueue_disable_cb(vqueue); while ((msg = virtqueue_get_buf(vqueue, &length))) diff --git a/sound/virtio/virtio_ctl_msg.h b/sound/virtio/virtio_ctl_msg.h --- a/sound/virtio/virtio_ctl_msg.h +++ b/sound/virtio/virtio_ctl_msg.h @@ -68,6 +68,10 @@ 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 --- a/sound/virtio/virtio_pcm.h +++ b/sound/virtio/virtio_pcm.h @@ -122,6 +122,8 @@ 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 --- a/sound/virtio/virtio_pcm_msg.c +++ b/sound/virtio/virtio_pcm_msg.c @@ -305,6 +305,35 @@ { guard(spinlock_irqsave)(&vss->lock); 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); } /** @@ -367,16 +396,21 @@ /** * virtsnd_pcm_notify_cb() - Process all completed I/O messages. - * @queue: Underlying tx/rx virtqueue. + * @queue: Underlying tx/rx queue wrapper. + * @vqueue: Queue that raised this callback. * * Context: Interrupt context. Takes and releases the tx/rx queue spinlock. */ -static inline void virtsnd_pcm_notify_cb(struct virtio_snd_queue *queue) +static inline void +virtsnd_pcm_notify_cb(struct virtio_snd_queue *queue, struct virtqueue *vqueue) { struct virtio_pcm_msg *msg; u32 written_bytes; guard(spinlock_irqsave)(&queue->lock); + /* Reset can detach the queue before the transport drains its IRQs. */ + if (queue->vqueue != vqueue) + return; do { virtqueue_disable_cb(queue->vqueue); while ((msg = virtqueue_get_buf(queue->vqueue, &written_bytes))) @@ -394,7 +428,7 @@ { struct virtio_snd *snd = vqueue->vdev->priv; - virtsnd_pcm_notify_cb(virtsnd_tx_queue(snd)); + virtsnd_pcm_notify_cb(virtsnd_tx_queue(snd), vqueue); } /** @@ -407,7 +441,7 @@ { struct virtio_snd *snd = vqueue->vdev->priv; - virtsnd_pcm_notify_cb(virtsnd_rx_queue(snd)); + virtsnd_pcm_notify_cb(virtsnd_rx_queue(snd), vqueue); } /**