| Message ID | 20220620174220.22179-5-imp@bsdimp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | bsd-user: More file-related system calls | expand |
On 6/20/22 10:42, Warner Losh wrote: > These implement both the old-pre INO64 mknod variations, as well as the > now current INO64 variant. To implement the old stuff, we use some > linker magic to bind to the old versions of these functions. > > Signed-off-by: Stacey Son <sson@FreeBSD.org> > Signed-off-by: Michal Meloun <mmel@FreeBSD.org> > Signed-off-by: Warner Losh <imp@bsdimp.com> > --- > bsd-user/bsd-file.h | 59 +++++++++++++++++++++++++++++++++++ > bsd-user/freebsd/os-syscall.c | 15 +++++++++ > 2 files changed, 74 insertions(+) > > diff --git a/bsd-user/bsd-file.h b/bsd-user/bsd-file.h > index 0585f6a2a40..3be832b2a74 100644 > --- a/bsd-user/bsd-file.h > +++ b/bsd-user/bsd-file.h > @@ -51,6 +51,16 @@ do { \ > unlock_user(p1, arg1, 0); \ > } while (0) > > +#ifndef BSD_HAVE_INO64 > +#define freebsd11_mknod mknod > +#define freebsd11_mknodat mknodat > +#else > +int freebsd11_mknod(char *path, mode_t mode, uint32_t dev); > +__sym_compat(mknod, freebsd11_mknod, FBSD_1.0); > +int freebsd11_mknodat(int fd, char *path, mode_t mode, uint32_t dev); > +__sym_compat(mknodat, freebsd11_mknodat, FBSD_1.1); > +#endif Where does BSD_HAVE_INO64 come from? I can't find it defined in freebsd git. You should probably avoid the linker tricks and use direct syscalls of SYS_freebsd11_mknodat etc. r~
On Mon, Jun 20, 2022 at 1:13 PM Richard Henderson < richard.henderson@linaro.org> wrote: > On 6/20/22 10:42, Warner Losh wrote: > > These implement both the old-pre INO64 mknod variations, as well as the > > now current INO64 variant. To implement the old stuff, we use some > > linker magic to bind to the old versions of these functions. > > > > Signed-off-by: Stacey Son <sson@FreeBSD.org> > > Signed-off-by: Michal Meloun <mmel@FreeBSD.org> > > Signed-off-by: Warner Losh <imp@bsdimp.com> > > --- > > bsd-user/bsd-file.h | 59 +++++++++++++++++++++++++++++++++++ > > bsd-user/freebsd/os-syscall.c | 15 +++++++++ > > 2 files changed, 74 insertions(+) > > > > diff --git a/bsd-user/bsd-file.h b/bsd-user/bsd-file.h > > index 0585f6a2a40..3be832b2a74 100644 > > --- a/bsd-user/bsd-file.h > > +++ b/bsd-user/bsd-file.h > > @@ -51,6 +51,16 @@ do { \ > > unlock_user(p1, arg1, 0); \ > > } while (0) > > > > +#ifndef BSD_HAVE_INO64 > > +#define freebsd11_mknod mknod > > +#define freebsd11_mknodat mknodat > > +#else > > +int freebsd11_mknod(char *path, mode_t mode, uint32_t dev); > > +__sym_compat(mknod, freebsd11_mknod, FBSD_1.0); > > +int freebsd11_mknodat(int fd, char *path, mode_t mode, uint32_t dev); > > +__sym_compat(mknodat, freebsd11_mknodat, FBSD_1.1); > > +#endif > > Where does BSD_HAVE_INO64 come from? I can't find it defined in freebsd > git. > It used to be defined conditionally on FreeBSD 12 vs earlier. Now it's defined unconditionally in a file that wasn't part of the upstreaming. I'll rework now that it's unconditional because there's no way we could run on a FreeBSD 11 system. Normally we'd just retire these older system calls to limit the scope of what we need to maintain, but we have to have the old FreeBSD-11 era pre-INO64 system calls (here and elsewhere) to support rust since it doesn't use libc at all. > You should probably avoid the linker tricks and use direct syscalls of > SYS_freebsd11_mknodat etc > Yea, on pre-ino64 systems, there were no system calls like that. Now that we have them, I think you are right that we'd be better off just using the system call directly rather than needing this hack to get the old system calls. the old symbols will be around forever, but it's better to be more direct here. There's nothing hidden in the libc versions of these symbols. tl;dr: It's always defined now, so I'll unifdef it. Warner
diff --git a/bsd-user/bsd-file.h b/bsd-user/bsd-file.h index 0585f6a2a40..3be832b2a74 100644 --- a/bsd-user/bsd-file.h +++ b/bsd-user/bsd-file.h @@ -51,6 +51,16 @@ do { \ unlock_user(p1, arg1, 0); \ } while (0) +#ifndef BSD_HAVE_INO64 +#define freebsd11_mknod mknod +#define freebsd11_mknodat mknodat +#else +int freebsd11_mknod(char *path, mode_t mode, uint32_t dev); +__sym_compat(mknod, freebsd11_mknod, FBSD_1.0); +int freebsd11_mknodat(int fd, char *path, mode_t mode, uint32_t dev); +__sym_compat(mknodat, freebsd11_mknodat, FBSD_1.1); +#endif + extern struct iovec *lock_iovec(int type, abi_ulong target_addr, int count, int copy); extern void unlock_iovec(struct iovec *vec, abi_ulong target_addr, int count, @@ -722,4 +732,53 @@ static abi_long do_bsd_fchmodat(abi_long arg1, abi_long arg2, return ret; } +/* pre-ino64 mknod(2) */ +static abi_long do_bsd_freebsd11_mknod(abi_long arg1, abi_long arg2, abi_long arg3) +{ + abi_long ret; + void *p; + + LOCK_PATH(p, arg1); + ret = get_errno(freebsd11_mknod(p, arg2, arg3)); /* XXX path(p)? */ + UNLOCK_PATH(p, arg1); + + return ret; +} + +/* pre-ino64 mknodat(2) */ +static abi_long do_bsd_freebsd11_mknodat(abi_long arg1, abi_long arg2, + abi_long arg3, abi_long arg4) +{ + abi_long ret; + void *p; + + LOCK_PATH(p, arg2); + ret = get_errno(freebsd11_mknodat(arg1, p, arg3, arg4)); + UNLOCK_PATH(p, arg2); + + return ret; +} + +#ifdef BSD_HAVE_INO64 +/* post-ino64 mknodat(2) */ +static abi_long do_bsd_mknodat(void *cpu_env, abi_long arg1, + abi_long arg2, abi_long arg3, abi_long arg4, abi_long arg5, + abi_long arg6) +{ + abi_long ret; + void *p; + + LOCK_PATH(p, arg2); + /* 32-bit arch's use two 32 registers for 64 bit return value */ + if (regpairs_aligned(cpu_env) != 0) { + ret = get_errno(mknodat(arg1, p, arg3, target_arg64(arg5, arg6))); + } else { + ret = get_errno(mknodat(arg1, p, arg3, target_arg64(arg4, arg5))); + } + UNLOCK_PATH(p, arg2); + + return ret; +} +#endif + #endif /* BSD_FILE_H */ diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c index b33d548a4b6..fea6a857b78 100644 --- a/bsd-user/freebsd/os-syscall.c +++ b/bsd-user/freebsd/os-syscall.c @@ -32,6 +32,7 @@ #include "qemu/cutils.h" #include "qemu/path.h" #include <sys/syscall.h> +#include <sys/cdefs.h> #include <sys/param.h> #include <sys/mount.h> #include <sys/sysctl.h> @@ -418,6 +419,20 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1, ret = do_bsd_fchmodat(arg1, arg2, arg3, arg4); break; + case TARGET_FREEBSD_NR_freebsd11_mknod: /* mknod(2) */ + ret = do_bsd_freebsd11_mknod(arg1, arg2, arg3); + break; + + case TARGET_FREEBSD_NR_freebsd11_mknodat: /* mknodat(2) */ + ret = do_bsd_freebsd11_mknodat(arg1, arg2, arg3, arg4); + break; + +#ifdef BSD_HAVE_INO64 + case TARGET_FREEBSD_NR_mknodat: /* mknodat(2) */ + ret = do_bsd_mknodat(cpu_env, arg1, arg2, arg3, arg4, arg5, arg6); + break; +#endif + default: qemu_log_mask(LOG_UNIMP, "Unsupported syscall: %d\n", num); ret = -TARGET_ENOSYS;