From nobody Tue Nov 18 00:51:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzl595Gz6HH3j; Tue, 18 Nov 2025 00:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzl212hz3xTq; Tue, 18 Nov 2025 00:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQrNPOdtUCD9rNvoQZ+hYN6QOzzu+/svRVju19uUb20=; b=fSagQtg28rGruIxhfdsndZDRuT6XjEayhzyrH5TwsGg6Yq9uIinXafzajydzRsbGJ8T3BK lzB9ulfcpy07KDuREOIY5+nl3f+7b+iMnKnHaojhHpfwnKzWva5tleFjiv+R1tuigLGL76 KK5iO6v5Mv2w8S0oTrr6V4XlXY1fZ/Uio5hi1/pLjW1m1lCndbdv1HU0RvRl/okrwE97fH LzFWQwAwQ3DU47uFzb5Ie6wM8ZmNmlzqtQeBJNlnPOxp8HKx6MBquz8znxASp6AaSXGAdg vjGbfxBY06AH2trSPNOegrJW1dzEpqwMZk7xozXgwsjhRRM75UN3LE7W9YemSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQrNPOdtUCD9rNvoQZ+hYN6QOzzu+/svRVju19uUb20=; b=ZUxZyofcofD2wMVhJ9IiuJMB8MwQc1oVRHgnCHirfKpMNwV2NhPHmUvx4Xx9T1t5l0ueV5 jsmV0zGnjes5Z48fBoPLaBTkbvWJ4723Qa7fyxhXAxG+c/sjjpAaGEnbXYHc98wHmbEP9y WbQ/pfUJNIcL0Vi/dCLuvQwRihjhwCRtquorLHarSpmUFLZyXIP7fx4xdRHfckl9r0PcX7 lvpuJq/kuUrBk1XyHO/+oKRUyVfQK+NC1IGs5wD8RkLQv10DaCNkR2t/C4v38L1naURZzZ Sy9OpU52demm6biWoZ5CZb/qM5mVwl8MotGCBQYM6t8TLhQq79zCS3mcQoeJNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427107; a=rsa-sha256; cv=none; b=Op9atA0S1CxRYphYSLsF5ffpDNLKEGpwUhpWNVas0HRWjs0rPwQf3tBCi/Gl64i85VB44O wWXhdYSKRU9EWclXBQvuQxFVnjMmara1qstfswgpDQo3Shumappia8a/Znfuufr9P9qqbW FZhud07ZS1nHPB/wOL99qnX8F2Jrqz5L0ecOEhp4xfyx25c24PE/r0L26NQJTqKn2Y07lC 1Bz7uD4MtmnMHLxbE4H7IVdxJOWpF1bpt0Y1q/xUoWppsmyW8m4Poi8hc3ptMoAcV9bOPX sqCjv9EEnJDF2OcnUTxoMOtw3ZiFrYwBfERiJusdyzVDDCJwHkddb460ggFkZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzl0qzTzXZy; Tue, 18 Nov 2025 00:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0plVa044746; Tue, 18 Nov 2025 00:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pl2X044743; Tue, 18 Nov 2025 00:51:47 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:47 GMT Message-Id: <202511180051.5AI0pl2X044743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: c58e41d899a7 - stable/15 - sound: Clarify userland/vchan relationship in sndstat feeder chain List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c58e41d899a785abf1f075dfef3ed9c045d5ca23 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c58e41d899a785abf1f075dfef3ed9c045d5ca23 commit c58e41d899a785abf1f075dfef3ed9c045d5ca23 Author: Christos Margiolis AuthorDate: 2025-11-10 16:15:36 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:21 +0000 sound: Clarify userland/vchan relationship in sndstat feeder chain When vchans are enabled, the primary channels do not interact with userland, but with the vchans. With vchans enabled: $ sndctl feederchain dsp0.play.0.feederchain=[vchans -> [...] -> hardware] dsp0.record.0.feederchain=[hardware -> [...] -> vchans] With vchans disabled: $ sndctl feederchain dsp0.play.0.feederchain=[userland -> [...] -> hardware] dsp0.record.0.feederchain=[hardware -> [...] -> userland] Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53504 (cherry picked from commit 59d7865d3c20e86b3c42096f4a8c06a5e2eebd29) --- sys/dev/sound/pcm/sndstat.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index 51d0fb3bb686..1a5bccd718b5 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -524,7 +524,8 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) c->parentchannel->name : "userland"); } else { sbuf_printf(&sb, "[%s", (c->direction == PCMDIR_REC) ? - "hardware" : "userland"); + "hardware" : + ((d->flags & SD_F_PVCHANS) ? "vchans" : "userland")); } sbuf_printf(&sb, " -> "); f = c->feeder; @@ -561,7 +562,8 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) "userland" : c->parentchannel->name); } else { sbuf_printf(&sb, "%s]", (c->direction == PCMDIR_REC) ? - "userland" : "hardware"); + ((d->flags & SD_F_RVCHANS) ? "vchans" : "userland") : + "hardware"); } CHN_UNLOCK(c); @@ -1320,7 +1322,8 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) c->parentchannel->name : "userland"); } else { sbuf_printf(s, "\t{%s}", (c->direction == PCMDIR_REC) ? - "hardware" : "userland"); + "hardware" : + ((d->flags & SD_F_PVCHANS) ? "vchans" : "userland")); } sbuf_printf(s, " -> "); f = c->feeder; @@ -1358,7 +1361,8 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) "userland" : c->parentchannel->name); } else { sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC) ? - "userland" : "hardware"); + ((d->flags & SD_F_RVCHANS) ? "vchans" : "userland") : + "hardware"); } CHN_UNLOCK(c);