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 v2 11/37] linux-user/syscall: Add support for clock_gettime64/clock_settime64
Date: Tue, 17 Mar 2020 16:50:50 +0100 [thread overview]
Message-ID: <20200317155116.1227513-12-laurent@vivier.eu> (raw)
In-Reply-To: <20200317155116.1227513-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.24.1
next prev parent reply other threads:[~2020-03-17 16:04 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-17 15:50 [PULL v2 00/37] Linux user for 5.0 patches Laurent Vivier
2020-03-17 15:50 ` [PULL v2 01/37] target/i386: Renumber EXCP_SYSCALL Laurent Vivier
2020-03-17 15:50 ` [PULL v2 02/37] linux-user/i386: Split out gen_signal Laurent Vivier
2020-03-17 15:50 ` [PULL v2 03/37] linux-user/i386: Emulate x86_64 vsyscalls Laurent Vivier
2020-03-17 15:50 ` [PULL v2 04/37] linux-user: Add x86_64 vsyscall page to /proc/self/maps Laurent Vivier
2020-03-17 15:50 ` [PULL v2 05/37] linux-user: Flush out implementation of gettimeofday Laurent Vivier
2020-03-17 15:50 ` [PULL v2 06/37] linux-user: Add AT_EXECFN auxval Laurent Vivier
2020-03-17 15:50 ` [PULL v2 07/37] linux-user: do prlimit selectively Laurent Vivier
2020-03-17 15:50 ` [PULL v2 08/37] linux-user: fix socket() strace Laurent Vivier
2020-03-17 15:50 ` [PULL v2 09/37] linux-user: Update TASK_UNMAPPED_BASE for aarch64 Laurent Vivier
2020-03-17 15:50 ` [PULL v2 10/37] linux-user: Protect more syscalls Laurent Vivier
2020-03-17 15:59 ` Alistair Francis
2020-03-17 15:50 ` Laurent Vivier [this message]
2020-03-17 15:50 ` [PULL v2 12/37] linux-user/riscv: Update the syscall_nr's to the 5.5 kernel Laurent Vivier
2020-03-17 15:50 ` [PULL v2 13/37] linux-user: introduce parameters to generate syscall_nr.h Laurent Vivier
2020-03-17 15:50 ` [PULL v2 14/37] linux-user, alpha: add syscall table generation support Laurent Vivier
2020-03-17 15:50 ` [PULL v2 15/37] linux-user, hppa: " Laurent Vivier
2020-03-17 15:50 ` [PULL v2 16/37] linux-user, m68k: " Laurent Vivier
2020-03-17 15:50 ` [PULL v2 17/37] linux-user, xtensa: " Laurent Vivier
2020-03-17 15:50 ` [PULL v2 18/37] linux-user, sh4: " Laurent Vivier
2020-03-17 15:50 ` [PULL v2 19/37] linux-user, microblaze: " Laurent Vivier
2020-03-17 15:50 ` [PULL v2 20/37] linux-user, arm: " Laurent Vivier
2020-03-17 15:51 ` [PULL v2 21/37] linux-user, ppc: " Laurent Vivier
2020-03-17 15:51 ` [PULL v2 22/37] linux-user, s390x: remove syscall definitions for !TARGET_S390X Laurent Vivier
2020-03-17 15:51 ` [PULL v2 23/37] linux-user, s390x: add syscall table generation support Laurent Vivier
2020-03-17 15:51 ` [PULL v2 24/37] linux-user, sparc, sparc64: " Laurent Vivier
2020-03-17 15:51 ` [PULL v2 25/37] linux-user, x86_64, i386: cleanup TARGET_NR_arch_prctl Laurent Vivier
2020-03-17 15:51 ` [PULL v2 26/37] linux-user, i386: add syscall table generation support Laurent Vivier
2020-03-17 15:51 ` [PULL v2 27/37] linux-user, x86_64: " Laurent Vivier
2020-03-17 15:51 ` [PULL v2 28/37] linux-user, mips: " Laurent Vivier
2020-03-17 15:51 ` [PULL v2 29/37] linux-user, mips64: " Laurent Vivier
2020-03-17 15:51 ` [PULL v2 30/37] linux-user, scripts: add a script to update syscall.tbl Laurent Vivier
2020-03-17 15:51 ` [PULL v2 31/37] linux-user: update syscall.tbl from linux 0bf999f9c5e7 Laurent Vivier
2020-03-17 15:51 ` [PULL v2 32/37] linux-user,mips: move content of mips_syscall_args Laurent Vivier
2020-03-17 15:51 ` [PULL v2 33/37] linux-user,mips: update syscall-args-o32.c.inc Laurent Vivier
2020-03-17 15:51 ` [PULL v2 34/37] scripts: add a script to generate syscall_nr.h Laurent Vivier
2020-03-17 15:51 ` [PULL v2 35/37] linux-user, aarch64: sync syscall numbers with kernel v5.5 Laurent Vivier
2020-03-17 15:51 ` [PULL v2 36/37] linux-user, nios2: " Laurent Vivier
2020-03-17 15:51 ` [PULL v2 37/37] linux-user, openrisc: " Laurent Vivier
2020-03-18 13:57 ` [PULL v2 00/37] Linux user for 5.0 patches Peter Maydell
2020-03-18 14:08 ` Laurent Vivier
2020-03-18 19:46 ` Richard Henderson
2020-03-18 19:58 ` Laurent Vivier
2020-03-18 20:17 ` Richard Henderson
2020-03-18 20:23 ` Laurent Vivier
2020-03-18 20:42 ` Richard Henderson
2020-03-19 8:25 ` Laurent Vivier
2020-03-23 20:33 ` Laurent Vivier
2020-03-23 21:05 ` Richard Henderson
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=20200317155116.1227513-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).