* [PATCH] linux-user: Implement copy_file_range
@ 2020-11-12 11:45 Andreas Schwab
2020-12-17 11:02 ` Laurent Vivier
2020-12-17 11:13 ` Laurent Vivier
0 siblings, 2 replies; 3+ messages in thread
From: Andreas Schwab @ 2020-11-12 11:45 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Andreas Schwab <schwab@suse.de>
---
linux-user/syscall.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 3160a9ba06..c3373af4c7 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -813,6 +813,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.
@@ -13057,6 +13063,40 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
return get_errno(membarrier(arg1, arg2));
#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)) {
+ return -TARGET_EFAULT;
+ }
+ pinoff = &inoff;
+ }
+ if (arg4) {
+ if (get_user_u64(outoff, arg4)) {
+ return -TARGET_EFAULT;
+ }
+ poutoff = &outoff;
+ }
+ ret = get_errno(safe_copy_file_range(arg1, pinoff, arg3, poutoff,
+ arg5, arg6));
+ if (arg2) {
+ if (put_user_u64(inoff, arg2)) {
+ return -TARGET_EFAULT;
+ }
+ }
+ if (arg4) {
+ if (put_user_u64(outoff, arg4)) {
+ return -TARGET_EFAULT;
+ }
+ }
+ }
+ return ret;
+#endif
+
default:
qemu_log_mask(LOG_UNIMP, "Unsupported syscall: %d\n", num);
return -TARGET_ENOSYS;
--
2.29.0
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] linux-user: Implement copy_file_range
2020-11-12 11:45 [PATCH] linux-user: Implement copy_file_range Andreas Schwab
@ 2020-12-17 11:02 ` Laurent Vivier
2020-12-17 11:13 ` Laurent Vivier
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Vivier @ 2020-12-17 11:02 UTC (permalink / raw)
To: Andreas Schwab, qemu-devel
Le 12/11/2020 à 12:45, Andreas Schwab a écrit :
> Signed-off-by: Andreas Schwab <schwab@suse.de>
> ---
> linux-user/syscall.c | 40 ++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 40 insertions(+)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 3160a9ba06..c3373af4c7 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -813,6 +813,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.
> @@ -13057,6 +13063,40 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> return get_errno(membarrier(arg1, arg2));
> #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)) {
> + return -TARGET_EFAULT;
> + }
> + pinoff = &inoff;
> + }
> + if (arg4) {
> + if (get_user_u64(outoff, arg4)) {
> + return -TARGET_EFAULT;
> + }
> + poutoff = &outoff;
> + }
> + ret = get_errno(safe_copy_file_range(arg1, pinoff, arg3, poutoff,
> + arg5, arg6));
> + if (arg2) {
> + if (put_user_u64(inoff, arg2)) {
> + return -TARGET_EFAULT;
> + }
> + }
> + if (arg4) {
> + if (put_user_u64(outoff, arg4)) {
> + return -TARGET_EFAULT;
> + }
> + }
> + }
> + return ret;
> +#endif
> +
> default:
> qemu_log_mask(LOG_UNIMP, "Unsupported syscall: %d\n", num);
> return -TARGET_ENOSYS;
>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] linux-user: Implement copy_file_range
2020-11-12 11:45 [PATCH] linux-user: Implement copy_file_range Andreas Schwab
2020-12-17 11:02 ` Laurent Vivier
@ 2020-12-17 11:13 ` Laurent Vivier
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Vivier @ 2020-12-17 11:13 UTC (permalink / raw)
To: Andreas Schwab, qemu-devel
Le 12/11/2020 à 12:45, Andreas Schwab a écrit :
> Signed-off-by: Andreas Schwab <schwab@suse.de>
> ---
> linux-user/syscall.c | 40 ++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 40 insertions(+)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 3160a9ba06..c3373af4c7 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -813,6 +813,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.
> @@ -13057,6 +13063,40 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> return get_errno(membarrier(arg1, arg2));
> #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)) {
> + return -TARGET_EFAULT;
> + }
> + pinoff = &inoff;
> + }
> + if (arg4) {
> + if (get_user_u64(outoff, arg4)) {
> + return -TARGET_EFAULT;
> + }
> + poutoff = &outoff;
> + }
> + ret = get_errno(safe_copy_file_range(arg1, pinoff, arg3, poutoff,
> + arg5, arg6));
> + if (arg2) {
> + if (put_user_u64(inoff, arg2)) {
> + return -TARGET_EFAULT;
> + }
> + }
> + if (arg4) {
> + if (put_user_u64(outoff, arg4)) {
> + return -TARGET_EFAULT;
> + }
> + }
> + }
> + return ret;
> +#endif
> +
> default:
> qemu_log_mask(LOG_UNIMP, "Unsupported syscall: %d\n", num);
> return -TARGET_ENOSYS;
>
Applied to my branch linux-user-for-6.0, modified not to copy back offset when there is an error.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-17 11:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-12 11:45 [PATCH] linux-user: Implement copy_file_range Andreas Schwab
2020-12-17 11:02 ` Laurent Vivier
2020-12-17 11:13 ` Laurent Vivier
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).