qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Riku Voipio <riku.voipio@iki.fi>,
	Alistair Francis <alistair.francis@wdc.com>,
	Laurent Vivier <laurent@vivier.eu>
Subject: [PULL v3 11/16] linux-user/syscall: Add support for clock_gettime64/clock_settime64
Date: Thu, 19 Mar 2020 10:26:22 +0100	[thread overview]
Message-ID: <20200319092627.51487-12-laurent@vivier.eu> (raw)
In-Reply-To: <20200319092627.51487-1-laurent@vivier.eu>

From: Alistair Francis <alistair.francis@wdc.com>

Add support for the clock_gettime64/clock_settime64 syscalls.

If your host is 64-bit or is 32-bit with the *_time64 syscall then the
timespec will correctly be a 64-bit time_t. Otherwise the host will
return a 32-bit time_t which will be rounded to 64-bits. This will be
incorrect after y2038.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <4a7fd05532400d10aa0f684c9043e2ac7b34d91c.1584051142.git.alistair.francis@wdc.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/syscall.c | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ea1c84dc5de5..661404687080 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1229,6 +1229,22 @@ static inline abi_long target_to_host_timespec(struct timespec *host_ts,
 }
 #endif
 
+#if defined(TARGET_NR_clock_settime64)
+static inline abi_long target_to_host_timespec64(struct timespec *host_ts,
+                                                 abi_ulong target_addr)
+{
+    struct target__kernel_timespec *target_ts;
+
+    if (!lock_user_struct(VERIFY_READ, target_ts, target_addr, 1)) {
+        return -TARGET_EFAULT;
+    }
+    __get_user(host_ts->tv_sec, &target_ts->tv_sec);
+    __get_user(host_ts->tv_nsec, &target_ts->tv_nsec);
+    unlock_user_struct(target_ts, target_addr, 0);
+    return 0;
+}
+#endif
+
 static inline abi_long host_to_target_timespec(abi_ulong target_addr,
                                                struct timespec *host_ts)
 {
@@ -11493,6 +11509,18 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
         return ret;
     }
 #endif
+#ifdef TARGET_NR_clock_settime64
+    case TARGET_NR_clock_settime64:
+    {
+        struct timespec ts;
+
+        ret = target_to_host_timespec64(&ts, arg2);
+        if (!is_error(ret)) {
+            ret = get_errno(clock_settime(arg1, &ts));
+        }
+        return ret;
+    }
+#endif
 #ifdef TARGET_NR_clock_gettime
     case TARGET_NR_clock_gettime:
     {
@@ -11504,6 +11532,17 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
         return ret;
     }
 #endif
+#ifdef TARGET_NR_clock_gettime64
+    case TARGET_NR_clock_gettime64:
+    {
+        struct timespec ts;
+        ret = get_errno(clock_gettime(arg1, &ts));
+        if (!is_error(ret)) {
+            ret = host_to_target_timespec64(arg2, &ts);
+        }
+        return ret;
+    }
+#endif
 #ifdef TARGET_NR_clock_getres
     case TARGET_NR_clock_getres:
     {
-- 
2.25.1



  parent reply	other threads:[~2020-03-19  9:31 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-19  9:26 [PULL v3 00/16] Linux user for 5.0 patches Laurent Vivier
2020-03-19  9:26 ` [PULL v3 01/16] target/i386: Renumber EXCP_SYSCALL Laurent Vivier
2020-03-19  9:26 ` [PULL v3 02/16] linux-user/i386: Split out gen_signal Laurent Vivier
2020-03-19  9:26 ` [PULL v3 03/16] linux-user/i386: Emulate x86_64 vsyscalls Laurent Vivier
2020-03-19  9:26 ` [PULL v3 04/16] linux-user: Add x86_64 vsyscall page to /proc/self/maps Laurent Vivier
2020-03-19  9:26 ` [PULL v3 05/16] linux-user: Flush out implementation of gettimeofday Laurent Vivier
2020-03-19  9:26 ` [PULL v3 06/16] linux-user: Add AT_EXECFN auxval Laurent Vivier
2020-03-19  9:26 ` [PULL v3 07/16] linux-user: do prlimit selectively Laurent Vivier
2020-03-19  9:26 ` [PULL v3 08/16] linux-user: fix socket() strace Laurent Vivier
2020-03-19  9:26 ` [PULL v3 09/16] linux-user: Update TASK_UNMAPPED_BASE for aarch64 Laurent Vivier
2020-03-19  9:26 ` [PULL v3 10/16] linux-user: Protect more syscalls Laurent Vivier
2020-03-19  9:26 ` Laurent Vivier [this message]
2020-03-19  9:26 ` [PULL v3 12/16] linux-user/riscv: Update the syscall_nr's to the 5.5 kernel Laurent Vivier
2020-03-19  9:26 ` [PULL v3 13/16] scripts: add a script to generate syscall_nr.h Laurent Vivier
2020-03-19  9:26 ` [PULL v3 14/16] linux-user, aarch64: sync syscall numbers with kernel v5.5 Laurent Vivier
2020-03-19  9:26 ` [PULL v3 15/16] linux-user, nios2: " Laurent Vivier
2020-03-19  9:26 ` [PULL v3 16/16] linux-user, openrisc: " Laurent Vivier
2020-03-19 20:45 ` [PULL v3 00/16] Linux user for 5.0 patches Peter Maydell
2020-03-20  8:21   ` Laurent Vivier

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=20200319092627.51487-12-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=alistair.francis@wdc.com \
    --cc=qemu-devel@nongnu.org \
    --cc=riku.voipio@iki.fi \
    /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).