| Message ID | mvmvafah0jd.fsf@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Le 06/02/2018 à 11:31, Andreas Schwab a écrit : > No attempt is made to emulate it on the host. I don't understand what you mean here... > Signed-off-by: Andreas Schwab <schwab@suse.de> > --- > v2: fix spacing > --- > linux-user/syscall.c | 39 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index bed154139e..92b4f59c05 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c ... > +#if defined(TARGET_NR_copy_file_range) && defined(__NR_copy_file_range) > + case TARGET_NR_copy_file_range: > + { > + loff_t inoff, outoff; > + loff_t *pinoff = NULL, *poutoff = NULL; > + > + if (arg2) { > + if (get_user_u64(inoff, arg2)) { > + goto efault; > + } > + pinoff = &inoff; > + } > + if (arg4) { > + if (get_user_u64(outoff, arg4)) { > + goto efault; > + } > + poutoff = &outoff; > + } > + ret = get_errno(safe_copy_file_range(arg1, pinoff, arg3, poutoff, > + arg5, arg6)); > + if (arg2) { > + if (put_user_u64(inoff, arg2)) { > + goto efault; > + } > + } > + if (arg4) { > + if (put_user_u64(outoff, arg4)) { > + goto efault; > + } > + } According to the linux implementation, this should be something like: if (ret > 0) { if (arg2) { if (put_user_u64(inoff, arg2)) { ret = -TARGET_EFAULT; } } if (arg4) { if (put_user_u64(outoff, arg4)) { ret = -TARGET_EFAULT; } } } [TARGET_NR_splice should do this the same way] Thanks, Laurent
On Feb 15 2018, Laurent Vivier <laurent@vivier.eu> wrote: > Le 06/02/2018 à 11:31, Andreas Schwab a écrit : >> No attempt is made to emulate it on the host. > > I don't understand what you mean here... If your host doesn't have it, neither will the emulation. Andreas.
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index bed154139e..92b4f59c05 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1033,6 +1033,12 @@ safe_syscall5(int, mq_timedsend, int, mqdes, const char *, msg_ptr, safe_syscall5(int, mq_timedreceive, int, mqdes, char *, msg_ptr, size_t, len, unsigned *, prio, const struct timespec *, timeout) #endif +#if defined(TARGET_NR_copy_file_range) && defined(__NR_copy_file_range) +safe_syscall6(ssize_t, copy_file_range, int, infd, loff_t *, pinoff, + int, outfd, loff_t *, poutoff, size_t, length, + unsigned int, flags) +#endif + /* We do ioctl like this rather than via safe_syscall3 to preserve the * "third argument might be integer or pointer or not present" behaviour of * the libc function. @@ -12601,6 +12607,39 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, ret = get_errno(kcmp(arg1, arg2, arg3, arg4, arg5)); break; #endif +#if defined(TARGET_NR_copy_file_range) && defined(__NR_copy_file_range) + case TARGET_NR_copy_file_range: + { + loff_t inoff, outoff; + loff_t *pinoff = NULL, *poutoff = NULL; + + if (arg2) { + if (get_user_u64(inoff, arg2)) { + goto efault; + } + pinoff = &inoff; + } + if (arg4) { + if (get_user_u64(outoff, arg4)) { + goto efault; + } + poutoff = &outoff; + } + ret = get_errno(safe_copy_file_range(arg1, pinoff, arg3, poutoff, + arg5, arg6)); + if (arg2) { + if (put_user_u64(inoff, arg2)) { + goto efault; + } + } + if (arg4) { + if (put_user_u64(outoff, arg4)) { + goto efault; + } + } + } + break; +#endif default: unimplemented:
No attempt is made to emulate it on the host. Signed-off-by: Andreas Schwab <schwab@suse.de> --- v2: fix spacing --- linux-user/syscall.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)