qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
	"Kyle Evans" <kevans@freebsd.org>,
	f4bug@amsat.org, "Warner Losh" <imp@bsdimp.com>,
	richard.henderson@linaro.org,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Kyle Evans" <kevans@FreeBSD.org>
Subject: [PATCH 8/9] bsd-user: implement sysctlbyname(2)
Date: Fri, 10 Feb 2023 16:18:28 -0700	[thread overview]
Message-ID: <20230210231829.39476-9-imp@bsdimp.com> (raw)
In-Reply-To: <20230210231829.39476-1-imp@bsdimp.com>

From: Kyle Evans <kevans@FreeBSD.org>

do_freebsd_sysctlbyname needs to translate the 'name' back down to a OID
so we can intercept the special ones. Do that and call the common wrapper
do_freebsd_sysctl_oid.

Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
 bsd-user/freebsd/os-sys.c     | 58 +++++++++++++++++++++++++++++++++++
 bsd-user/freebsd/os-syscall.c |  4 +++
 2 files changed, 62 insertions(+)

diff --git a/bsd-user/freebsd/os-sys.c b/bsd-user/freebsd/os-sys.c
index 13736936e5f..62c729dfe47 100644
--- a/bsd-user/freebsd/os-sys.c
+++ b/bsd-user/freebsd/os-sys.c
@@ -345,6 +345,64 @@ out:
     return ret;
 }
 
+/*
+ * This syscall was created to make sysctlbyname(3) more efficient.
+ * Unfortunately, because we have to fake some sysctls, we can't do that.
+ */
+abi_long do_freebsd_sysctlbyname(CPUArchState *env, abi_ulong namep,
+        int32_t namelen, abi_ulong oldp, abi_ulong oldlenp, abi_ulong newp,
+        abi_ulong newlen)
+{
+    abi_long ret;
+    void *holdp = NULL, *hnewp = NULL;
+    char *snamep;
+    int oid[CTL_MAXNAME + 2];
+    size_t holdlen, oidplen;
+    abi_ulong oldlen = 0;
+
+    if (oldlenp) {
+        if (get_user_ual(oldlen, oldlenp)) {
+            return -TARGET_EFAULT;
+        }
+    }
+    snamep = lock_user_string(namep);
+    if (snamep == NULL) {
+        return -TARGET_EFAULT;
+    }
+    if (newp) {
+        hnewp = lock_user(VERIFY_READ, newp, newlen, 1);
+        if (hnewp == NULL) {
+            return -TARGET_EFAULT;
+        }
+    }
+    if (oldp) {
+        holdp = lock_user(VERIFY_WRITE, oldp, oldlen, 0);
+        if (holdp == NULL) {
+            return -TARGET_EFAULT;
+        }
+    }
+    holdlen = oldlen;
+
+    oidplen = sizeof(oid) / sizeof(int);
+    if (sysctlnametomib(snamep, oid, &oidplen) != 0) {
+        return -TARGET_EINVAL;
+    }
+
+    ret = do_freebsd_sysctl_oid(env, oid, oidplen, holdp, &holdlen, hnewp,
+        newlen);
+
+    if (oldlenp) {
+        put_user_ual(holdlen, oldlenp);
+    }
+    unlock_user(snamep, namep, 0);
+    unlock_user(holdp, oldp, holdlen);
+    if (hnewp) {
+        unlock_user(hnewp, newp, 0);
+    }
+
+    return ret;
+}
+
 abi_long do_freebsd_sysctl(CPUArchState *env, abi_ulong namep, int32_t namelen,
         abi_ulong oldp, abi_ulong oldlenp, abi_ulong newp, abi_ulong newlen)
 {
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index 20ab3d4d9a1..179a20c304b 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -498,6 +498,10 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1,
         ret = do_freebsd_sysctl(cpu_env, arg1, arg2, arg3, arg4, arg5, arg6);
         break;
 
+    case TARGET_FREEBSD_NR___sysctlbyname: /* sysctlbyname(2) */
+        ret = do_freebsd_sysctlbyname(cpu_env, arg1, arg2, arg3, arg4, arg5, arg6);
+        break;
+
     case TARGET_FREEBSD_NR_sysarch: /* sysarch(2) */
         ret = do_freebsd_sysarch(cpu_env, arg1, arg2);
         break;
-- 
2.39.1



  parent reply	other threads:[~2023-02-10 23:24 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-10 23:18 [PATCH 0/9] 2023 Q1 bsd-user upstreaming: bugfixes and sysctl Warner Losh
2023-02-10 23:18 ` [PATCH 1/9] bsd-user: Don't truncate the return value from freebsd_syscall Warner Losh
2023-02-11 19:12   ` Richard Henderson
2023-02-10 23:18 ` [PATCH 2/9] build: Don't specify -no-pie for --static user-mode programs Warner Losh
2023-02-10 23:18 ` [PATCH 3/9] bsd-user: Add sysarch syscall Warner Losh
2023-02-11 19:27   ` Richard Henderson
2023-02-10 23:18 ` [PATCH 4/9] bsd-user: Two helper routines oidfmt and sysctl_oldcvt Warner Losh
2023-02-11 22:17   ` Richard Henderson
2023-02-12  4:11     ` Warner Losh
2023-02-12 17:01       ` Warner Losh
2023-02-12 17:11         ` Warner Losh
2023-02-10 23:18 ` [PATCH 5/9] bsd-user: sysctl helper funtions: sysctl_name2oid and sysctl_oidfmt Warner Losh
2023-02-10 23:18 ` [PATCH 6/9] bsd-user: common routine do_freebsd_sysctl_oid for all sysctl variants Warner Losh
2023-02-11 22:56   ` Richard Henderson
2023-02-11 23:40     ` Warner Losh
2023-02-11 23:59       ` Richard Henderson
2023-02-12  0:40         ` Warner Losh
2023-02-12  1:13           ` Richard Henderson
2023-02-10 23:18 ` [PATCH 7/9] bsd-user: do_freebsd_sysctl helper for sysctl(2) Warner Losh
2023-02-11 23:09   ` Richard Henderson
2023-02-12 17:53     ` Warner Losh
2023-02-10 23:18 ` Warner Losh [this message]
2023-02-11 23:13   ` [PATCH 8/9] bsd-user: implement sysctlbyname(2) Richard Henderson
2023-02-12  4:23     ` Kyle Evans
2023-02-12 15:07       ` Richard Henderson
2023-02-10 23:18 ` [PATCH 9/9] bsd-user: Add -strict Warner Losh
2023-02-11 23:19   ` Richard Henderson
2023-02-13 23:55     ` Warner Losh
2023-02-11 19:30 ` [PATCH 0/9] 2023 Q1 bsd-user upstreaming: bugfixes and sysctl Richard Henderson
2023-02-11 22:20   ` 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=20230210231829.39476-9-imp@bsdimp.com \
    --to=imp@bsdimp.com \
    --cc=alex.bennee@linaro.org \
    --cc=f4bug@amsat.org \
    --cc=kevans@freebsd.org \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.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).