From nobody Tue Oct 29 11:27:46 2024 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 4Xd7KG42Nsz5bL9p; Tue, 29 Oct 2024 11:27:46 +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 4Xd7KG3V61z3xxG; Tue, 29 Oct 2024 11:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730201266; 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=h7gVYldDZHqIL3bLSrhKfoNocnvdAGhyw/inuHA303g=; b=f+T8tFqoZiq76bR+lOZLWr38salDS1dzeSBVn02epHw+iU30JAwWg7vrkmqhcIjcSK1hY7 6/uZq1AjW/7HNuoIRiDaID7+VXOHgdZgWTuhN6HwN/+xneFbXO56nUt+2BrlPi9btr8R2n WlrgYonv/CSBEKSAoAp8Rsp/rcmynbMkzVCNdlG5SHvCQ3uIjm8aO+C7JoNzi6+dHb+4pt 5P3SJsZS9OxvEq2JkvglLh1STEooAuXYoL9S51Gn+vAyoz28bXzxN83cVaDi/vLZMqcDfM 3mPfVaRG/GH20aS7obe3NzpnoE/KOcc0zclbbcStS+/sDWIRRwdITbODIt43Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730201266; 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=h7gVYldDZHqIL3bLSrhKfoNocnvdAGhyw/inuHA303g=; b=FUsJ0l2yL+LB7iD8a5C3uPMn/tMzMYV4TTIBUfUgSgHPeGvR4XkvX4pYCTFQfWcuSQNrBP yWTirjHbQXlV1/yC13FH8HGrbqBPYiEeFx7Zu8vw1bVFQW9JPIcZTHwuf5DykuL8OE+4vg NV+6Gza/fcjmPqo3MWVe2NVic2T9Y5xRDtLLC4V6T9a3UtOv4BBEjyOZui++euy4Ampx6z qbgYLFHoHr6i6qVqVSIPggln011TUZhP6hUPoLHNW//+ATopJLHlPhVI+2dBqx4hvQ2hEc +VbWS6Imnti41r1Ha3wBqEG/7Rm7k638+gruDIfpMY/s6JofVlm0LF1/QgdwQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730201266; a=rsa-sha256; cv=none; b=sHp1ZKLXkVQxftNtKeirQgXUq2R3tJ1MxZ5GtxZ0eyT+c8hkvXIk7BjqtGf4Lp9Lw6Q0xU pUiHP5ft2v7O7+TrIk9G+5QW5SmHUBhSungGKj7lC/oetcnOiBuBElizV/0k0xdeq3rRMJ CaZYAiqxZpf2g6/Ru9M3dpFqRPnNWIQE2EOU8rMmdiLNUhZdp0/Fy5xTlsnSgp0u80og2R OSUo30mfmHA7rBgQOGZmlCpTmTjYzo5q2LWCJceDfTx8F3l4mveiJ1A6DdUSaam1KZe5X9 WxqxQbvLax/UzqiRql0/3cHpPRrEG8ed8xkC+3pXROs7NPmmu6gpySwWTSkaVg== 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 4Xd7KG33RWzM5h; Tue, 29 Oct 2024 11:27:46 +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 49TBRkt4095014; Tue, 29 Oct 2024 11:27:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49TBRkag095011; Tue, 29 Oct 2024 11:27:46 GMT (envelope-from git) Date: Tue, 29 Oct 2024 11:27:46 GMT Message-Id: <202410291127.49TBRkag095011@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 5ec83c660aca - main - 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/main X-Git-Reftype: branch X-Git-Commit: 5ec83c660acaf30c1d6b9417dbd8c80dfa9d56ac Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5ec83c660acaf30c1d6b9417dbd8c80dfa9d56ac commit 5ec83c660acaf30c1d6b9417dbd8c80dfa9d56ac Author: Zhenlei Huang AuthorDate: 2024-10-29 11:26:11 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-29 11:26:11 +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 --- sbin/sysctl/sysctl.8 | 9 +++++++-- sbin/sysctl/sysctl.c | 18 ++++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8 index d350b62e67a3..792ebf6c4e9d 100644 --- a/sbin/sysctl/sysctl.8 +++ b/sbin/sysctl/sysctl.8 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 18, 2023 +.Dd October 29, 2024 .Dt SYSCTL 8 .Os .Sh NAME @@ -111,6 +111,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 l Show the length of variables along with their values. This option cannot be combined with the @@ -153,6 +155,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. @@ -325,7 +329,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 9e81f4480e40..1a9cb0a13254 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -63,7 +63,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 Fflag, lflag; +static bool Fflag, Jflag, lflag, Vflag; static int oidfmt(int *, int, char *, u_int *); static int parsefile(const char *); @@ -136,7 +136,7 @@ main(int argc, char **argv) setbuf(stdout,0); setbuf(stderr,0); - while ((ch = getopt(argc, argv, "AabB:def:FhilNnoqtTwWxX")) != -1) { + while ((ch = getopt(argc, argv, "AabB:def:FhiJlNnoqtTVwWxX")) != -1) { switch (ch) { case 'A': /* compatibility */ @@ -169,6 +169,9 @@ main(int argc, char **argv) case 'i': iflag = 1; break; + case 'J': + Jflag = true; + break; case 'l': lflag = true; break; @@ -190,6 +193,9 @@ main(int argc, char **argv) case 'T': Tflag = 1; break; + case 'V': + Vflag = true; + break; case 'w': /* compatibility */ /* ignored */ @@ -1048,10 +1054,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);