From nobody Mon Nov 10 16:15:49 2025 X-Original-To: dev-commits-src-main@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 4d4vsf0xFSz6GwG8; Mon, 10 Nov 2025 16:15:50 +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 4d4vsf0Kqsz4Db6; Mon, 10 Nov 2025 16:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762791350; 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=OAUGb4GVpa0Pc7jW1kc63dWVBlrM4FgpaAAWhKyVFlY=; b=e8hM21DvMNwAJRO0fAycWEeY70uw1XQv/VvsC8gr7e4No1ZX6Z82+po0E0/4I6GFhAjy5l LsrpfmR8Dzu2/JK40AHC/Vg7UvhU40Mj/WGwVyOhf0orKM7ZJoynjT3VBJQKh2k+H1zqgn rbJXPl6BGL7kavcP2SdlAvUa3dNuVPeKMUA+v4Q98rv3+EbfSzZqkdjLrQR4KwHF6/STGo Z99gDtT3s+/E+DdlEEp9VSXw7B9dMCqzFdwnRoIY+0NjKp5xm0VlP/UAJtCg5jINcrbQF2 nOs8NZQhqpc0qQLygSOsS7j4N5e8/AaaeQoyiAo7r/IxpCiP8Sz+pUzk5ns7MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762791350; 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=OAUGb4GVpa0Pc7jW1kc63dWVBlrM4FgpaAAWhKyVFlY=; b=K29VEpwMCcam07tW0lzKZKXkf4LUXRpy4V1bGQUUz/pUEDn4gqieL1+p0bf/yeF9R3D4FR OlascjAn4+DUGyhVbiYAmglKeUis6FMd74TbGfrmVZHm5DHbMTBMdlmCtEDctsK77bA1N4 7ixKUEIZvrZ3NXNwOYje4rHS+1QKouaf5i+IRWXb2jrSCACzZCoZESk/yh9v7camDrZsls py3vSAcubO4FXdFpDKT0Zu6o9kOM8BXIq9vXpD+/RLflHMdRAgZvP8maVm5dmjO+x42Ghc 8aUkbEW1rTPfRnh8Luz1K/W3XGQVo1mVtgEKBBx8jxdHhthW8e5PNTc2FUWPZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762791350; a=rsa-sha256; cv=none; b=y4bYR9E+/jdMAzHOsKjSvrVirbvD4eE2KxNCOM9u6JtXm/PlNhypQ54iAyp0a3OpsssOj3 J2y614hZBek4rdnNRiWSzK6D1oApiRLaN5lI6ogsodMJCVDm+yNKuVJ2BuRxuEogi/z27Z UTc4FDMB+dMtsKzRMkDmIh5ePf48Jt7RPXGi/eGgRcn4Nlt+mIE6vcK+1mZ59QjrVXvY/7 qtCj064W9eHxEHb+snKXxWaBWX24zV6zY2x/x3uoV8RA5Qu1J7cFxbJb6SjC0SqMTwCRWo JOyEyDshnDcKA1SLebkr445LPfLjbuoZ8O83hjdsmrTjMNkmbqaZQFnA0hLPTQ== 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 4d4vsd5zBQz96N; Mon, 10 Nov 2025 16:15:49 +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 5AAGFn35094066; Mon, 10 Nov 2025 16:15:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAGFnnm094063; Mon, 10 Nov 2025 16:15:49 GMT (envelope-from git) Date: Mon, 10 Nov 2025 16:15:49 GMT Message-Id: <202511101615.5AAGFnnm094063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 59d7865d3c20 - main - sound: Clarify userland/vchan relationship in sndstat feeder chain List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 59d7865d3c20e86b3c42096f4a8c06a5e2eebd29 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=59d7865d3c20e86b3c42096f4a8c06a5e2eebd29 commit 59d7865d3c20e86b3c42096f4a8c06a5e2eebd29 Author: Christos Margiolis AuthorDate: 2025-11-10 16:15:36 +0000 Commit: Christos Margiolis CommitDate: 2025-11-10 16:15:36 +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 --- 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);