From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.210.181 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793144638; b=eoX4G1SVuPntAdnByK8pICvlAIdqGUzqAufiU3R1eLlnSWdSoZfb5EEsDbFZkQ1XQhMj zGkSufOJzakKU899BTvZtpdjPdppLQNNRoZFPA24kCYjeN+tYATSwDbKkZT3M1u7FxfYA NSQifR3OzA3Z0YoGG5e2JrtzkvhNNsfdThwep4tp9+VwbyYt9AkwwR0K8CEeWu4MmqLoy YfAsOQt96ZMdQNta4GwIU+293chZMJ1qh979bJu6PTNAWfoDjYaE+M7VzaPD+s3I+OnAD vvQOWYKbzWg5gBkVCVHMmUisQBP8LHarRksT3Yy+WcCGbR+zNIhGGDZYbU8S6h/je6A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793144638; 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=c0YGdwcPoWmQmGBMoyib8CDhA5D0aOGSqoqoMILRPSFVhU7jd5vWEB1CjGLhJGxmSZLy NCuT6GkweHjelFTipU74mGMev4xhwF3l7Sn6i7frlkD2ZIs6oMnn53d2JRu38EwTJX9N4 GmkKCZAmUd2+pRYeWFnweJTsvWCkiZ43rw2rPcggDaU9OO7wO55R30I4iRQhXulXttl+9 TSxTE1KUXlBmnwRLOtBLtcbFmLgkBdW4MMtvmx951A9WOpYfVk99S3D5sZdC0AHDGxok/ C8RMsxzIt100D599y5wQThy+ZSGOANR2DfthuW9bY45nNploHKfWa/L47KVzvFK8VuA== 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=x5ktZ3Lw; arc=none smtp.remote-ip=209.85.210.181 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.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 95D39606A322 for ; Tue, 27 Oct 2026 23:43:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 95D39606A322 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=x5ktZ3Lw Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-89f85edd210so171509b3a.2 for ; Tue, 27 Oct 2026 16:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793144637; x=1793749437; 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=JhpmC/Uc/PbS3eydMZOwQvVnE3o7hoZ+spCQpzSOEEE=; b=x5ktZ3LwveJmE/Y7ETxOrdQ0ZABSed9vNebjNcTieoIY2Q0WS98C0zWE/iFcNg3qte eDepZIuRLabpgfnQBlHdzbtiJd5Bpg5mHQqmwqlUiJUghgOvRhzFgUUL9UcGK/HFBXi5 Wt2W/Wg1O+tzbRsY4s6lCBdCyYIEbX0rJgHXAcHn03v2ETUaQOljkK/e3M1t65z7D68v STvOlBp28JgF19NyOACZXe6XB6fy9W8fMgle9+VQBIm1j0pYBS/29LQqHVehvhltZZ77 csNhAgx9bx0PqaKV6ARfOx07NuUQd7/2k6dExaVRKeqQYoUTLdSAgLP1Z976qW8eEkOa 8hBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793144637; x=1793749437; 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=y03LwzUbIJq+tICrp/pP5LHUeNmUn74/Fs27uwQ9WJ+Z+2eMQpgLNVeDMl7SxKYNAX JDQqgS/tEiCR8wOf7e9k68b1fcYZpkdXs6oD1xeQc3lLIqu3pmKerMHM24Fzc7imrI97 YH8G8uQGHG96uV+yeYr1g0cmzWBsaWA7KpUmsDjtQ14erD6glvqqmaVKAhTrG9U5mGyK 1Lgj9RtW5J5t/oHKQK4hC8USlzVRIHWxa8bpQFucDUfsB0piUo9e+dIDy+azXEv/Ids5 MxUI7GS5vTNouw4hRXstQYA8PqNnFdKFsxpbYeUikbGRQnP7DptQUynH9yeqWXlMK7m8 4rxw== X-Forwarded-Encrypted: i=1; AKwUvBynL4smZ+KpZSuCNvbaooSYVW4I0zPuBEw3wHHms50lKlrNkR4Z6j/3u+5nf7uJVK3B/utROv3imIiQks4=@vger.kernel.org X-Gm-Message-State: AFq9FYJ5NjCoYsMiqhUffZgoXmFXl+1fyNrlnSv+l4F4zBrdLL1gDk6C 1Zbhnw/w9ahSuZtO0tUQ3AfdOCoGYWORClBdQBLQ7gtzNcFg3V/33M/w X-Gm-Gg: AYBFou3zR65ywU4vCIJWOHtoHyotvJCcsrVRJBB8APi0bNi/u1eZ+z1NoBx3VsjFa9t vSMgRWtBYDSjILQn1vreZCLW9OBeRo+ReUzSbltUCH+xsLJZRgnDZAYsSrceJ3Aw1Ig1ytWcesx w42+XtGxxjx7w94/8PpRMTzB6kErvqXg43kGtx6wW7/yiury/mDx7EOPG+OHU3yrRmdFqaDyDAw ArV39g9xb+iJdBYf1GzZvCHWPfzo8t+nsgOj3OY2kktbxwjsHqRZrZej6VpyHrfXPRxNrkwQ01q DlJ9IjWgV9i35qmaYqYTTNh4j1HZX7kb9z+ZR472Lvl9gC2KMqo4956nCpj9oIwtkoAfbn5DLyE d1WxYxpl3wIn9W+HbCv7x64JmtKgpL4WJOgpdFrbJF87qSsSlOEAwPJlpC/Hx/kTSei0PAwRO4a 9zGJ9U814YoXL2kLpTaZV2GQwqjuvll/IQDscouMD+1TOb0u4oaG05f3tTcOESLpqoT12jAySyv KnRL36QT6zTmEQeiJnl3Gk//yLrUu7TymUF508/A/yUwaHQb6YcOeFKXQmBzG9nZjA9iYEpGja6 tO0RwHUFgdV3PVPblZLojneFh4AhVhxbI8/K5gTY9fGpxFLfKYFqIqpBRJvHKTgcXWWQXvKcH/r X7jjYmWMUzqivCAbboWT2 X-Received: by 2002:a05:6a00:f9b:b0:8a0:8848:8c6c with SMTP id d2e1a72fcca58-8a6e6efa326mr537702b3a.12.1793144636918; Tue, 27 Oct 2026 16:43:56 -0700 (PDT) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8a6a662b9f5sm542507b3a.21.2026.10.27.16.43.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 27 Oct 2026 16:43:55 -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, Joonho Lee Subject: [PATCH v5 03/11] ALSA: virtio: Retain queued messages through device reset Date: Wed, 28 Oct 2026 08:43:26 +0900 Message-ID: <20261027234334.32551-4-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261027234334.32551-1-mynameisjune111@gmail.com> References: <20261027234334.32551-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 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)