diff options
Diffstat (limited to 'sys/compat/linux')
| -rw-r--r-- | sys/compat/linux/arch/alpha/syscalls.master | 10 | ||||
| -rw-r--r-- | sys/compat/linux/arch/amd64/syscalls.master | 10 | ||||
| -rw-r--r-- | sys/compat/linux/arch/arm/syscalls.master | 10 | ||||
| -rw-r--r-- | sys/compat/linux/arch/i386/syscalls.master | 10 | ||||
| -rw-r--r-- | sys/compat/linux/arch/m68k/syscalls.master | 10 | ||||
| -rw-r--r-- | sys/compat/linux/arch/mips/syscalls.master | 10 | ||||
| -rw-r--r-- | sys/compat/linux/arch/powerpc/syscalls.master | 10 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_file.c | 71 |
8 files changed, 118 insertions, 23 deletions
diff --git a/sys/compat/linux/arch/alpha/syscalls.master b/sys/compat/linux/arch/alpha/syscalls.master index 8fa2ec2adae..30c65c7e450 100644 --- a/sys/compat/linux/arch/alpha/syscalls.master +++ b/sys/compat/linux/arch/alpha/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.100 2021/09/20 00:09:01 thorpej Exp $ + $NetBSD: syscalls.master,v 1.101 2021/09/20 02:20:02 thorpej Exp $ ; ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -784,8 +784,12 @@ 487 STD { int|linux_sys||dup3(int from, int to, int flags); } 488 STD { int|linux_sys||pipe2(int *pfds, int flags); } 489 UNIMPL inotify_init1 -490 UNIMPL preadv -491 UNIMPL pwritev +490 STD { int|linux_sys||preadv(int fd, \ + const struct iovec *iovp, int iovcnt, \ + unsigned long off_lo, unsigned long off_hi); } +491 STD { int|linux_sys||pwritev(int fd, \ + const struct iovcnt *iovp, int iovcnt, \ + unsigned long off_lo, unsigned long off_hi); } 492 UNIMPL rt_tgsigqueueinfo 493 UNIMPL perf_counter_open 494 UNIMPL fanotify_init diff --git a/sys/compat/linux/arch/amd64/syscalls.master b/sys/compat/linux/arch/amd64/syscalls.master index 328a3faddfe..c09e689b888 100644 --- a/sys/compat/linux/arch/amd64/syscalls.master +++ b/sys/compat/linux/arch/amd64/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.65 2021/09/20 00:09:01 thorpej Exp $ + $NetBSD: syscalls.master,v 1.66 2021/09/20 02:20:02 thorpej Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -539,8 +539,12 @@ 292 STD { int|linux_sys||dup3(int from, int to, int flags); } 293 STD { int|linux_sys||pipe2(int *pfds, int flags); } 294 UNIMPL inotify_init1 -295 UNIMPL preadv -296 UNIMPL pwritev +295 STD { int|linux_sys||preadv(int fd, \ + const struct iovec *iovp, int iovcnt, \ + unsigned long off_lo, unsigned long off_hi); } +296 STD { int|linux_sys||pwritev(int fd, \ + const struct iovcnt *iovp, int iovcnt, \ + unsigned long off_lo, unsigned long off_hi); } 297 UNIMPL rt_tgsigqueueinfo 298 UNIMPL perf_counter_open 299 STD { int|linux_sys||recvmmsg(int s, \ diff --git a/sys/compat/linux/arch/arm/syscalls.master b/sys/compat/linux/arch/arm/syscalls.master index 6e28818057d..cf32f7dc9a1 100644 --- a/sys/compat/linux/arch/arm/syscalls.master +++ b/sys/compat/linux/arch/arm/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.72 2021/09/20 00:09:01 thorpej Exp $ + $NetBSD: syscalls.master,v 1.73 2021/09/20 02:20:02 thorpej Exp $ ; Derived from sys/compat/linux/arch/*/syscalls.master ; and from Linux 2.4.12 arch/arm/kernel/calls.S @@ -579,8 +579,12 @@ 358 STD { int|linux_sys||dup3(int from, int to, int flags); } 359 STD { int|linux_sys||pipe2(int *pfds, int flags); } 360 UNIMPL inotify_init1 -361 UNIMPL preadv -362 UNIMPL pwritev +361 STD { int|linux_sys||preadv(int fd, \ + const struct iovec *iovp, int iovcnt, \ + unsigned long off_lo, unsigned long off_hi); } +362 STD { int|linux_sys||pwritev(int fd, \ + const struct iovcnt *iovp, int iovcnt, \ + unsigned long off_lo, unsigned long off_hi); } 363 UNIMPL rt_tgsigqueueinfo 364 UNIMPL perf_counter_open 365 STD { int|linux_sys||recvmmsg(int s, \ diff --git a/sys/compat/linux/arch/i386/syscalls.master b/sys/compat/linux/arch/i386/syscalls.master index 9458f6e6c60..3b563dcd9d2 100644 --- a/sys/compat/linux/arch/i386/syscalls.master +++ b/sys/compat/linux/arch/i386/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.127 2021/09/20 00:09:01 thorpej Exp $ + $NetBSD: syscalls.master,v 1.128 2021/09/20 02:20:02 thorpej Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -546,8 +546,12 @@ 330 STD { int|linux_sys||dup3(int from, int to, int flags); } 331 STD { int|linux_sys||pipe2( int *pfds, int flags); } 332 UNIMPL inotify_init1 -333 UNIMPL preadv -334 UNIMPL pwritev +333 STD { int|linux_sys||preadv(int fd, \ + const struct iovec *iovp, int iovcnt, \ + unsigned long off_lo, unsigned long off_hi); } +334 STD { int|linux_sys||pwritev(int fd, \ + const struct iovcnt *iovp, int iovcnt, \ + unsigned long off_lo, unsigned long off_hi); } 335 UNIMPL rt_tgsigqueueinfo 336 UNIMPL perf_counter_open 337 UNIMPL recvmmsg diff --git a/sys/compat/linux/arch/m68k/syscalls.master b/sys/compat/linux/arch/m68k/syscalls.master index f68d254ffe7..7221ef436be 100644 --- a/sys/compat/linux/arch/m68k/syscalls.master +++ b/sys/compat/linux/arch/m68k/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.98 2021/09/20 00:09:01 thorpej Exp $ + $NetBSD: syscalls.master,v 1.99 2021/09/20 02:20:02 thorpej Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -564,8 +564,12 @@ 326 STD { int|linux_sys||dup3(int from, int to, int flags); } 327 STD { int|linux_sys||pipe2(int *pfds, int flags); } 328 UNIMPL inotify_init1 -329 UNIMPL preadv -330 UNIMPL pwritev +329 STD { int|linux_sys||preadv(int fd, \ + const struct iovec *iovp, int iovcnt, \ + unsigned long off_lo, unsigned long off_hi); } +330 STD { int|linux_sys||pwritev(int fd, \ + const struct iovcnt *iovp, int iovcnt, \ + unsigned long off_lo, unsigned long off_hi); } 331 UNIMPL rt_tgsigqueueinfo 332 UNIMPL perf_counter_open 333 UNIMPL set_thread_area diff --git a/sys/compat/linux/arch/mips/syscalls.master b/sys/compat/linux/arch/mips/syscalls.master index fb4f0edf143..7381210a292 100644 --- a/sys/compat/linux/arch/mips/syscalls.master +++ b/sys/compat/linux/arch/mips/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.71 2021/09/20 00:09:01 thorpej Exp $ + $NetBSD: syscalls.master,v 1.72 2021/09/20 02:20:02 thorpej Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -553,8 +553,12 @@ 327 STD { int|linux_sys||dup3(int from, int to, int flags); } 328 STD { int|linux_sys||pipe2(int *pfds, int flags); } 329 UNIMPL inotify_init1 -330 UNIMPL preadv -331 UNIMPL pwritev +330 STD { int|linux_sys||preadv(int fd, \ + const struct iovec *iovp, int iovcnt, \ + unsigned long off_lo, unsigned long off_hi); } +331 STD { int|linux_sys||pwritev(int fd, \ + const struct iovcnt *iovp, int iovcnt, \ + unsigned long off_lo, unsigned long off_hi); } 332 UNIMPL rt_tgsigqueueinfo 333 UNIMPL perf_event_open 334 STD { int|linux_sys||accept4(int s, \ diff --git a/sys/compat/linux/arch/powerpc/syscalls.master b/sys/compat/linux/arch/powerpc/syscalls.master index 7bf500f0bbd..aa9a0662db9 100644 --- a/sys/compat/linux/arch/powerpc/syscalls.master +++ b/sys/compat/linux/arch/powerpc/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.77 2021/09/20 00:09:01 thorpej Exp $ + $NetBSD: syscalls.master,v 1.78 2021/09/20 02:20:02 thorpej Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -553,8 +553,12 @@ 317 STD { int|linux_sys||pipe2(int *pfds, int flags); } 318 UNIMPL inotify_init1 319 UNIMPL perf_event_open -320 UNIMPL preadv -321 UNIMPL pwritev +320 STD { int|linux_sys||preadv(int fd, \ + const struct iovec *iovp, int iovcnt, \ + unsigned long off_lo, unsigned long off_hi); } +321 STD { int|linux_sys||pwritev(int fd, \ + const struct iovcnt *iovp, int iovcnt, \ + unsigned long off_lo, unsigned long off_hi); } 322 UNIMPL rt_tgsigqueueinfo 323 UNIMPL fanotify_init 324 UNIMPL fanotify_mark diff --git a/sys/compat/linux/common/linux_file.c b/sys/compat/linux/common/linux_file.c index 36ae0e429b1..429ab4b2aab 100644 --- a/sys/compat/linux/common/linux_file.c +++ b/sys/compat/linux/common/linux_file.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_file.c,v 1.119 2021/09/07 11:43:04 riastradh Exp $ */ +/* $NetBSD: linux_file.c,v 1.120 2021/09/20 02:20:03 thorpej Exp $ */ /*- * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.119 2021/09/07 11:43:04 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.120 2021/09/20 02:20:03 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -136,6 +136,23 @@ bsd_to_linux_ioflags(int bflags) return res; } +static inline off_t +linux_hilo_to_off_t(unsigned long hi, unsigned long lo) +{ +#ifdef _LP64 + /* + * Linux discards the "hi" portion on LP64 platforms; even though + * glibc puts of the upper 32-bits of the offset into the "hi" + * argument regardless, the "lo" argument has all the bits in + * this case. + */ + (void) hi; + return (off_t)lo; +#else + return (((off_t)hi) << 32) | lo; +#endif /* _LP64 */ +} + /* * creat(2) is an obsolete function, but it's present as a Linux * system call, so let's deal with it. @@ -785,6 +802,56 @@ linux_sys_pwrite(struct lwp *l, const struct linux_sys_pwrite_args *uap, registe return sys_pwrite(l, &pra, retval); } +/* + * preadv(2) + */ +int +linux_sys_preadv(struct lwp *l, const struct linux_sys_preadv_args *uap, + register_t *retval) +{ + /* { + syscallarg(int) fd; + syscallarg(const struct iovec *) iovp; + syscallarg(int) iovcnt; + syscallarg(unsigned long) off_lo; + syscallarg(unsigned long) off_hi; + } */ + struct sys_preadv_args ua; + + SCARG(&ua, fd) = SCARG(uap, fd); + SCARG(&ua, iovp) = SCARG(uap, iovp); + SCARG(&ua, iovcnt) = SCARG(uap, iovcnt); + SCARG(&ua, PAD) = 0; + SCARG(&ua, offset) = linux_hilo_to_off_t(SCARG(uap, off_hi), + SCARG(uap, off_lo)); + return sys_preadv(l, &ua, retval); +} + +/* + * pwritev(2) + */ +int +linux_sys_pwritev(struct lwp *l, const struct linux_sys_pwritev_args *uap, + register_t *retval) +{ + /* { + syscallarg(int) fd; + syscallarg(const struct iovec *) iovp; + syscallarg(int) iovcnt; + syscallarg(unsigned long) off_lo; + syscallarg(unsigned long) off_hi; + } */ + struct sys_pwritev_args ua; + + SCARG(&ua, fd) = SCARG(uap, fd); + SCARG(&ua, iovp) = (const void *)SCARG(uap, iovp); + SCARG(&ua, iovcnt) = SCARG(uap, iovcnt); + SCARG(&ua, PAD) = 0; + SCARG(&ua, offset) = linux_hilo_to_off_t(SCARG(uap, off_hi), + SCARG(uap, off_lo)); + return sys_pwritev(l, &ua, retval); +} + int linux_sys_dup3(struct lwp *l, const struct linux_sys_dup3_args *uap, register_t *retval) |
