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=1793412544; b=AWvpGktzEbQVG2iOcf8vvoy6RguKGweqWv5he1038ilRgRFHJKegbDhJ+K/BBgNynMFP d7jbc6skDQLTA86CiztOEnYedtR0yuUeJCAcrmg0x78FaM6phoWAnmsJ4nrrCqu/9vEcF lZcKcjp39Cr0IwFU9Qeb0Ll4nMyR7X84eZq6Rk2UmmCJHd85VDw7WbD0Uza9+CkyIDALb AhvLG57S3TyUxDpwjTRHo89ZUcEZCbCnDD1DISfcnjKQTGgtN9ihWY7j38SUg205nAU9B Zqyyd1cZZookSeEIuJsfSKijpoB21vCKv6toteTyogKF4k7c4ODqTcpGWLMvkNAalBA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793412544; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: 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=tOERZEIQ6bWpFjXc/IYsfYbCQo0wq413M2Hd4FsT6W0=; b=YWJAtsnNSM/7o5PSSUfJ4e4pzU9v8pj9G4I/Pl16iE/y0UmXrhEc5utWkHUkQK9y7IHo cRLIwpLCf3NJ5xJvKqjVfkoHS3w5ZYbqJWkpT++uth0sEcewlzplyPOapJmahWe6WgoEe NqZoRsLW9J8g4d14S0FKJjv4a3rFEdNV0bqlst0Zs/rOmORAiHVvpzXe5hLqaCQ12qYzs qAGwO2uvfgzXJg8+83tYclZfAVp9z1PKnEpsn4c6TiaBTLiS1mv/43gS/sVYtWm9gxAte tUrWMzdq4mnFQcQm4LdvELqeZdlUGqhEuztXTwhhETBOh0NhrrnRaMEBbSb6sV3O2sg== 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=Uc2ZJn81; 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 0D6D5606A325 for ; Sat, 31 Oct 2026 02:09:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 0D6D5606A325 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=Uc2ZJn81 Received: by mail-dy1-f181.google.com with SMTP id 5a478bee46e88-3550c917fd3so1777866eec.0 for ; Fri, 30 Oct 2026 19:09:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793412543; x=1794017343; 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=tOERZEIQ6bWpFjXc/IYsfYbCQo0wq413M2Hd4FsT6W0=; b=Uc2ZJn812SiqhnAC5EPY3/hZex2gjPxTL32N5cMnYTmqo0vnC6k72HM1rKvGMx2tBL MHPXCmwEREhL9w9kdWVWnhvPYkxFzkiJBOVvjWXtHDxkDVUWBrgwQVYd/H7BzNFptjk4 nFAwWvGueYase697O8Mp5UteUTPBqhNzb8F8oggKSJ8sCALKDJ1F7E7OKbG6UmABrX6t erL6G4zxx1HIeBl3GmR+22uEASLsW/R/tLt7yqoO7mSw3vkvmoUdY8kok4t6S/oyahnT /nuTx4Q7AlJvQ334NwLxglkxOEMWEkyDW24RASRIHrz6XE0rfAxRoagLaPAw3iNmGX7l mrfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793412543; x=1794017343; 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=tOERZEIQ6bWpFjXc/IYsfYbCQo0wq413M2Hd4FsT6W0=; b=pqyNITJGVd2lIWyZW8Yu5F33b3ScfWosw60jgTwHTEpW9EkvmYoDN0GBCxT4b80XkV U0mX9fdEe8tRQvmIX32G0DGjj9U8MEuGqdkFO2eRFmvnupj3Ut0c1k9MDsTe1+mhtZXQ Dx1yueiuBfD4yHMKFnUs09QKBfaapmji+K7OY2EVmibvYLcrKXJvc7u5vShorS+PAv+2 bavQR7hBpMxauFDA//1DW16TfVNLfj1KP9ZVZrSpiPQw60u4BlAkZDSr/12sB7D/xxne fZ8dsGDN6hy3j7laXCQ3uZ40fKFeQ3T/gcgf++cwzrsCaNcwP39gCNN4PnKzjjmw+qZA j6aA== X-Gm-Message-State: AFq9FYLjDjx04k/lUEcd/Lsd+LNC7YF0kldxuHQFQuhsELy3IOdFmvC2 3FLYqvtlVHrR7MbIMQGNECQ+yKlQWAQuHxn4Gsi43/u1rETm1Oh2lk0iXUN2gXXF X-Gm-Gg: AYBFou0o9l4SermQ8zjMmbR8oWIqao14ZVJQFf6ICnKyXkTUwDivq6dIdEtAlkVRNoQ huq4VlmfA8a7JtDx4BduFp01i9+o5Us3Jxr92yGXSlZ/nNHHUMe6y6l7dZleF56b8HIVg+108vn d5gDnYLHB+kP9HXxsDfiVLJcvSRMQhVJC5Hsvgjd7OSVlwHi6MJi1HOXHEG1xWPc9qwOs+Oq0dL aHYOusKNO/o847i4rj+0jm3j6bygMSxsC6gvvrh+8nhItGSM0+xAYpHmJwE8kuypWYFF/rKsRMD you3FPmp5DMB/noZIQPSGaHLjxwV+k8Hex0FSqdDAk2G2P/YuSSi0n7P0/XV3El/depttUkjp7X 2MIZMrvsItteOLzreHqQY4MJA3QI30HFMMLX9wctt/oaen7bdGeAOp2pYWnqhAV9q09dmvAM6mE sWEUwdE2ZYXaDW1p+M/VKXqkDj7+O1mVUEZ5VDErVaQO6eU5ZBs52mQhZ9iunhKICwrg29EuGmF mk+qz8IvnbXofdluUZw1MlJjJ9JNepwI1K109o+FG98WwkanonG5aWMpg4JACh4QXpE539sGm4g UWkLbxfjx6VOFtGxTxNmKHTz01eINdhLChTAd/KhqMRTdTTyf/z0vQYHJj6Qu2V2EAb3KxKT0MZ WoKppYbJucfN5Do9VWsq9jKi4iHIvLKWEJDZD72JC8GxHIt8= X-Received: by 2002:a05:7300:ce08:b0:343:ff9f:26f3 with SMTP id 5a478bee46e88-36a42401de6mr5091501eec.9.1793412543022; Fri, 30 Oct 2026 19:09:03 -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.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 30 Oct 2026 19:09:02 -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 01/14] ALSA: virtio: Propagate PCM send failures through ACK Date: Sat, 31 Oct 2026 11:08:42 +0900 Message-ID: <20261031020855.2402-2-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-sound@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 virtsnd_pcm_msg_send() can fail while queueing a transfer. Restore the failed message's length and notify the device about earlier messages queued by the same call, so they do not remain stranded. Propagate that failure through the indirect PCM transfer callback instead of discarding it. Commit the updated indirect state only after successful submission and stop further transfers when a send fails. Return an XRUN error to ALSA so the stream can recover. Keep the polling feature path unchanged. Fixes: fe981e67568c ("ALSA: virtio: use ack callback") Assisted-by: LLM Signed-off-by: Joonho Lee --- 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 @@ -260,6 +260,18 @@ dev_err(&vdev->dev, "SID %u: failed to send I/O message\n", vss->sid); + msg->length -= n; + + /* + * Do not leave earlier messages queued without notifying + * the device when a later message could not be added. + */ + if (msg_count != vss->msg_count && + !(vss->features & + (1U << VIRTIO_SND_PCM_F_MSG_POLLING)) && + virtqueue_kick_prepare(vqueue)) + virtqueue_notify(vqueue); + return rc; } 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 @@ -466,36 +466,100 @@ vss->hw_ptr); } +struct virtsnd_pcm_transfer { + struct snd_pcm_indirect indirect; + int error; +}; + static void virtsnd_pcm_trans_copy(struct snd_pcm_substream *substream, struct snd_pcm_indirect *rec, size_t bytes) { struct virtio_pcm_substream *vss = snd_pcm_substream_chip(substream); - - virtsnd_pcm_msg_send(vss, rec->sw_data, bytes); + struct virtsnd_pcm_transfer *transfer = + container_of(rec, struct virtsnd_pcm_transfer, indirect); + + if (transfer->error) + return; + + transfer->error = virtsnd_pcm_msg_send(vss, rec->sw_data, bytes); +} + +/* Caller holds vss->lock. */ +static void virtsnd_pcm_transfer_failed(struct virtio_pcm_substream *vss) +{ + vss->xfer_enabled = false; + vss->stopped = true; + vss->substream->runtime->stop_operating = true; } static int virtsnd_pcm_pb_ack(struct snd_pcm_substream *substream) { struct virtio_pcm_substream *vss = snd_pcm_substream_chip(substream); struct virtio_snd_queue *queue = virtsnd_pcm_queue(vss); - - guard(spinlock_irqsave)(&queue->lock); - guard(spinlock)(&vss->lock); - - return snd_pcm_indirect_playback_transfer(substream, &vss->pcm_indirect, - virtsnd_pcm_trans_copy); + struct virtsnd_pcm_transfer transfer = {}; + int rc; + + scoped_guard(spinlock_irqsave, &queue->lock) { + guard(spinlock)(&vss->lock); + transfer.indirect = vss->pcm_indirect; + if (vss->stopped) { + rc = -EPIPE; + } else { + rc = snd_pcm_indirect_playback_transfer(substream, + &transfer.indirect, + virtsnd_pcm_trans_copy); + } + if (!rc) + rc = transfer.error; + if (rc) + virtsnd_pcm_transfer_failed(vss); + else + vss->pcm_indirect = transfer.indirect; + } + if (rc) { + dev_err(&vss->snd->vdev->dev, + "SID %u: playback ACK transfer failed: %d\n", + vss->sid, rc); + /* ALSA treats -EPIPE as an XRUN in ACK and pointer paths. */ + return -EPIPE; + } + + return 0; } static int virtsnd_pcm_cp_ack(struct snd_pcm_substream *substream) { struct virtio_pcm_substream *vss = snd_pcm_substream_chip(substream); struct virtio_snd_queue *queue = virtsnd_pcm_queue(vss); - - guard(spinlock_irqsave)(&queue->lock); - guard(spinlock)(&vss->lock); - - return snd_pcm_indirect_capture_transfer(substream, &vss->pcm_indirect, - virtsnd_pcm_trans_copy); + struct virtsnd_pcm_transfer transfer = {}; + int rc; + + scoped_guard(spinlock_irqsave, &queue->lock) { + guard(spinlock)(&vss->lock); + transfer.indirect = vss->pcm_indirect; + if (vss->stopped) { + rc = -EPIPE; + } else { + rc = snd_pcm_indirect_capture_transfer(substream, + &transfer.indirect, + virtsnd_pcm_trans_copy); + } + if (!rc) + rc = transfer.error; + if (rc) + virtsnd_pcm_transfer_failed(vss); + else + vss->pcm_indirect = transfer.indirect; + } + if (rc) { + dev_err(&vss->snd->vdev->dev, + "SID %u: capture ACK transfer failed: %d\n", + vss->sid, rc); + /* ALSA treats -EPIPE as an XRUN in ACK and pointer paths. */ + return -EPIPE; + } + + return 0; } /* PCM substream operators map. */