From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: reinoud@netbsd.org, riastradh@netbsd.org, ryoon@netbsd.org,
jrtc27@jrtc27.com, Warner Losh <imp@bsdimp.com>,
kevans@freebsd.org, Brad Smith <brad@comstyle.com>,
Stacey Son <sson@FreeBSD.org>
Subject: [PATCH 11/16] bsd-user: Implement do_sysctl_kern_proc_filedesc
Date: Wed, 5 Apr 2023 15:36:07 -0600 [thread overview]
Message-ID: <20230405213612.15942-12-imp@bsdimp.com> (raw)
In-Reply-To: <20230405213612.15942-1-imp@bsdimp.com>
From: Stacey Son <sson@FreeBSD.org>
Implement do_sysctl_kern_proc_filedesc. This pulls kern.proc.filedesc
out of the host kernel and converts it to the guest's format.
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-sys.c | 193 ++++++++++++++++++++++++++++++++++++++
bsd-user/qemu.h | 3 +
2 files changed, 196 insertions(+)
diff --git a/bsd-user/freebsd/os-sys.c b/bsd-user/freebsd/os-sys.c
index d4a6dcc6c2b..00b2dcc9641 100644
--- a/bsd-user/freebsd/os-sys.c
+++ b/bsd-user/freebsd/os-sys.c
@@ -270,6 +270,199 @@ do_sysctl_kern_getprocs(int op, int arg, size_t olen,
return ret;
}
+static void
+host_to_target_kinfo_file(struct target_kinfo_file *tkif,
+ struct kinfo_file *hkif)
+{
+ int type = hkif->kf_type;
+
+ __put_user(hkif->kf_structsize, &tkif->kf_structsize);
+ __put_user(hkif->kf_type, &tkif->kf_type);
+ __put_user(hkif->kf_fd, &tkif->kf_fd);
+ __put_user(hkif->kf_ref_count, &tkif->kf_ref_count);
+ __put_user(hkif->kf_flags, &tkif->kf_flags);
+ __put_user(hkif->kf_offset, &tkif->kf_offset);
+ switch (type) {
+ case TARGET_KF_TYPE_FIFO:
+ case TARGET_KF_TYPE_SHM:
+ case TARGET_KF_TYPE_VNODE:
+ __put_user(hkif->kf_un.kf_file.kf_file_type,
+ &tkif->kf_un.kf_file.kf_file_type);
+ __put_user(hkif->kf_un.kf_file.kf_file_fsid,
+ &tkif->kf_un.kf_file.kf_file_fsid);
+ __put_user(hkif->kf_un.kf_file.kf_file_rdev,
+ &tkif->kf_un.kf_file.kf_file_rdev);
+ __put_user(hkif->kf_un.kf_file.kf_file_fileid,
+ &tkif->kf_un.kf_file.kf_file_fileid);
+ __put_user(hkif->kf_un.kf_file.kf_file_size,
+ &tkif->kf_un.kf_file.kf_file_size);
+ __put_user(hkif->kf_un.kf_file.kf_file_fsid_freebsd11,
+ &tkif->kf_un.kf_file.kf_file_fsid_freebsd11);
+ __put_user(hkif->kf_un.kf_file.kf_file_rdev_freebsd11,
+ &tkif->kf_un.kf_file.kf_file_rdev_freebsd11);
+ __put_user(hkif->kf_un.kf_file.kf_file_mode,
+ &tkif->kf_un.kf_file.kf_file_mode);
+ break;
+
+ case TARGET_KF_TYPE_SOCKET:
+ __put_user(hkif->kf_un.kf_sock.kf_sock_domain0,
+ &tkif->kf_un.kf_sock.kf_sock_domain0);
+ __put_user(hkif->kf_un.kf_sock.kf_sock_type0,
+ &tkif->kf_un.kf_sock.kf_sock_type0);
+ __put_user(hkif->kf_un.kf_sock.kf_sock_protocol0,
+ &tkif->kf_un.kf_sock.kf_sock_protocol0);
+/* XXX - Implement copy function for sockaddr_storage
+ host_to_target_copy_sockaddr_storage(
+ &hkif->kf_un.kf_file.kf_sa_local,
+ &kif->kf_un.kf_file.kf_sa_local);
+ host_to_target_copy_sockaddr_storage(
+ &hkif->kf_un.kf_file.kf_sa_peer,
+ &kif->kf_un.kf_file.kf_sa_peer);
+*/
+ __put_user(hkif->kf_un.kf_sock.kf_sock_pcb,
+ &tkif->kf_un.kf_sock.kf_sock_pcb);
+ __put_user(hkif->kf_un.kf_sock.kf_sock_inpcb,
+ &tkif->kf_un.kf_sock.kf_sock_inpcb);
+ __put_user(hkif->kf_un.kf_sock.kf_sock_unpconn,
+ &tkif->kf_un.kf_sock.kf_sock_unpconn);
+ __put_user(hkif->kf_un.kf_sock.kf_sock_snd_sb_state,
+ &tkif->kf_un.kf_sock.kf_sock_snd_sb_state);
+ __put_user(hkif->kf_un.kf_sock.kf_sock_rcv_sb_state,
+ &tkif->kf_un.kf_sock.kf_sock_rcv_sb_state);
+ break;
+
+ case TARGET_KF_TYPE_PIPE:
+ __put_user(hkif->kf_un.kf_pipe.kf_pipe_addr,
+ &tkif->kf_un.kf_pipe.kf_pipe_addr);
+ __put_user(hkif->kf_un.kf_pipe.kf_pipe_peer,
+ &tkif->kf_un.kf_pipe.kf_pipe_peer);
+ __put_user(hkif->kf_un.kf_pipe.kf_pipe_buffer_cnt,
+ &tkif->kf_un.kf_pipe.kf_pipe_buffer_cnt);
+ break;
+
+ case TARGET_KF_TYPE_SEM:
+ __put_user(hkif->kf_un.kf_sem.kf_sem_value,
+ &tkif->kf_un.kf_sem.kf_sem_value);
+ __put_user(hkif->kf_un.kf_sem.kf_sem_mode,
+ &tkif->kf_un.kf_sem.kf_sem_mode);
+ break;
+
+ case TARGET_KF_TYPE_PTS:
+ __put_user(hkif->kf_un.kf_pts.kf_pts_dev_freebsd11,
+ &tkif->kf_un.kf_pts.kf_pts_dev_freebsd11);
+ __put_user(hkif->kf_un.kf_pts.kf_pts_dev,
+ &tkif->kf_un.kf_pts.kf_pts_dev);
+ break;
+
+ case TARGET_KF_TYPE_PROCDESC:
+ __put_user(hkif->kf_un.kf_proc.kf_pid,
+ &tkif->kf_un.kf_proc.kf_pid);
+ break;
+
+
+ case TARGET_KF_TYPE_CRYPTO:
+ case TARGET_KF_TYPE_KQUEUE:
+ case TARGET_KF_TYPE_MQUEUE:
+ case TARGET_KF_TYPE_NONE:
+ case TARGET_KF_TYPE_UNKNOWN:
+ default:
+ /* Do nothing. */
+ break;
+ }
+ __put_user(hkif->kf_status, &tkif->kf_status);
+ for (int i = 0; i < (CAP_RIGHTS_VERSION + 2); i++)
+ __put_user(hkif->kf_cap_rights.cr_rights[i],
+ &tkif->kf_cap_rights.cr_rights[i]);
+ strncpy(tkif->kf_path, hkif->kf_path, sizeof(tkif->kf_path));
+}
+
+abi_long
+do_sysctl_kern_proc_filedesc(int pid, size_t olen,
+ struct target_kinfo_file *tkif, size_t *tlen)
+{
+ abi_long ret;
+ int mib[4], sz;
+ size_t len;
+ char *buf, *bp, *eb, *tp;
+ struct kinfo_file *kf, kif;
+ struct target_kinfo_file target_kif;
+
+ if (tlen == NULL) {
+ return -TARGET_EINVAL;
+ }
+
+ len = 0;
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_PROC;
+ mib[2] = KERN_PROC_FILEDESC;
+ mib[3] = pid;
+
+ ret = get_errno(sysctl(mib, 4, NULL, &len, NULL, 0));
+ if (is_error(ret)) {
+ return ret;
+ }
+ if (tkif == NULL) {
+ *tlen = len;
+ return ret;
+ }
+ len = len * 4 / 3;
+ buf = g_malloc(len);
+ if (buf == NULL) {
+ return -TARGET_ENOMEM;
+ }
+
+ /*
+ * Count the number of records.
+ *
+ * Given that the kinfo_file information returned by
+ * the kernel may be different sizes per record we have
+ * to read it in and count the variable length records
+ * by walking them.
+ */
+ ret = get_errno(sysctl(mib, 4, buf, &len, NULL, 0));
+ if (is_error(ret)) {
+ g_free(buf);
+ return ret;
+ }
+ *tlen = len;
+ bp = buf;
+ eb = buf + len;
+ while (bp < eb) {
+ kf = (struct kinfo_file *)(uintptr_t)bp;
+ bp += kf->kf_structsize;
+ }
+ if (olen < *tlen) {
+ g_free(buf);
+ return -TARGET_EINVAL;
+ }
+
+ /*
+ * Unpack the records from the kernel into full length records
+ * and byte swap, if needed.
+ */
+ bp = buf;
+ eb = buf + len;
+ tp = (char *)tkif;
+ while (bp < eb) {
+ kf = (struct kinfo_file *)(uintptr_t)bp;
+ sz = kf->kf_structsize;
+ /* Copy/expand into a zeroed buffer */
+ memset(&kif, 0, sizeof(kif));
+ memcpy(&kif, kf, sz);
+ /* Byte swap and copy into a target buffer. */
+ host_to_target_kinfo_file(&target_kif, &kif);
+ /* Copy target buffer to user buffer and pack */
+ memcpy(tp, &target_kif, sz);
+ /* Advance to next packed record. */
+ bp += sz;
+ /* Advance to next packed, target record. */
+ tp += sz;
+ }
+
+ g_free(buf);
+ return ret;
+}
+
/*
* 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
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index fcaf794ad6e..5926bdcc101 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -259,8 +259,11 @@ int host_to_target_errno(int err);
/* os-sys.c */
struct target_kinfo_proc;
+struct target_kinfo_file;
abi_long do_sysctl_kern_getprocs(int op, int arg, size_t olen,
struct target_kinfo_proc *tki, size_t *tlen);
+abi_long do_sysctl_kern_proc_filedesc(int pid, size_t olen,
+ struct target_kinfo_file *tkif, size_t *tlen);
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);
abi_long do_freebsd_sysctlbyname(CPUArchState *env, abi_ulong namep,
--
2.40.0
next prev parent reply other threads:[~2023-04-05 21:38 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-05 21:35 [PATCH 00/16] bsd-user 2023 Q2 first batch Warner Losh
2023-04-05 21:35 ` [PATCH 01/16] bsd-user: Make print_* public Warner Losh
2023-04-08 19:00 ` Richard Henderson
2023-04-05 21:35 ` [PATCH 02/16] bsd-user: Ifdef a few MAP_ constants for NetBSD Warner Losh
2023-04-08 19:03 ` Richard Henderson
2023-04-08 19:29 ` Warner Losh
2023-04-05 21:35 ` [PATCH 03/16] bsd-user: Cleanup style Warner Losh
2023-04-08 19:03 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 04/16] bsd-user: Move system FreeBSD call table to freebsd/os-syscall.c Warner Losh
2023-04-08 19:04 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 05/16] bsd-user: Remove NetBSD specific syscall printing Warner Losh
2023-04-08 19:04 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 06/16] bsd-user: Remove OpenBSD " Warner Losh
2023-04-08 19:05 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 07/16] bsd-user: Move system call include to os-syscall.h Warner Losh
2023-04-08 19:08 ` Richard Henderson
2023-04-10 17:12 ` Warner Losh
2023-04-10 18:57 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 08/16] bsd-user: Remove useless mmap definitions Warner Losh
2023-04-08 19:09 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 09/16] bsd-user: h2g_rusage Warner Losh
2023-04-08 19:10 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 10/16] bsd-user: Implmenet do_sysctl_kern_getprocs Warner Losh
2023-04-08 19:11 ` Richard Henderson
2023-04-05 21:36 ` Warner Losh [this message]
2023-04-08 19:12 ` [PATCH 11/16] bsd-user: Implement do_sysctl_kern_proc_filedesc Richard Henderson
2023-04-05 21:36 ` [PATCH 12/16] bsd-user: Implement do_sysctl_kern_proc_vmmap Warner Losh
2023-04-08 19:12 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 13/16] bsd-user: Implement sysctl kern.proc, except kern.proc.full_path Warner Losh
2023-04-08 19:13 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 14/16] bsd-user: Implment core dumps Warner Losh
2023-04-08 19:15 ` Richard Henderson
2023-04-09 5:00 ` Warner Losh
2023-04-10 17:09 ` Warner Losh
2023-04-05 21:36 ` [PATCH 15/16] bsd-user: Add SIGSYS to core dump signals Warner Losh
2023-04-08 19:15 ` Richard Henderson
2023-04-05 21:36 ` [PATCH 16/16] bsd-user: Implement SIGSYS on arm Warner Losh
2023-04-08 19:16 ` Richard Henderson
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=20230405213612.15942-12-imp@bsdimp.com \
--to=imp@bsdimp.com \
--cc=brad@comstyle.com \
--cc=jrtc27@jrtc27.com \
--cc=kevans@freebsd.org \
--cc=qemu-devel@nongnu.org \
--cc=reinoud@netbsd.org \
--cc=riastradh@netbsd.org \
--cc=ryoon@netbsd.org \
--cc=sson@FreeBSD.org \
/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).