qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: Reinoud Zandijk <reinoud@netbsd.org>,
	Warner Losh <imp@bsdimp.com>, Ryo ONODERA <ryoon@netbsd.org>,
	Kyle Evans <kevans@freebsd.org>, Michal Meloun <mmel@FreeBSD.org>,
	Stacey Son <sson@FreeBSD.org>,
	Karim Taha <kariem.taha2.7@gmail.com>,
	Richard Henderson <richard.henderson@linaro.org>
Subject: [PULL 27/36] bsd-user: Implement freebsd11 statfs related syscalls
Date: Mon, 28 Aug 2023 17:38:12 -0600	[thread overview]
Message-ID: <20230828233821.43074-28-imp@bsdimp.com> (raw)
In-Reply-To: <20230828233821.43074-1-imp@bsdimp.com>

From: Michal Meloun <mmel@FreeBSD.org>

Implement the freebsd11 variant of the following syscalls:
statfs(2)
fstatfs(2)
getfsstat(2)

Co-authored-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Michal Meloun <mmel@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
 bsd-user/freebsd/os-stat.h | 75 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/bsd-user/freebsd/os-stat.h b/bsd-user/freebsd/os-stat.h
index 2e0c7245dfd..04a61fabd11 100644
--- a/bsd-user/freebsd/os-stat.h
+++ b/bsd-user/freebsd/os-stat.h
@@ -32,9 +32,15 @@ __sym_compat(fstatat, freebsd11_fstatat, FBSD_1.1);
 
 int freebsd11_fhstat(const fhandle_t *fhandle, struct freebsd11_stat *stat);
 __sym_compat(fhstat, freebsd11_fhstat, FBSD_1.0);
+int freebsd11_getfsstat(struct freebsd11_statfs *buf, long bufsize, int mode);
+__sym_compat(getfsstat, freebsd11_getfsstat, FBSD_1.0);
 int freebsd11_fhstatfs(const fhandle_t *fhandle, struct freebsd11_statfs * buf);
 __sym_compat(fhstatfs, freebsd11_fhstatfs, FBSD_1.0);
 int freebsd11_statfs(const char *path, struct freebsd11_statfs *buf);
+__sym_compat(statfs, freebsd11_statfs, FBSD_1.0);
+int freebsd11_fstatfs(int fd, struct freebsd11_statfs *buf);
+__sym_compat(fstatfs, freebsd11_fstatfs, FBSD_1.0);
+
 
 /* stat(2) */
 static inline abi_long do_freebsd11_stat(abi_long arg1, abi_long arg2)
@@ -293,6 +299,23 @@ static inline abi_long do_freebsd_fhstatfs(abi_ulong target_fhp_addr,
     return h2t_freebsd_statfs(target_stfs_addr, &host_stfs);
 }
 
+/* statfs(2) */
+static inline abi_long do_freebsd11_statfs(abi_long arg1, abi_long arg2)
+{
+    abi_long ret;
+    void *p;
+    struct freebsd11_statfs host_stfs;
+
+    LOCK_PATH(p, arg1);
+    ret = get_errno(freebsd11_statfs(path(p), &host_stfs));
+    UNLOCK_PATH(p, arg1);
+    if (is_error(ret)) {
+        return ret;
+    }
+
+    return h2t_freebsd11_statfs(arg2, &host_stfs);
+}
+
 /* statfs(2) */
 static inline abi_long do_freebsd_statfs(abi_long arg1, abi_long arg2)
 {
@@ -310,6 +333,20 @@ static inline abi_long do_freebsd_statfs(abi_long arg1, abi_long arg2)
     return h2t_freebsd_statfs(arg2, &host_stfs);
 }
 
+/* fstatfs(2) */
+static inline abi_long do_freebsd11_fstatfs(abi_long fd, abi_ulong target_addr)
+{
+    abi_long ret;
+    struct freebsd11_statfs host_stfs;
+
+    ret = get_errno(freebsd11_fstatfs(fd, &host_stfs));
+    if (is_error(ret)) {
+        return ret;
+    }
+
+    return h2t_freebsd11_statfs(target_addr, &host_stfs);
+}
+
 /* fstatfs(2) */
 static inline abi_long do_freebsd_fstatfs(abi_long fd, abi_ulong target_addr)
 {
@@ -324,6 +361,44 @@ static inline abi_long do_freebsd_fstatfs(abi_long fd, abi_ulong target_addr)
     return h2t_freebsd_statfs(target_addr, &host_stfs);
 }
 
+/* getfsstat(2) */
+static inline abi_long do_freebsd11_getfsstat(abi_ulong target_addr,
+        abi_long bufsize, abi_long flags)
+{
+    abi_long ret;
+    struct freebsd11_statfs *host_stfs;
+    int count;
+    long host_bufsize;
+
+    count = bufsize / sizeof(struct target_freebsd11_statfs);
+
+    /* if user buffer is NULL then return number of mounted FS's */
+    if (target_addr == 0 || count == 0) {
+        return get_errno(freebsd11_getfsstat(NULL, 0, flags));
+    }
+
+    /* XXX check count to be reasonable */
+    host_bufsize = sizeof(struct freebsd11_statfs) * count;
+    host_stfs = alloca(host_bufsize);
+    if (!host_stfs) {
+        return -TARGET_EINVAL;
+    }
+
+    ret = count = get_errno(freebsd11_getfsstat(host_stfs, host_bufsize, flags));
+    if (is_error(ret)) {
+        return ret;
+    }
+
+    while (count--) {
+        if (h2t_freebsd11_statfs((target_addr +
+                        (count * sizeof(struct target_freebsd11_statfs))),
+                    &host_stfs[count])) {
+            return -TARGET_EFAULT;
+        }
+    }
+    return ret;
+}
+
 /* getfsstat(2) */
 static inline abi_long do_freebsd_getfsstat(abi_ulong target_addr,
         abi_long bufsize, abi_long flags)
