95b7632436
- intel_iommu: Add missed reserved bit check for IEC descriptor - 9pfs: fix crash on 'Treaddir' request - s390x/ap: fix missing subsystem reset registration - qemu/bswap: Undefine CPU_CONVERT() once done - linux-user: Add missing signals in strace output - linux-user: Add missing clock_gettime64() syscall strace Signed-off-by: Gan Qixin <ganqixin@huawei.com> (cherry picked from commit 692bd89e009248b7108baa30dfb2fdeeb55a8bbd)
121 lines
4.1 KiB
Diff
121 lines
4.1 KiB
Diff
From 13cffdbd2c5074682887c27f47c81e87843e741d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=E5=88=98=E5=A9=A720201110?=
|
|
<liujing_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 13 Nov 2024 19:36:45 +0800
|
|
Subject: [PATCH] linux-user: Add missing clock_gettime64() syscall strace
|
|
|
|
Allow linux-user to strace the clock_gettime64() syscall.
|
|
This syscall is used a lot on 32-bit guest architectures which use newer
|
|
glibc versions.
|
|
|
|
Signed-off-by: Helge Deller <deller@gmx.de>
|
|
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
|
|
Message-Id: <20220918194555.83535-3-deller@gmx.de>
|
|
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
|
|
Signed-off-by: Liu Jing <liujing_yewu@cmss.chinamobile.com>
|
|
---
|
|
linux-user/strace.c | 53 ++++++++++++++++++++++++++++++++++++++++++
|
|
linux-user/strace.list | 4 ++++
|
|
2 files changed, 57 insertions(+)
|
|
|
|
diff --git a/linux-user/strace.c b/linux-user/strace.c
|
|
index 37d66d0dff..4cf0e95edb 100644
|
|
--- a/linux-user/strace.c
|
|
+++ b/linux-user/strace.c
|
|
@@ -81,6 +81,7 @@ UNUSED static void print_buf(abi_long addr, abi_long len, int last);
|
|
UNUSED static void print_raw_param(const char *, abi_long, int);
|
|
UNUSED static void print_timeval(abi_ulong, int);
|
|
UNUSED static void print_timespec(abi_ulong, int);
|
|
+UNUSED static void print_timespec64(abi_ulong, int);
|
|
UNUSED static void print_timezone(abi_ulong, int);
|
|
UNUSED static void print_itimerval(abi_ulong, int);
|
|
UNUSED static void print_number(abi_long, int);
|
|
@@ -803,6 +804,24 @@ print_syscall_ret_clock_gettime(void *cpu_env, const struct syscallname *name,
|
|
#define print_syscall_ret_clock_getres print_syscall_ret_clock_gettime
|
|
#endif
|
|
|
|
+#if defined(TARGET_NR_clock_gettime64)
|
|
+static void
|
|
+print_syscall_ret_clock_gettime64(CPUArchState *cpu_env, const struct syscallname *name,
|
|
+ abi_long ret, abi_long arg0, abi_long arg1,
|
|
+ abi_long arg2, abi_long arg3, abi_long arg4,
|
|
+ abi_long arg5)
|
|
+{
|
|
+ if (!print_syscall_err(ret)) {
|
|
+ qemu_log(TARGET_ABI_FMT_ld, ret);
|
|
+ qemu_log(" (");
|
|
+ print_timespec64(arg1, 1);
|
|
+ qemu_log(")");
|
|
+ }
|
|
+
|
|
+ qemu_log("\n");
|
|
+}
|
|
+#endif
|
|
+
|
|
#ifdef TARGET_NR_gettimeofday
|
|
static void
|
|
print_syscall_ret_gettimeofday(void *cpu_env, const struct syscallname *name,
|
|
@@ -1662,6 +1681,27 @@ print_timespec(abi_ulong ts_addr, int last)
|
|
}
|
|
}
|
|
|
|
+static void
|
|
+print_timespec64(abi_ulong ts_addr, int last)
|
|
+{
|
|
+ if (ts_addr) {
|
|
+ struct target__kernel_timespec *ts;
|
|
+
|
|
+ ts = lock_user(VERIFY_READ, ts_addr, sizeof(*ts), 1);
|
|
+ if (!ts) {
|
|
+ print_pointer(ts_addr, last);
|
|
+ return;
|
|
+ }
|
|
+ qemu_log("{tv_sec = %lld"
|
|
+ ",tv_nsec = %lld}%s",
|
|
+ (long long)tswap64(ts->tv_sec), (long long)tswap64(ts->tv_nsec),
|
|
+ get_comma(last));
|
|
+ unlock_user(ts, ts_addr, 0);
|
|
+ } else {
|
|
+ qemu_log("NULL%s", get_comma(last));
|
|
+ }
|
|
+}
|
|
+
|
|
static void
|
|
print_timezone(abi_ulong tz_addr, int last)
|
|
{
|
|
@@ -2277,6 +2317,19 @@ print_clock_gettime(void *cpu_env, const struct syscallname *name,
|
|
#define print_clock_getres print_clock_gettime
|
|
#endif
|
|
|
|
+#if defined(TARGET_NR_clock_gettime64)
|
|
+static void
|
|
+print_clock_gettime64(CPUArchState *cpu_env, const struct syscallname *name,
|
|
+ abi_long arg0, abi_long arg1, abi_long arg2,
|
|
+ abi_long arg3, abi_long arg4, abi_long arg5)
|
|
+{
|
|
+ print_syscall_prologue(name);
|
|
+ print_enums(clockids, arg0, 0);
|
|
+ print_pointer(arg1, 1);
|
|
+ print_syscall_epilogue(name);
|
|
+}
|
|
+#endif
|
|
+
|
|
#ifdef TARGET_NR_clock_settime
|
|
static void
|
|
print_clock_settime(void *cpu_env, const struct syscallname *name,
|
|
diff --git a/linux-user/strace.list b/linux-user/strace.list
|
|
index 544869f1ab..f9b3f01c6c 100644
|
|
--- a/linux-user/strace.list
|
|
+++ b/linux-user/strace.list
|
|
@@ -1674,3 +1674,7 @@
|
|
#ifdef TARGET_NR_copy_file_range
|
|
{ TARGET_NR_copy_file_range, "copy_file_range", "%s(%d,%p,%d,%p,"TARGET_ABI_FMT_lu",%u)", NULL, NULL },
|
|
#endif
|
|
+#ifdef TARGET_NR_clock_gettime64
|
|
+{ TARGET_NR_clock_gettime64, "clock_gettime64" , NULL, print_clock_gettime64,
|
|
+ print_syscall_ret_clock_gettime64 },
|
|
+#endif
|
|
--
|
|
2.33.0
|
|
|