From nobody Thu Jan 23 10:17:53 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 4Ydxhx39WGz5kjc3; Thu, 23 Jan 2025 10:17:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ydxhx2WJxz3xYD; Thu, 23 Jan 2025 10:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737627473; 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=7NqndeKLtt6Hmx1PtbH2fVic8AQaBr4aB1+yH6BMiPQ=; b=Jir9FDyg579kkX0GdMjS9gsy+ErgClBGBOS8gVzMxDbFMbdUhhgjIIeRHPJ/tk46CdBP3y aV/GnzMGXIJSJojuvgk+HlKtEN86OV8LTCiciKnhErC4+ruSvBI2muEV0wDkVutV6U8MCa sgJ10hWMBM5zTKgfnpCdwDf21mCD6IAJ48IOsRKnlEEnf0L4k1ND8EZJ2s9bbkNmn6tTJo qRliVAlrC/rJ3oB66BwOkSDpSkl33geaZChopQHbCYywLO/epyyTaoNB6LgANIvyVuoqm7 Tg0hL/59a6WAfZ67p7+WirI+X6FsRQEmgH53vzSYfq9i6xPM6wKeP4vHSJHuUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737627473; 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=7NqndeKLtt6Hmx1PtbH2fVic8AQaBr4aB1+yH6BMiPQ=; b=QlSbDeHgSXYejzriVzsnH+re0bh0sDko1jE/rMd3krqW9qGmeRkdXHkDssLmdcGfFNUqqd Tg36kNL9DMSUhufZHfvom/Y0/WVp51QylI/z36u16m4/zYimcTEIB2twm9Xfw3ShAxnPHE 4h3J7rskDzEONUOjw0wOj7aFBRo2O/1MHkGQXtLFghsHv0pg0GfITYmrFRW1GQaWyoQ2iZ FPgDgOPaCqXMwL9CXjiN03TplhE+H+Yh4at0B0LtUD1Ea6KO7Yn4zFFMqE5VSVOs35Ndjl +RrMPwK7QDerKxRSNnXEUnGVMdhDnYtEYXN89onEWdi1zykt2tQeNkyglgR6eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737627473; a=rsa-sha256; cv=none; b=cbIhEA8siW/BEfHWMv5lekRCPNJfjA476c30P4vIn5CcsGsvRIhqFRTxzPeYMg49AoXqm3 XyAl5ZEk/TkwAa5joE6MpngivuPyIr9gOuUqjuOroSDtEXPIzDFcLtrKh7MKeMhUYM5MY4 GlKbGbbmEcg5+2inmlixjW3/Dwx97X84pMPIdQOXPpTlxqMHW4fBmF67zYTVHzqfz23ozs i7bB1cAKSZtc+3OUFUulOD6QPwk4wvakIS/RqPOXqV488MD1e7e4hjl5QC9uZDk504vOzm WeH7N97upNwqcgCAt5iBXX1j8IQTPmPsvv40X+W/6Vw0n88d3Lp+e1fx6W1oXA== 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 4Ydxhx227Bzbgr; Thu, 23 Jan 2025 10:17:53 +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 50NAHrVM015188; Thu, 23 Jan 2025 10:17:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NAHro9015184; Thu, 23 Jan 2025 10:17:53 GMT (envelope-from git) Date: Thu, 23 Jan 2025 10:17:53 GMT Message-Id: <202501231017.50NAHro9015184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 09cbd68e4e47 - stable/13 - sysctl: Add flags to filter jail prison and vnet variables 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 09cbd68e4e4728dbac768937b35ad09995c20fea Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=09cbd68e4e4728dbac768937b35ad09995c20fea commit 09cbd68e4e4728dbac768937b35ad09995c20fea Author: Zhenlei Huang AuthorDate: 2024-10-29 11:26:11 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-23 09:47:10 +0000 sysctl: Add flags to filter jail prison and vnet variables So users do not have to contact the source code to tell whether a variable is a jail prison / vnet one or not. Reviewed by: cy (previous version), markj, jamie (for #jails) MFC after: 2 weeks Relnotes: yes Differential Revision: https://reviews.freebsd.org/D47107 (cherry picked from commit 5ec83c660acaf30c1d6b9417dbd8c80dfa9d56ac) --- sbin/sysctl/sysctl.8 | 9 +++++++-- sbin/sysctl/sysctl.c | 17 ++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8 index ee3f8579882f..ff0a8cea266d 100644 --- a/sbin/sysctl/sysctl.8 +++ b/sbin/sysctl/sysctl.8 @@ -27,7 +27,7 @@ .\" .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 .\" -.Dd August 18, 2023 +.Dd October 29, 2024 .Dt SYSCTL 8 .Os .Sh NAME @@ -107,6 +107,8 @@ The purpose is to make use of .Nm for collecting data from a variety of machines (not all of which are necessarily running exactly the same software) easier. +.It Fl J +Display only jail prision sysctl variables (CTLFLAG_PRISON). .It Fl N Show only variable names, not their values. This is particularly useful with shells that offer programmable @@ -144,6 +146,8 @@ to standard error. Display only variables that are settable via loader (CTLFLAG_TUN). .It Fl t Print the type of the variable. +.It Fl V +Display only VNET sysctl variables (CTLFLAG_VNET). .It Fl W Display only writable variables that are not statistical. Useful for determining the set of runtime tunable sysctls. @@ -316,7 +320,8 @@ option has been deprecated and is silently ignored. .Xr loader.conf 5 , .Xr sysctl.conf 5 , .Xr security 7 , -.Xr loader 8 +.Xr loader 8 , +.Xr jail 8 .Sh HISTORY A .Nm diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 6f5c886bbf05..0fe6c92dc386 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -64,6 +64,7 @@ static const char *conffile; static int aflag, bflag, Bflag, dflag, eflag, hflag, iflag; static int Nflag, nflag, oflag, qflag, tflag, Tflag, Wflag, xflag; +static bool Jflag, Vflag; static int oidfmt(int *, int, char *, u_int *); static int parsefile(const char *); @@ -136,7 +137,7 @@ main(int argc, char **argv) setbuf(stdout,0); setbuf(stderr,0); - while ((ch = getopt(argc, argv, "AabB:def:hiNnoqtTwWxX")) != -1) { + while ((ch = getopt(argc, argv, "AabB:def:hiJNnoqtTVwWxX")) != -1) { switch (ch) { case 'A': /* compatibility */ @@ -166,6 +167,9 @@ main(int argc, char **argv) case 'i': iflag = 1; break; + case 'J': + Jflag = true; + break; case 'N': Nflag = 1; break; @@ -184,6 +188,9 @@ main(int argc, char **argv) case 'T': Tflag = 1; break; + case 'V': + Vflag = true; + break; case 'w': /* compatibility */ /* ignored */ @@ -992,10 +999,18 @@ show_var(int *oid, int nlen, bool honor_skip) if (Wflag && ((kind & CTLFLAG_WR) == 0 || (kind & CTLFLAG_STATS) != 0)) return (1); + /* if Jflag then only list sysctls that are prison variables. */ + if (Jflag && (kind & CTLFLAG_PRISON) == 0) + return (1); + /* if Tflag then only list sysctls that are tuneables. */ if (Tflag && (kind & CTLFLAG_TUN) == 0) return (1); + /* if Vflag then only list sysctls that are vnet variables. */ + if (Vflag && (kind & CTLFLAG_VNET) == 0) + return (1); + if (Nflag) { printf("%s", name); return (0);