From nobody Mon Mar 17 18:36:54 2025 X-Original-To: dev-commits-src-all@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 4ZGkGH46rvz5qVHV; Mon, 17 Mar 2025 18:36:55 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGkGG75GKz43Bs; Mon, 17 Mar 2025 18:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236615; 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=MS5F4j72B+mAka65esJwP4FPsa3+NVkDcWm8PaxbfwQ=; b=Y4lkDnzYI5LSNxT2LjMU3UyXH8/w+8C9xcq/XGvv7AQJqbSU6Al9wJF0CYdNk78UIvNG58 Ljenx774hHT/PZMQmOERgiPHcwRCe5/2YZ1ZnFeUfy7PzORUNxce//ZDRUOfLX2jtDmhRw lulzdQjRrps6qCRH85tvl+vLh5C0MTdScyU5LKTsGqMphXJT9EJDcQLjhgE/liNqU9HYlF hEPiT7eWuaDtEpGNNrYuSUPBRbPnWtNRN2AHfVRVT1fOpzO/pWRghlnhF5AlQNJofD0tpC EwobFga8vXK1fTj4bSZu1aBFrG0e5dG2Ng/c+hFwwGhJ+afDeSmkE7o9pN2K4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742236615; a=rsa-sha256; cv=none; b=WcF2Nqh5YqbncSHzlUjxplBX7mjNI2x++AdLtXhC4duAJ2UULmEDj2aDV9uRPUjocEhHU6 JSQj3eOHZOkttY5DfmS1nqTtAVGGq3LCSba3A26mrQ7YG+a3+qoZ6qo8ZsA1q63LIBXOfm gwUkXsAr2RI66zl8F2pSatjSzwV3pTsgOCf/dxoHGrcOHibsj/0OboQ0gbpSwd/j0zaVYq mzSVxQieLBVFTicfYInryR1Mp7K8h2E6Vi7mDvzBS4S9G+olC+Coux3YUdjodLPskV/VSf RT2hJvpIVwX05mwMSUIHxliSGy83lUdVPnk9Xvj1Su8Usfm1YmSHeF2lr6vVzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236615; 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=MS5F4j72B+mAka65esJwP4FPsa3+NVkDcWm8PaxbfwQ=; b=rVuNVjmdOjTiuGu1usYf+Ju1feGYLXHhR6zqVu7f1XxjkWWFvH3uf3dHeDjuj39xDOzXq7 7d1/8dmVITIIkNzLFsjZc+CsXY/Mj0JblLtfb6zYdM1dJ9sw7gelPoLBiUeWQf9P/B5Pf/ WNoOC3Nsmzd6CcS79i45gnHj770FQp9doflcijyiSPQpAsR8FLkJI23GBA9iA/SEiGkSiC qXhegdD5t1KTHvHi2FsV8bgr+p2mvXQqnSuwEpcYJSepYYPXLcWQ26BHsN3Wmg6kkQWP5M bUaPO1Ff9sivt1fDnT8PGp/wSQormT099rJ8bXRxpIdrkHTpXsNZpBMm5AKTMA== 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 4ZGkGG5z6Vzxyp; Mon, 17 Mar 2025 18:36:54 +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 52HIaseA013296; Mon, 17 Mar 2025 18:36:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HIascK013293; Mon, 17 Mar 2025 18:36:54 GMT (envelope-from git) Date: Mon, 17 Mar 2025 18:36:54 GMT Message-Id: <202503171836.52HIascK013293@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: 65dec169468c - stable/14 - sound: Make dev.pcm.X.mode dynamic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 65dec169468cef17fcda8e7e72a460c1df2a630f Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=65dec169468cef17fcda8e7e72a460c1df2a630f commit 65dec169468cef17fcda8e7e72a460c1df2a630f Author: Christos Margiolis AuthorDate: 2025-03-10 20:47:39 +0000 Commit: Christos Margiolis CommitDate: 2025-03-17 18:29:17 +0000 sound: Make dev.pcm.X.mode dynamic Currently dev.pcm.X.mode is calculated only once in pcm_sysinit(), which is called by pcm_register() during attach, but this can result in inconsistencies. For some context, what pcm_mode_init() does is, it checks if "playcount" is positive, in which case we assume the device supports playback. The same is done for "reccount" for recording, and if "mixer_dev" is not NULL, we know the device has a mixer. The "playcount" and "reccount" variables correspond to the number of _primary_ playback/recording channels, so we can assume that the primary channels have been created before reaching pcm_mode_init(). However, for the mixer that's not always the case. If the mixer is created _after_ pcm_register(), as is the case for snd_dummy(4) for example, pcm_mode_init() will see that "mixer_dev" is NULL, and report that the device does not have a mixer, whereas in reality we just created it afterwards. While this could be fixed by simply creating the mixers always before pcm_register(), it is better to be robust and calculate the mode dynamically. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49024 (cherry picked from commit ab95710f30f7255d3a6be22a1a2c375ee0f96868) --- sys/dev/sound/pcm/sound.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index ac5d11b83ea3..bbb6c8dff0de 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -361,28 +361,32 @@ sysctl_dev_pcm_bitperfect(SYSCTL_HANDLER_ARGS) return (err); } -static u_int8_t -pcm_mode_init(struct snddev_info *d) +static int +sysctl_dev_pcm_mode(SYSCTL_HANDLER_ARGS) { - u_int8_t mode = 0; + struct snddev_info *d; + int mode = 0; + d = oidp->oid_arg1; + if (!PCM_REGISTERED(d)) + return (ENODEV); + + PCM_LOCK(d); if (d->playcount > 0) mode |= PCM_MODE_PLAY; if (d->reccount > 0) mode |= PCM_MODE_REC; if (d->mixer_dev != NULL) mode |= PCM_MODE_MIXER; + PCM_UNLOCK(d); - return (mode); + return (sysctl_handle_int(oidp, &mode, 0, req)); } static void pcm_sysinit(device_t dev) { struct snddev_info *d = device_get_softc(dev); - u_int8_t mode; - - mode = pcm_mode_init(d); sysctl_ctx_init(&d->play_sysctl_ctx); d->play_sysctl_tree = SYSCTL_ADD_NODE(&d->play_sysctl_ctx, @@ -403,9 +407,10 @@ pcm_sysinit(device_t dev) "bitperfect", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, d, sizeof(d), sysctl_dev_pcm_bitperfect, "I", "bit-perfect playback/recording (0=disable, 1=enable)"); - SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "mode", CTLFLAG_RD, NULL, mode, + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "mode", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, d, sizeof(d), + sysctl_dev_pcm_mode, "I", "mode (1=mixer, 2=play, 4=rec. The values are OR'ed if more than " "one mode is supported)"); vchan_initsys(dev);