-- 
2.41.0



  parent reply	other threads:[~2023-08-28 23:46 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
2023-08-28 23:37 ` [PULL 01/36] bsd-user: Remove ELF_START_MMAP and image_info.start_mmap Warner Losh
2023-08-28 23:37 ` [PULL 02/36] bsd-user: Remove image_info.mmap Warner Losh
2023-08-28 23:37 ` [PULL 03/36] bsd-user: Remove image_info.start_brk Warner Losh
2023-08-28 23:37 ` [PULL 04/36] bsd-user: Move _WANT_FREEBSD macros to include/qemu/osdep.h Warner Losh
2023-08-28 23:37 ` [PULL 05/36] bsd-user: Disable clang warnings Warner Losh
2023-08-28 23:37 ` [PULL 06/36] bsd-user; Update the definitions of __put_user and __get_user macros Warner Losh
2023-08-28 23:37 ` [PULL 07/36] bsd-user: Declarations of h2t and t2h conversion functions Warner Losh
2023-08-28 23:37 ` [PULL 08/36] bsd-user: Add struct target_freebsd11_stat to bsd-user/syscall_defs Warner Losh
2023-08-28 23:37 ` [PULL 09/36] bsd-user: Add struct target_stat to bsd-user/syscall_defs.h Warner Losh
2023-08-28 23:37 ` [PULL 10/36] bsd-user: Add structs target_freebsd11_{nstat,statfs} Warner Losh
2023-08-28 23:37 ` [PULL 11/36] bsd-user: Add struct target_statfs Warner Losh
2023-08-28 23:37 ` [PULL 12/36] bsd-user: Add struct target_freebsd_fhandle and fcntl flags Warner Losh
2023-08-28 23:37 ` [PULL 13/36] bsd-user: Define safe_fcntl macro in bsd-user/syscall_defs.h Warner Losh
2023-08-28 23:37 ` [PULL 14/36] bsd-user: Rename target_freebsd_time_t to target_time_t Warner Losh
2023-08-28 23:38 ` [PULL 15/36] bsd-user: Implement h2t_freebsd11_stat h2t_freebsd_nstat Warner Losh
2023-08-28 23:38 ` [PULL 16/36] bsd-user: Implement h2t_freebsd_fhandle t2h_freebsd_fhandle Warner Losh
2023-08-28 23:38 ` [PULL 17/36] bsd-user: Implement h2t_freebds11_statfs Warner Losh
2023-08-28 23:38 ` [PULL 18/36] bsd-user: Implement target_to_host_fcntl_cmd Warner Losh
2023-08-28 23:38 ` [PULL 19/36] bsd-uesr: Implement h2t_freebsd_stat and h2t_freebsd_statfs functions Warner Losh
2023-08-28 23:38 ` [PULL 20/36] bsd-user: Implement stat related syscalls Warner Losh
2023-08-28 23:38 ` [PULL 21/36] bsd-user: Implement statfh " Warner Losh
2023-08-28 23:38 ` [PULL 22/36] bsd-user: Implement statfs " Warner Losh
2023-08-28 23:38 ` [PULL 23/36] bsd-user: Implement getdents " Warner Losh
2023-08-28 23:38 ` [PULL 24/36] bsd-user: Implement stat " Warner Losh
2023-08-28 23:38 ` [PULL 25/36] bsd-user: Implement freebsd11 " Warner Losh
2023-08-28 23:38 ` [PULL 26/36] bsd-user: Implement freebsd11 fstat and fhstat " Warner Losh
2023-08-28 23:38 ` Warner Losh [this message]
2023-08-28 23:38 ` [PULL 28/36] bsd-user: Implement freebsd11 getdirents " Warner Losh
2023-08-28 23:38 ` [PULL 29/36] bsd-user: Implement freebsd11 netbsd stat " Warner Losh
2023-08-28 23:38 ` [PULL 30/36] bsd-user: Implement do_freebsd_realpathat syscall Warner Losh
2023-08-28 23:38 ` [PULL 31/36] bsd-user: Add os-stat.c to the build Warner Losh
2023-08-28 23:38 ` [PULL 32/36] bsd-user: Add glue for the freebsd11_stat syscalls Warner Losh
2023-08-28 23:38 ` [PULL 33/36] bsd-user: Add glue for getfh and related syscalls Warner Losh
2023-08-28 23:38 ` [PULL 34/36] bsd-user: Add glue for statfs related system calls Warner Losh
2023-08-28 23:38 ` [PULL 35/36] bsd-user: Add getdents and fcntl " Warner Losh
2023-08-28 23:38 ` [PULL 36/36] bsd-user: Add missing break after do_bsd_preadv Warner Losh
2023-08-29 13:50 ` [PULL 00/36] 2023q3 bsd user patches Stefan Hajnoczi
2023-08-29 15:32   ` Warner Losh
2023-08-29 17:30   ` Peter Maydell
2023-08-29 18:38     ` 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=20230828233821.43074-28-imp@bsdimp.com \
    --to=imp@bsdimp.com \
    --cc=kariem.taha2.7@gmail.com \
    --cc=kevans@freebsd.org \
    --cc=mmel@FreeBSD.org \
    --cc=qemu-devel@nongnu.org \
    --cc=reinoud@netbsd.org \
    --cc=richard.henderson@linaro.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).