From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: "Kyle Evans" <kevans@freebsd.org>,
richard.henderson@linaro.org,
"Alex Bennée" <alex.bennee@linaro.org>,
f4bug@amsat.org, "Warner Losh" <imp@bsdimp.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Thomas Huth" <thuth@redhat.com>, "Stacey Son" <sson@FreeBSD.org>,
"Sean Bruno" <sbruno@FreeBSD.org>,
"Juergen Lock" <nox@jelal.kn-bremen.de>,
"Raphael Kubo da Costa" <rakuco@FreeBSD.org>
Subject: [PATCH v3 05/11] bsd-user: Helper routines oidfmt
Date: Thu, 16 Feb 2023 16:33:47 -0700 [thread overview]
Message-ID: <20230216233353.13944-6-imp@bsdimp.com> (raw)
In-Reply-To: <20230216233353.13944-1-imp@bsdimp.com>
From: Stacey Son <sson@FreeBSD.org>
oidfmt uses undocumented system call to get the type of the sysctl.
Co-Authored-by: Sean Bruno <sbruno@FreeBSD.org>
Signed-off-by: Sean Bruno <sbruno@FreeBSD.org>
Co-Authored-by: Juergen Lock <nox@jelal.kn-bremen.de>
Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de>
Co-Authored-by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Signed-off-by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Warner Losh <imp@bsdimp.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/freebsd/os-sys.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/bsd-user/freebsd/os-sys.c b/bsd-user/freebsd/os-sys.c
index 9b84e90cb32..1bf2b51820e 100644
--- a/bsd-user/freebsd/os-sys.c
+++ b/bsd-user/freebsd/os-sys.c
@@ -107,6 +107,38 @@ static abi_ulong G_GNUC_UNUSED h2g_ulong_sat(u_long ul)
*/
#define bsd_get_ncpu() 1
+/*
+ * This uses the undocumented oidfmt interface to find the kind of a requested
+ * sysctl, see /sys/kern/kern_sysctl.c:sysctl_sysctl_oidfmt() (compare to
+ * src/sbin/sysctl/sysctl.c)
+ */
+static int G_GNUC_UNUSED oidfmt(int *oid, int len, char *fmt, uint32_t *kind)
+{
+ int qoid[CTL_MAXNAME + 2];
+ uint8_t buf[BUFSIZ];
+ int i;
+ size_t j;
+
+ qoid[0] = CTL_SYSCTL;
+ qoid[1] = CTL_SYSCTL_OIDFMT;
+ memcpy(qoid + 2, oid, len * sizeof(int));
+
+ j = sizeof(buf);
+ i = sysctl(qoid, len + 2, buf, &j, 0, 0);
+ if (i) {
+ return i;
+ }
+
+ if (kind) {
+ *kind = *(uint32_t *)buf;
+ }
+
+ if (fmt) {
+ strcpy(fmt, (char *)(buf + sizeof(uint32_t)));
+ }
+ return 0;
+}
+
/* sysarch() is architecture dependent. */
abi_long do_freebsd_sysarch(void *cpu_env, abi_long arg1, abi_long arg2)
{
--
2.39.1
next prev parent reply other threads:[~2023-02-16 23:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-16 23:33 [PATCH v3 00/11] 2023 Q1 bsd-user upstreaming: bugfixes and sysctl Warner Losh
2023-02-16 23:33 ` [PATCH v3 01/11] bsd-user: Don't truncate the return value from freebsd_syscall Warner Losh
2023-02-16 23:33 ` [PATCH v3 02/11] build: Don't specify -no-pie for --static user-mode programs Warner Losh
2023-02-17 0:38 ` Alex Bennée
2023-02-16 23:33 ` [PATCH v3 03/11] bsd-user: Add sysarch syscall Warner Losh
2023-02-16 23:33 ` [PATCH v3 04/11] bsd-user: various helper routines for sysctl Warner Losh
2023-02-17 17:38 ` Richard Henderson
2023-02-16 23:33 ` Warner Losh [this message]
2023-02-16 23:33 ` [PATCH v3 06/11] bsd-user: Helper routines h2g_old_sysctl Warner Losh
2023-02-17 17:41 ` Richard Henderson
2023-02-16 23:33 ` [PATCH v3 07/11] bsd-user: sysctl helper funtions: sysctl_name2oid and sysctl_oidfmt Warner Losh
2023-02-16 23:33 ` [PATCH v3 08/11] bsd-user: common routine do_freebsd_sysctl_oid for all sysctl variants Warner Losh
2023-02-16 23:33 ` [PATCH v3 09/11] bsd-user: Start translation of arch-specific sysctls Warner Losh
2023-02-16 23:33 ` [PATCH v3 10/11] bsd-user: do_freebsd_sysctl helper for sysctl(2) Warner Losh
2023-02-16 23:33 ` [PATCH v3 11/11] bsd-user: implement sysctlbyname(2) Warner Losh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230216233353.13944-6-imp@bsdimp.com \
--to=imp@bsdimp.com \
--cc=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=kevans@freebsd.org \
--cc=nox@jelal.kn-bremen.de \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rakuco@FreeBSD.org \
--cc=richard.henderson@linaro.org \
--cc=sbruno@FreeBSD.org \
--cc=sson@FreeBSD.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).