From nobody Tue Nov 18 00:52:18 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 4d9R0M0cc9z6HH9P; Tue, 18 Nov 2025 00:52:19 +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 4d9R0L4sDSz40SQ; Tue, 18 Nov 2025 00:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427138; 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=iwx0YcsvRRSY7T7cIKxmcHxuDLnwvmwElKRxofon/uQ=; b=gy22hpjqSQoNRQ3pQRLrBVFZBPy5ekUtNn3YPgiWdO6kjeu6UG2+SAAEo9r0SxGK2plCvw Zr/1SMPVrhWaFwqAwqxuscxGRDIQVSpyHJG4EDsSbJ3c7a7xwltY2fjiOxTSLHt0m+5NM7 BKXms2FqiQWUPuGuRb8ds0ISKYUHVbsKQYj1kAnTwKEAMIetSKvn/KVH5XlUHCt9yEWRlV HVCHRjzpH9xZ04gzVb2AFi6htNGCOi6v2R440a3WW+yTzc2cBOjWHz0x0XKHai2J9a4nhQ 6zviwuLZStCmdDXdVuu0EvRLGStSjNjMdJ0p9LYwyV4AwzlfZpyombv213qiNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427138; 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=iwx0YcsvRRSY7T7cIKxmcHxuDLnwvmwElKRxofon/uQ=; b=PsKiJQ1b8iJ4PLoIf2DfiQHk3c20sruEkK1UX3PbD7A5S80uUewuvdGMdyciX0/dsWeHwq /CY5r8DyKhB4/1loVvLUoM0+gR5tYi6WG0WM4qY4WSxb4gqji0m67iVtV72QaX/0Dtm8Gv AnSnr3Wus26Ey0jb2viml2sVf3HzwsOs4AI4pWqgaz6rZ1eQfh7KPWXLxUAs6g9ugaa+t3 PTocq4z71Yco8MMuzPgok9F6PKu16XlIkhYI4qgsfm4i2OGszd4zKEwYwAUT0cgcF6hCxw Xt7K7Mb4P72AuzO7USp38ET6C6Pv5Pso7kfXXeS3HDx/Z/QfXRwUrfK98+KQvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427138; a=rsa-sha256; cv=none; b=Cyw8PVHwl0Ryt6/n2Ql7RpZ2AnYVeHukGwPB7hdLQoaG9dhzHFtKEHbYRuuc81qQ1plxBI d2up+mSJn1aX8hHi6MLlXmSQmjIL4NDKf4Yg9Dpb93eynQ+vykB5va/r82IMWbC2NLLJHs +VKj5kATVt2wGNWMnx6ppULh3o4mduWFyRFY9IYDBA0RvMFAlWX0EjXrPtaCqHceD3MK/3 T8/r2abOy2FyXs/H9C+ZGYADuCQInpaqNebxFQZZovxeoXaR+PWDvKTFM1DjEC4fZC1NmC b8Vyqr/M8HgtDJ9PemteVZgYFfSgoRdAwwjKnbk8h5PZ3VTBD8Xe4J5HgRa4TA== 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 4d9R0L4Pm6zXhQ; Tue, 18 Nov 2025 00:52:18 +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 5AI0qIjS047045; Tue, 18 Nov 2025 00:52:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qI7V047042; Tue, 18 Nov 2025 00:52:18 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:18 GMT Message-Id: <202511180052.5AI0qI7V047042@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: ea9d875a6477 - stable/15 - virtual_oss(8): Improve hw.snd.basename_clone handling 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: ea9d875a6477b5394b6687e6308783c4564fac22 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ea9d875a6477b5394b6687e6308783c4564fac22 commit ea9d875a6477b5394b6687e6308783c4564fac22 Author: Christos Margiolis AuthorDate: 2025-11-11 12:07:44 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 virtual_oss(8): Improve hw.snd.basename_clone handling If we request a /dev/dsp virtual_oss(8) device, we have to replace the sound(4) one by first disabling hw.snd.basename_clone. This sysctl tells sound(4) to not create the /dev/dsp alias for the default device. There are currently two issues with the way this is handled by virtual_oss(8), however: 1. It uses system(3) instead of sysctlbyname(3). 2. It does not restore hw.snd.basename_clone to its original value, so if prior to virtual_oss(8) running, hw.snd.basename_clone was enabled (which is the case by default), and it is closed at some point, hw.snd.basename_clone stays disabled, which is annoying, because users have to manually restore it, otherwise applications that open the default device (i.e., most) will not work. Fix both issues. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53621 (cherry picked from commit e5c0d7020f3d040b28dc7ca0cda9926e07e5aaf4) --- usr.sbin/virtual_oss/virtual_oss/main.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/main.c b/usr.sbin/virtual_oss/virtual_oss/main.c index f2fd085664ed..28095880c201 100644 --- a/usr.sbin/virtual_oss/virtual_oss/main.c +++ b/usr.sbin/virtual_oss/virtual_oss/main.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -52,6 +53,8 @@ #include "int.h" #include "virtual_oss.h" +#define SYSCTL_BASECLONE "hw.snd.basename_clone" + pthread_mutex_t atomic_mtx; pthread_cond_t atomic_cv; @@ -1617,6 +1620,7 @@ volatile sig_atomic_t voss_exit = 0; static int voss_dsp_perm = 0666; static int voss_do_background; +static int voss_baseclone = 0; static const char *voss_pid_path; uint32_t voss_dsp_rx_refresh; @@ -1739,6 +1743,20 @@ usage(void) exit(EX_USAGE); } +/* + * Restore hw.snd.basename_clone if it was disabled by us. + */ +static void +restore_baseclone(void) +{ + if (voss_baseclone) { + if (sysctlbyname(SYSCTL_BASECLONE, NULL, NULL, &voss_baseclone, + sizeof(int)) < 0) + warn("Could not enable " SYSCTL_BASECLONE); + printf(SYSCTL_BASECLONE ": 0 -> %d\n", voss_baseclone); + } +} + static void init_compressor(struct virtual_profile *pvp) { @@ -1883,8 +1901,18 @@ dup_profile(vprofile_t *pvp, int *pamp, int pol, int rx_mute, * Detect /dev/dsp creation and try to disable system * basename cloning automatically: */ - if (strcmp(ptr->oss_name, "dsp") == 0) - system("sysctl hw.snd.basename_clone=0"); + if (strcmp(ptr->oss_name, "dsp") == 0) { + size_t size; + + x = 0; + size = sizeof(int); + if (sysctlbyname(SYSCTL_BASECLONE, &voss_baseclone, + &size, &x, size) < 0) + return ("Could not disable " SYSCTL_BASECLONE); + printf(SYSCTL_BASECLONE ": %d -> 0\n", voss_baseclone); + if (atexit(restore_baseclone) < 0) + return ("Could not set atexit callback"); + } /* create DSP character device */ pdev = cuse_dev_create(&vclient_oss_methods, ptr, NULL,