* [PULL 00/12] Linux user for 5.1 patches
@ 2020-07-04 16:25 Laurent Vivier
2020-07-04 16:25 ` [PULL 01/12] target/sparc: Translate flushw opcode Laurent Vivier
` (14 more replies)
0 siblings, 15 replies; 18+ messages in thread
From: Laurent Vivier @ 2020-07-04 16:25 UTC (permalink / raw)
To: qemu-devel
Cc: Riku Voipio, Mark Cave-Ayland, Laurent Vivier, Artyom Tarasenko
The following changes since commit e7651153a8801dad6805d450ea8bef9b46c1adf5:
Merge remote-tracking branch 'remotes/amarkovic/tags/mips-gsoc-queue-jun-27-2020' into staging (2020-06-27 22:57:36 +0100)
are available in the Git repository at:
git://github.com/vivier/qemu.git tags/linux-user-for-5.1-pull-request
for you to fetch changes up to 8f902c540eccd72086e8f67d977e30e05659783f:
MAINTAINERS: update linux-user maintainer (2020-07-04 18:09:29 +0200)
----------------------------------------------------------------
linux-user pull request 2020-07-02
Update linux-user maintainer
Improve strace output for some syscalls
Display contents of ioctl() parameters
Fix sparc64 flushw operation
----------------------------------------------------------------
Chen Gang (1):
linux-user: syscall: ioctls: support DRM_IOCTL_VERSION
Filip Bozuta (8):
linux-user: Extend strace support to enable argument printing after
syscall execution
linux-user: Add strace support for a group of syscalls
linux-user: Add strace support for printing argument of syscalls used
for extended attributes
linux-user: Add strace support for printing arguments of lseek()
linux-user: Add strace support for printing arguments of
chown()/lchown()
linux-user: Add strace support for printing arguments of fallocate()
linux-user: Add thunk argument types for SIOCGSTAMP and SIOCGSTAMPNS
linux-user: Add strace support for printing arguments of ioctl()
Giuseppe Musacchio (2):
target/sparc: Translate flushw opcode
linux-user/sparc64: Fix the handling of window spill trap
Riku Voipio (1):
MAINTAINERS: update linux-user maintainer
MAINTAINERS | 3 +-
bsd-user/main.c | 6 +-
configure | 10 +
include/exec/user/thunk.h | 1 +
linux-user/ioctls.h | 17 +-
linux-user/qemu.h | 40 +++-
linux-user/sparc/cpu_loop.c | 6 +-
linux-user/strace.c | 435 +++++++++++++++++++++++++++++++-----
linux-user/strace.list | 40 ++--
linux-user/syscall.c | 136 ++++++++---
linux-user/syscall_defs.h | 15 ++
linux-user/syscall_types.h | 33 +++
target/sparc/translate.c | 2 +
thunk.c | 154 +++++++++++++
14 files changed, 782 insertions(+), 116 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PULL 01/12] target/sparc: Translate flushw opcode
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
@ 2020-07-04 16:25 ` Laurent Vivier
2020-07-04 16:25 ` [PULL 02/12] linux-user/sparc64: Fix the handling of window spill trap Laurent Vivier
` (13 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Laurent Vivier @ 2020-07-04 16:25 UTC (permalink / raw)
To: qemu-devel
Cc: Giuseppe Musacchio, Mark Cave-Ayland, Riku Voipio,
Richard Henderson, Laurent Vivier, Artyom Tarasenko
From: Giuseppe Musacchio <thatlemon@gmail.com>
The ifdef logic should unconditionally compile in the `xop == 0x2b` case
when targeting sparc64.
Signed-off-by: Giuseppe Musacchio <thatlemon@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200625091204.3186186-2-laurent@vivier.eu>
---
target/sparc/translate.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/target/sparc/translate.c b/target/sparc/translate.c
index 9416a551cf46..1a4efd4ed665 100644
--- a/target/sparc/translate.c
+++ b/target/sparc/translate.c
@@ -3663,6 +3663,8 @@ static void disas_sparc_insn(DisasContext * dc, unsigned int insn)
#endif
gen_store_gpr(dc, rd, cpu_tmp0);
break;
+#endif
+#if defined(TARGET_SPARC64) || !defined(CONFIG_USER_ONLY)
} else if (xop == 0x2b) { /* rdtbr / V9 flushw */
#ifdef TARGET_SPARC64
gen_helper_flushw(cpu_env);
--
2.26.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 02/12] linux-user/sparc64: Fix the handling of window spill trap
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
2020-07-04 16:25 ` [PULL 01/12] target/sparc: Translate flushw opcode Laurent Vivier
@ 2020-07-04 16:25 ` Laurent Vivier
2020-07-04 16:25 ` [PULL 03/12] linux-user: syscall: ioctls: support DRM_IOCTL_VERSION Laurent Vivier
` (12 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Laurent Vivier @ 2020-07-04 16:25 UTC (permalink / raw)
To: qemu-devel
Cc: Giuseppe Musacchio, Mark Cave-Ayland, Riku Voipio,
Richard Henderson, Laurent Vivier, Artyom Tarasenko
From: Giuseppe Musacchio <thatlemon@gmail.com>
Fix the handling of window spill traps by keeping cansave into account
when calculating the new CWP.
Signed-off-by: Giuseppe Musacchio <thatlemon@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200625091204.3186186-3-laurent@vivier.eu>
---
bsd-user/main.c | 6 +++++-
linux-user/sparc/cpu_loop.c | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 0bfe46cff93e..ac40d79bfaac 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -413,7 +413,11 @@ static void save_window(CPUSPARCState *env)
save_window_offset(env, cpu_cwp_dec(env, env->cwp - 2));
env->wim = new_wim;
#else
- save_window_offset(env, cpu_cwp_dec(env, env->cwp - 2));
+ /*
+ * cansave is zero if the spill trap handler is triggered by `save` and
+ * nonzero if triggered by a `flushw`
+ */
+ save_window_offset(env, cpu_cwp_dec(env, env->cwp - env->cansave - 2));
env->cansave++;
env->canrestore--;
#endif
diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c
index 7645cc04ca73..02532f198df8 100644
--- a/linux-user/sparc/cpu_loop.c
+++ b/linux-user/sparc/cpu_loop.c
@@ -69,7 +69,11 @@ static void save_window(CPUSPARCState *env)
save_window_offset(env, cpu_cwp_dec(env, env->cwp - 2));
env->wim = new_wim;
#else
- save_window_offset(env, cpu_cwp_dec(env, env->cwp - 2));
+ /*
+ * cansave is zero if the spill trap handler is triggered by `save` and
+ * nonzero if triggered by a `flushw`
+ */
+ save_window_offset(env, cpu_cwp_dec(env, env->cwp - env->cansave - 2));
env->cansave++;
env->canrestore--;
#endif
--
2.26.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 03/12] linux-user: syscall: ioctls: support DRM_IOCTL_VERSION
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
2020-07-04 16:25 ` [PULL 01/12] target/sparc: Translate flushw opcode Laurent Vivier
2020-07-04 16:25 ` [PULL 02/12] linux-user/sparc64: Fix the handling of window spill trap Laurent Vivier
@ 2020-07-04 16:25 ` Laurent Vivier
2020-07-04 16:25 ` [PULL 04/12] linux-user: Extend strace support to enable argument printing after syscall execution Laurent Vivier
` (11 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Laurent Vivier @ 2020-07-04 16:25 UTC (permalink / raw)
To: qemu-devel
Cc: Chen Gang, Riku Voipio, Mark Cave-Ayland, Laurent Vivier,
Artyom Tarasenko
From: Chen Gang <chengang@emindsoft.com.cn>
Another DRM_IOCTL_* commands will be done later.
Signed-off-by: Chen Gang <chengang@emindsoft.com.cn>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200605013221.22828-1-chengang@emindsoft.com.cn>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
configure | 10 ++++
linux-user/ioctls.h | 5 ++
linux-user/syscall.c | 98 ++++++++++++++++++++++++++++++++++++++
linux-user/syscall_defs.h | 15 ++++++
linux-user/syscall_types.h | 11 +++++
5 files changed, 139 insertions(+)
diff --git a/configure b/configure
index 4a22dcd5631d..2014c72b674d 100755
--- a/configure
+++ b/configure
@@ -3194,6 +3194,13 @@ if ! check_include "ifaddrs.h" ; then
have_ifaddrs_h=no
fi
+#########################################
+# libdrm check
+have_drm_h=no
+if check_include "libdrm/drm.h" ; then
+ have_drm_h=yes
+fi
+
##########################################
# VTE probe
@@ -7377,6 +7384,9 @@ fi
if test "$have_ifaddrs_h" = "yes" ; then
echo "HAVE_IFADDRS_H=y" >> $config_host_mak
fi
+if test "$have_drm_h" = "yes" ; then
+ echo "HAVE_DRM_H=y" >> $config_host_mak
+fi
if test "$have_broken_size_max" = "yes" ; then
echo "HAVE_BROKEN_SIZE_MAX=y" >> $config_host_mak
fi
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 0defa1d8c18d..f2e2fa9c878b 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -574,6 +574,11 @@
IOCTL_SPECIAL(SIOCDELRT, IOC_W, do_ioctl_rt,
MK_PTR(MK_STRUCT(STRUCT_rtentry)))
+#ifdef HAVE_DRM_H
+ IOCTL_SPECIAL(DRM_IOCTL_VERSION, IOC_RW, do_ioctl_drm,
+ MK_PTR(MK_STRUCT(STRUCT_drm_version)))
+#endif
+
#ifdef TARGET_TIOCSTART
IOCTL_IGNORE(TIOCSTART)
IOCTL_IGNORE(TIOCSTOP)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 97de9fb5c92a..17ed7f8d6b59 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -112,6 +112,9 @@
#include <linux/if_alg.h>
#include <linux/rtc.h>
#include <sound/asound.h>
+#ifdef HAVE_DRM_H
+#include <libdrm/drm.h>
+#endif
#include "linux_loop.h"
#include "uname.h"
@@ -5276,6 +5279,101 @@ static abi_long do_ioctl_tiocgptpeer(const IOCTLEntry *ie, uint8_t *buf_temp,
}
#endif
+#ifdef HAVE_DRM_H
+
+static void unlock_drm_version(struct drm_version *host_ver,
+ struct target_drm_version *target_ver,
+ bool copy)
+{
+ unlock_user(host_ver->name, target_ver->name,
+ copy ? host_ver->name_len : 0);
+ unlock_user(host_ver->date, target_ver->date,
+ copy ? host_ver->date_len : 0);
+ unlock_user(host_ver->desc, target_ver->desc,
+ copy ? host_ver->desc_len : 0);
+}
+
+static inline abi_long target_to_host_drmversion(struct drm_version *host_ver,
+ struct target_drm_version *target_ver)
+{
+ memset(host_ver, 0, sizeof(*host_ver));
+
+ __get_user(host_ver->name_len, &target_ver->name_len);
+ if (host_ver->name_len) {
+ host_ver->name = lock_user(VERIFY_WRITE, target_ver->name,
+ target_ver->name_len, 0);
+ if (!host_ver->name) {
+ return -EFAULT;
+ }
+ }
+
+ __get_user(host_ver->date_len, &target_ver->date_len);
+ if (host_ver->date_len) {
+ host_ver->date = lock_user(VERIFY_WRITE, target_ver->date,
+ target_ver->date_len, 0);
+ if (!host_ver->date) {
+ goto err;
+ }
+ }
+
+ __get_user(host_ver->desc_len, &target_ver->desc_len);
+ if (host_ver->desc_len) {
+ host_ver->desc = lock_user(VERIFY_WRITE, target_ver->desc,
+ target_ver->desc_len, 0);
+ if (!host_ver->desc) {
+ goto err;
+ }
+ }
+
+ return 0;
+err:
+ unlock_drm_version(host_ver, target_ver, false);
+ return -EFAULT;
+}
+
+static inline void host_to_target_drmversion(
+ struct target_drm_version *target_ver,
+ struct drm_version *host_ver)
+{
+ __put_user(host_ver->version_major, &target_ver->version_major);
+ __put_user(host_ver->version_minor, &target_ver->version_minor);
+ __put_user(host_ver->version_patchlevel, &target_ver->version_patchlevel);
+ __put_user(host_ver->name_len, &target_ver->name_len);
+ __put_user(host_ver->date_len, &target_ver->date_len);
+ __put_user(host_ver->desc_len, &target_ver->desc_len);
+ unlock_drm_version(host_ver, target_ver, true);
+}
+
+static abi_long do_ioctl_drm(const IOCTLEntry *ie, uint8_t *buf_temp,
+ int fd, int cmd, abi_long arg)
+{
+ struct drm_version *ver;
+ struct target_drm_version *target_ver;
+ abi_long ret;
+
+ switch (ie->host_cmd) {
+ case DRM_IOCTL_VERSION:
+ if (!lock_user_struct(VERIFY_WRITE, target_ver, arg, 0)) {
+ return -TARGET_EFAULT;
+ }
+ ver = (struct drm_version *)buf_temp;
+ ret = target_to_host_drmversion(ver, target_ver);
+ if (!is_error(ret)) {
+ ret = get_errno(safe_ioctl(fd, ie->host_cmd, ver));
+ if (is_error(ret)) {
+ unlock_drm_version(ver, target_ver, false);
+ } else {
+ host_to_target_drmversion(target_ver, ver);
+ }
+ }
+ unlock_user_struct(target_ver, arg, 0);
+ return ret;
+ }
+ return -TARGET_ENOSYS;
+}
+
+#endif
+
static IOCTLEntry ioctl_entries[] = {
#define IOCTL(cmd, access, ...) \
{ TARGET_ ## cmd, cmd, #cmd, access, 0, { __VA_ARGS__ } },
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 152ec637cba6..3c261cff0e5e 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -1167,6 +1167,9 @@ struct target_rtc_pll_info {
#define TARGET_DM_TARGET_MSG TARGET_IOWRU(0xfd, 0x0e)
#define TARGET_DM_DEV_SET_GEOMETRY TARGET_IOWRU(0xfd, 0x0f)
+/* drm ioctls */
+#define TARGET_DRM_IOCTL_VERSION TARGET_IOWRU('d', 0x00)
+
/* from asm/termbits.h */
#define TARGET_NCC 8
@@ -2598,6 +2601,18 @@ struct target_mq_attr {
abi_long mq_curmsgs;
};
+struct target_drm_version {
+ int version_major;
+ int version_minor;
+ int version_patchlevel;
+ abi_ulong name_len;
+ abi_ulong name;
+ abi_ulong date_len;
+ abi_ulong date;
+ abi_ulong desc_len;
+ abi_ulong desc;
+};
+
#include "socket.h"
#include "errno_defs.h"
diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
index 4e12c1661ea6..e2b0484f50e5 100644
--- a/linux-user/syscall_types.h
+++ b/linux-user/syscall_types.h
@@ -292,6 +292,17 @@ STRUCT(dm_target_versions,
STRUCT(dm_target_msg,
TYPE_ULONGLONG) /* sector */
+STRUCT(drm_version,
+ TYPE_INT, /* version_major */
+ TYPE_INT, /* version_minor */
+ TYPE_INT, /* version_patchlevel */
+ TYPE_ULONG, /* name_len */
+ TYPE_PTRVOID, /* name */
+ TYPE_ULONG, /* date_len */
+ TYPE_PTRVOID, /* date */
+ TYPE_ULONG, /* desc_len */
+ TYPE_PTRVOID) /* desc */
+
STRUCT(file_clone_range,
TYPE_LONGLONG, /* src_fd */
TYPE_ULONGLONG, /* src_offset */
--
2.26.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 04/12] linux-user: Extend strace support to enable argument printing after syscall execution
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
` (2 preceding siblings ...)
2020-07-04 16:25 ` [PULL 03/12] linux-user: syscall: ioctls: support DRM_IOCTL_VERSION Laurent Vivier
@ 2020-07-04 16:25 ` Laurent Vivier
2020-07-04 16:25 ` [PULL 05/12] linux-user: Add strace support for a group of syscalls Laurent Vivier
` (10 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Laurent Vivier @ 2020-07-04 16:25 UTC (permalink / raw)
To: qemu-devel
Cc: Filip Bozuta, Riku Voipio, Mark Cave-Ayland, Laurent Vivier,
Artyom Tarasenko
From: Filip Bozuta <Filip.Bozuta@syrmia.com>
Structure "struct syscallname" in file "strace.c" is used for "-strace"
to print arguments and return values of syscalls. The last field of
this structure "result" represents the calling function that prints the
return values. This field was extended in this patch so that this function
takes all syscalls arguments beside the return value. In this way, it enables
"-strace" to print arguments of syscalls that have changed after the syscall
execution. This extension will be useful as there are many syscalls that
return values inside their arguments (i.e. listxattr() that returns the list
of extended attributes inside the "list" argument).
Implementation notes:
Since there are already three existing "print_syscall_ret*" functions inside
"strace.c" ("print_syscall_ret_addr()", "print_syscall_ret_adjtimex()",
"print_syscall_ret_newselect()"), they were changed to have all syscall arguments
beside the return value. This was done so that these functions don't cause build
errors (even though syscall arguments are not used in these functions).
There is code repetition in these functions for checking the return value
and printing the approppriate error message (this code is also located in
print_syscall_ret() at the end of "strace.c"). That is the reason why a
function "syscall_print_err()" was added for this code and put inside these
functions. Functions "print_newselect()" and "print_syscall_ret_newselect()"
were changed to use this new implemented functionality and not store the syscall
argument values in separate static variables.
Signed-off-by: Filip Bozuta <Filip.Bozuta@syrmia.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200619123331.17387-2-filip.bozuta@syrmia.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/qemu.h | 4 +-
linux-user/strace.c | 110 ++++++++++++++++++++++---------------------
linux-user/syscall.c | 2 +-
3 files changed, 61 insertions(+), 55 deletions(-)
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index ce902f5132a6..8f938b8105b3 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -383,7 +383,9 @@ int host_to_target_waitstatus(int status);
void print_syscall(int num,
abi_long arg1, abi_long arg2, abi_long arg3,
abi_long arg4, abi_long arg5, abi_long arg6);
-void print_syscall_ret(int num, abi_long arg1);
+void print_syscall_ret(int num, abi_long ret,
+ abi_long arg1, abi_long arg2, abi_long arg3,
+ abi_long arg4, abi_long arg5, abi_long arg6);
/**
* print_taken_signal:
* @target_signum: target signal being taken
diff --git a/linux-user/strace.c b/linux-user/strace.c
index 0d9095c674f4..62117e8555f6 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -19,7 +19,9 @@ struct syscallname {
void (*call)(const struct syscallname *,
abi_long, abi_long, abi_long,
abi_long, abi_long, abi_long);
- void (*result)(const struct syscallname *, abi_long);
+ void (*result)(const struct syscallname *, abi_long,
+ abi_long, abi_long, abi_long,
+ abi_long, abi_long, abi_long);
};
#ifdef __GNUC__
@@ -631,18 +633,12 @@ print_clockid(int clockid, int last)
/* select */
#ifdef TARGET_NR__newselect
-static long newselect_arg1 = 0;
-static long newselect_arg2 = 0;
-static long newselect_arg3 = 0;
-static long newselect_arg4 = 0;
-static long newselect_arg5 = 0;
-
static void
print_newselect(const struct syscallname *name,
abi_long arg1, abi_long arg2, abi_long arg3,
abi_long arg4, abi_long arg5, abi_long arg6)
{
- qemu_log("%s(" TARGET_ABI_FMT_ld ",", name->name, arg1);
+ print_syscall_prologue(name);
print_fdset(arg1, arg2);
qemu_log(",");
print_fdset(arg1, arg3);
@@ -650,14 +646,7 @@ print_newselect(const struct syscallname *name,
print_fdset(arg1, arg4);
qemu_log(",");
print_timeval(arg5, 1);
- qemu_log(")");
-
- /* save for use in the return output function below */
- newselect_arg1=arg1;
- newselect_arg2=arg2;
- newselect_arg3=arg3;
- newselect_arg4=arg4;
- newselect_arg5=arg5;
+ print_syscall_epilogue(name);
}
#endif
@@ -736,17 +725,29 @@ print_ipc(const struct syscallname *name,
*/
static void
-print_syscall_ret_addr(const struct syscallname *name, abi_long ret)
+print_syscall_err(abi_long ret)
{
const char *errstr = NULL;
+ qemu_log(" = ");
if (ret < 0) {
+ qemu_log("-1 errno=%d", errno);
errstr = target_strerror(-ret);
+ if (errstr) {
+ qemu_log(" (%s)", errstr);
+ }
}
- if (errstr) {
- qemu_log(" = -1 errno=%d (%s)\n", (int)-ret, errstr);
- } else {
- qemu_log(" = 0x" TARGET_ABI_FMT_lx "\n", ret);
+}
+
+static void
+print_syscall_ret_addr(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)
+{
+ print_syscall_err(ret);
+
+ if (ret >= 0) {
+ qemu_log("0x" TARGET_ABI_FMT_lx "\n", ret);
}
}
@@ -760,17 +761,25 @@ print_syscall_ret_raw(struct syscallname *name, abi_long ret)
#ifdef TARGET_NR__newselect
static void
-print_syscall_ret_newselect(const struct syscallname *name, abi_long ret)
-{
- qemu_log(" = 0x" TARGET_ABI_FMT_lx " (", ret);
- print_fdset(newselect_arg1,newselect_arg2);
- qemu_log(",");
- print_fdset(newselect_arg1,newselect_arg3);
- qemu_log(",");
- print_fdset(newselect_arg1,newselect_arg4);
- qemu_log(",");
- print_timeval(newselect_arg5, 1);
- qemu_log(")\n");
+print_syscall_ret_newselect(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)
+{
+ print_syscall_err(ret);
+
+ if (ret >= 0) {
+ qemu_log(" = 0x" TARGET_ABI_FMT_lx " (", ret);
+ print_fdset(arg0, arg1);
+ qemu_log(",");
+ print_fdset(arg0, arg2);
+ qemu_log(",");
+ print_fdset(arg0, arg3);
+ qemu_log(",");
+ print_timeval(arg4, 1);
+ qemu_log(")");
+ }
+
+ qemu_log("\n");
}
#endif
@@ -783,18 +792,13 @@ print_syscall_ret_newselect(const struct syscallname *name, abi_long ret)
#define TARGET_TIME_ERROR 5 /* clock not synchronized */
#ifdef TARGET_NR_adjtimex
static void
-print_syscall_ret_adjtimex(const struct syscallname *name, abi_long ret)
+print_syscall_ret_adjtimex(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)
{
- const char *errstr = NULL;
+ print_syscall_err(ret);
- qemu_log(" = ");
- if (ret < 0) {
- qemu_log("-1 errno=%d", errno);
- errstr = target_strerror(-ret);
- if (errstr) {
- qemu_log(" (%s)", errstr);
- }
- } else {
+ if (ret >= 0) {
qemu_log(TARGET_ABI_FMT_ld, ret);
switch (ret) {
case TARGET_TIME_OK:
@@ -2847,25 +2851,25 @@ print_syscall(int num,
void
-print_syscall_ret(int num, abi_long ret)
+print_syscall_ret(int num, abi_long ret,
+ abi_long arg1, abi_long arg2, abi_long arg3,
+ abi_long arg4, abi_long arg5, abi_long arg6)
{
int i;
- const char *errstr = NULL;
for(i=0;i<nsyscalls;i++)
if( scnames[i].nr == num ) {
if( scnames[i].result != NULL ) {
- scnames[i].result(&scnames[i], ret);
+ scnames[i].result(&scnames[i], ret,
+ arg1, arg2, arg3,
+ arg4, arg5, arg6);
} else {
- if (ret < 0) {
- errstr = target_strerror(-ret);
- }
- if (errstr) {
- qemu_log(" = -1 errno=" TARGET_ABI_FMT_ld " (%s)\n",
- -ret, errstr);
- } else {
- qemu_log(" = " TARGET_ABI_FMT_ld "\n", ret);
+ print_syscall_err(ret);
+
+ if (ret >= 0) {
+ qemu_log(TARGET_ABI_FMT_ld, ret);
}
+ qemu_log("\n");
}
break;
}
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 17ed7f8d6b59..1b971c06b270 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -12565,7 +12565,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
arg5, arg6, arg7, arg8);
if (unlikely(qemu_loglevel_mask(LOG_STRACE))) {
- print_syscall_ret(num, ret);
+ print_syscall_ret(num, ret, arg1, arg2, arg3, arg4, arg5, arg6);
}
record_syscall_return(cpu, num, ret);
--
2.26.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 05/12] linux-user: Add strace support for a group of syscalls
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
` (3 preceding siblings ...)
2020-07-04 16:25 ` [PULL 04/12] linux-user: Extend strace support to enable argument printing after syscall execution Laurent Vivier
@ 2020-07-04 16:25 ` Laurent Vivier
2020-07-04 16:25 ` [PULL 06/12] linux-user: Add strace support for printing argument of syscalls used for extended attributes Laurent Vivier
` (9 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Laurent Vivier @ 2020-07-04 16:25 UTC (permalink / raw)
To: qemu-devel
Cc: Filip Bozuta, Riku Voipio, Mark Cave-Ayland, Laurent Vivier,
Artyom Tarasenko
From: Filip Bozuta <Filip.Bozuta@syrmia.com>
This patch implements strace argument printing functionality for following syscalls:
*acct - switch process accounting on or off
int acct(const char *filename)
man page: https://www.man7.org/linux/man-pages/man2/acct.2.html
*fsync, fdatasync - synchronize a file's in-core state with storage device
int fsync(int fd)
int fdatasync(int fd)
man page: https://www.man7.org/linux/man-pages/man2/fsync.2.html
*listen - listen for connections on a socket
int listen(int sockfd, int backlog)
man page: https://www.man7.org/linux/man-pages/man2/listen.2.html
Implementation notes:
Syscall acct() takes string as its only argument and thus a separate
print function "print_acct" is stated in file "strace.list". This
function is defined and implemented in "strace.c" by using an
existing function used to print string arguments: "print_string()".
All the other syscalls have only primitive argument types, so the
rest of the implementation was handled by stating an appropriate
printing format in file "strace.list".
Signed-off-by: Filip Bozuta <Filip.Bozuta@syrmia.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200619123331.17387-3-filip.bozuta@syrmia.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/strace.c | 13 ++++++++++++-
linux-user/strace.list | 8 ++++----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/linux-user/strace.c b/linux-user/strace.c
index 62117e8555f6..123e022c35bf 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -1357,6 +1357,18 @@ print_access(const struct syscallname *name,
}
#endif
+#ifdef TARGET_NR_acct
+static void
+print_acct(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_string(arg0, 1);
+ print_syscall_epilogue(name);
+}
+#endif
+
#ifdef TARGET_NR_brk
static void
print_brk(const struct syscallname *name,
@@ -1621,7 +1633,6 @@ print_fcntl(const struct syscallname *name,
#define print_fcntl64 print_fcntl
#endif
-
#ifdef TARGET_NR_futimesat
static void
print_futimesat(const struct syscallname *name,
diff --git a/linux-user/strace.list b/linux-user/strace.list
index 9281c0a75828..8a887fc16dcc 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -13,7 +13,7 @@
{ TARGET_NR_access, "access" , NULL, print_access, NULL },
#endif
#ifdef TARGET_NR_acct
-{ TARGET_NR_acct, "acct" , NULL, NULL, NULL },
+{ TARGET_NR_acct, "acct" , NULL, print_acct, NULL },
#endif
#ifdef TARGET_NR_add_key
{ TARGET_NR_add_key, "add_key" , NULL, NULL, NULL },
@@ -215,7 +215,7 @@
{ TARGET_NR_fcntl64, "fcntl64" , NULL, print_fcntl64, NULL },
#endif
#ifdef TARGET_NR_fdatasync
-{ TARGET_NR_fdatasync, "fdatasync" , NULL, NULL, NULL },
+{ TARGET_NR_fdatasync, "fdatasync" , "%s(%d)", NULL, NULL },
#endif
#ifdef TARGET_NR_fgetxattr
{ TARGET_NR_fgetxattr, "fgetxattr" , NULL, NULL, NULL },
@@ -251,7 +251,7 @@
{ TARGET_NR_fstatfs64, "fstatfs64" , "%s(%d,%p)", NULL, NULL },
#endif
#ifdef TARGET_NR_fsync
-{ TARGET_NR_fsync, "fsync" , NULL, NULL, NULL },
+{ TARGET_NR_fsync, "fsync" , "%s(%d)", NULL, NULL },
#endif
#ifdef TARGET_NR_ftime
{ TARGET_NR_ftime, "ftime" , NULL, NULL, NULL },
@@ -492,7 +492,7 @@
{ TARGET_NR_Linux, "Linux" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_listen
-{ TARGET_NR_listen, "listen" , NULL, NULL, NULL },
+{ TARGET_NR_listen, "listen" , "%s(%d,%d)", NULL, NULL },
#endif
#ifdef TARGET_NR_listxattr
{ TARGET_NR_listxattr, "listxattr" , NULL, NULL, NULL },
--
2.26.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 06/12] linux-user: Add strace support for printing argument of syscalls used for extended attributes
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
` (4 preceding siblings ...)
2020-07-04 16:25 ` [PULL 05/12] linux-user: Add strace support for a group of syscalls Laurent Vivier
@ 2020-07-04 16:25 ` Laurent Vivier
2020-07-04 16:25 ` [PULL 07/12] linux-user: Add strace support for printing arguments of lseek() Laurent Vivier
` (8 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Laurent Vivier @ 2020-07-04 16:25 UTC (permalink / raw)
To: qemu-devel
Cc: Filip Bozuta, Riku Voipio, Mark Cave-Ayland, Laurent Vivier,
Artyom Tarasenko
From: Filip Bozuta <Filip.Bozuta@syrmia.com>
This patch implements strace argument printing functionality for following syscalls:
*getxattr, lgetxattr, fgetxattr - retrieve an extended attribute value
ssize_t getxattr(const char *path, const char *name, void *value, size_t size)
ssize_t lgetxattr(const char *path, const char *name, void *value, size_t size)
ssize_t fgetxattr(int fd, const char *name, void *value, size_t size)
man page: https://www.man7.org/linux/man-pages/man2/getxattr.2.html
*listxattr, llistxattr, flistxattr - list extended attribute names
ssize_t listxattr(const char *path, char *list, size_t size)
ssize_t llistxattr(const char *path, char *list, size_t size)
ssize_t flistxattr(int fd, char *list, size_t size)
man page: https://www.man7.org/linux/man-pages/man2/listxattr.2.html
*removexattr, lremovexattr, fremovexattr - remove an extended attribute
int removexattr(const char *path, const char *name)
int lremovexattr(const char *path, const char *name)
int fremovexattr(int fd, const char *name)
man page: https://www.man7.org/linux/man-pages/man2/removexattr.2.html
Implementation notes:
All of the syscalls have strings as argument types and thus a separate
printing function was stated in file "strace.list" for every one of them.
All of these printing functions were defined in "strace.c" using existing
printing functions for appropriate argument types:
"print_string()" - for (const char*) type
"print_pointer()" - for (char*) and (void *) type
"print_raw_param()" for (int) and (size_t) type
Syscalls "getxattr()" and "lgetxattr()" have the same number and type of
arguments and thus their print functions ("print_getxattr", "print_lgetxattr")
share a same definition. The same statement applies to syscalls "listxattr()"
and "llistxattr()".
Function "print_syscall_ret_listxattr()" was added to print the returned list
of extended attributes for syscalls "print_listxattr(), print_llistxattr() and
print_flistxattr()".
Signed-off-by: Filip Bozuta <Filip.Bozuta@syrmia.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200619123331.17387-4-filip.bozuta@syrmia.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/strace.c | 121 +++++++++++++++++++++++++++++++++++++++++
linux-user/strace.list | 21 ++++---
2 files changed, 133 insertions(+), 9 deletions(-)
diff --git a/linux-user/strace.c b/linux-user/strace.c
index 123e022c35bf..760020132b5a 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -826,6 +826,40 @@ print_syscall_ret_adjtimex(const struct syscallname *name, abi_long ret,
}
#endif
+#if defined(TARGET_NR_listxattr) || defined(TARGET_NR_llistxattr) \
+ || defined(TARGGET_NR_flistxattr)
+static void
+print_syscall_ret_listxattr(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)
+{
+ print_syscall_err(ret);
+
+ if (ret >= 0) {
+ qemu_log(TARGET_ABI_FMT_ld, ret);
+ qemu_log(" (list = ");
+ if (arg1 != 0) {
+ abi_long attr = arg1;
+ while (ret) {
+ if (attr != arg1) {
+ qemu_log(",");
+ }
+ print_string(attr, 1);
+ ret -= target_strlen(attr) + 1;
+ attr += target_strlen(attr) + 1;
+ }
+ } else {
+ qemu_log("NULL");
+ }
+ qemu_log(")");
+ }
+
+ qemu_log("\n");
+}
+#define print_syscall_ret_llistxattr print_syscall_ret_listxattr
+#define print_syscall_ret_flistxattr print_syscall_ret_listxattr
+#endif
+
UNUSED static struct flags access_flags[] = {
FLAG_GENERIC(F_OK),
FLAG_GENERIC(R_OK),
@@ -1633,6 +1667,93 @@ print_fcntl(const struct syscallname *name,
#define print_fcntl64 print_fcntl
#endif
+#ifdef TARGET_NR_fgetxattr
+static void
+print_fgetxattr(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_raw_param("%d", arg0, 0);
+ print_string(arg1, 0);
+ print_pointer(arg2, 0);
+ print_raw_param(TARGET_FMT_lu, arg3, 1);
+ print_syscall_epilogue(name);
+}
+#endif
+
+#ifdef TARGET_NR_flistxattr
+static void
+print_flistxattr(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_raw_param("%d", arg0, 0);
+ print_pointer(arg1, 0);
+ print_raw_param(TARGET_FMT_lu, arg2, 1);
+ print_syscall_epilogue(name);
+}
+#endif
+
+#if defined(TARGET_NR_getxattr) || defined(TARGET_NR_lgetxattr)
+static void
+print_getxattr(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_string(arg0, 0);
+ print_string(arg1, 0);
+ print_pointer(arg2, 0);
+ print_raw_param(TARGET_FMT_lu, arg3, 1);
+ print_syscall_epilogue(name);
+}
+#define print_lgetxattr print_getxattr
+#endif
+
+#if defined(TARGET_NR_listxattr) || defined(TARGET_NR_llistxattr)
+static void
+print_listxattr(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_string(arg0, 0);
+ print_pointer(arg1, 0);
+ print_raw_param(TARGET_FMT_lu, arg2, 1);
+ print_syscall_epilogue(name);
+}
+#define print_llistxattr print_listxattr
+#endif
+
+#if defined(TARGET_NR_fremovexattr)
+static void
+print_fremovexattr(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_raw_param("%d", arg0, 0);
+ print_string(arg1, 1);
+ print_syscall_epilogue(name);
+}
+#endif
+
+#if defined(TARGET_NR_removexattr) || defined(TARGET_NR_lremovexattr)
+static void
+print_removexattr(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_string(arg0, 0);
+ print_string(arg1, 1);
+ print_syscall_epilogue(name);
+}
+#define print_lremovexattr print_removexattr
+#endif
+
#ifdef TARGET_NR_futimesat
static void
print_futimesat(const struct syscallname *name,
diff --git a/linux-user/strace.list b/linux-user/strace.list
index 8a887fc16dcc..d04ad507b0fb 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -218,13 +218,14 @@
{ TARGET_NR_fdatasync, "fdatasync" , "%s(%d)", NULL, NULL },
#endif
#ifdef TARGET_NR_fgetxattr
-{ TARGET_NR_fgetxattr, "fgetxattr" , NULL, NULL, NULL },
+{ TARGET_NR_fgetxattr, "fgetxattr" , NULL, print_fgetxattr, NULL },
#endif
#ifdef TARGET_NR_finit_module
{ TARGET_NR_finit_module, "finit_module" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_flistxattr
-{ TARGET_NR_flistxattr, "flistxattr" , NULL, NULL, NULL },
+{ TARGET_NR_flistxattr, "flistxattr" , NULL, print_flistxattr,
+ print_syscall_ret_flistxattr},
#endif
#ifdef TARGET_NR_flock
{ TARGET_NR_flock, "flock" , NULL, NULL, NULL },
@@ -233,7 +234,7 @@
{ TARGET_NR_fork, "fork" , "%s()", NULL, NULL },
#endif
#ifdef TARGET_NR_fremovexattr
-{ TARGET_NR_fremovexattr, "fremovexattr" , NULL, NULL, NULL },
+{ TARGET_NR_fremovexattr, "fremovexattr" , NULL, print_fremovexattr, NULL },
#endif
#ifdef TARGET_NR_fsetxattr
{ TARGET_NR_fsetxattr, "fsetxattr" , NULL, NULL, NULL },
@@ -396,7 +397,7 @@
{ TARGET_NR_getuid32, "getuid32" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_getxattr
-{ TARGET_NR_getxattr, "getxattr" , NULL, NULL, NULL },
+{ TARGET_NR_getxattr, "getxattr" , NULL, print_getxattr, NULL },
#endif
#ifdef TARGET_NR_getxgid
{ TARGET_NR_getxgid, "getxgid" , NULL, NULL, NULL },
@@ -480,7 +481,7 @@
{ TARGET_NR_lchown32, "lchown32" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_lgetxattr
-{ TARGET_NR_lgetxattr, "lgetxattr" , NULL, NULL, NULL },
+{ TARGET_NR_lgetxattr, "lgetxattr" , NULL, print_lgetxattr, NULL },
#endif
#ifdef TARGET_NR_link
{ TARGET_NR_link, "link" , NULL, print_link, NULL },
@@ -495,10 +496,12 @@
{ TARGET_NR_listen, "listen" , "%s(%d,%d)", NULL, NULL },
#endif
#ifdef TARGET_NR_listxattr
-{ TARGET_NR_listxattr, "listxattr" , NULL, NULL, NULL },
+{ TARGET_NR_listxattr, "listxattr" , NULL, print_listxattr,
+ print_syscall_ret_listxattr},
#endif
#ifdef TARGET_NR_llistxattr
-{ TARGET_NR_llistxattr, "llistxattr" , NULL, NULL, NULL },
+{ TARGET_NR_llistxattr, "llistxattr" , NULL, print_llistxattr,
+ print_syscall_ret_llistxattr},
#endif
#ifdef TARGET_NR__llseek
{ TARGET_NR__llseek, "_llseek" , NULL, print__llseek, NULL },
@@ -510,7 +513,7 @@
{ TARGET_NR_lookup_dcookie, "lookup_dcookie" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_lremovexattr
-{ TARGET_NR_lremovexattr, "lremovexattr" , NULL, NULL, NULL },
+{ TARGET_NR_lremovexattr, "lremovexattr" , NULL, print_lremovexattr, NULL },
#endif
#ifdef TARGET_NR_lseek
{ TARGET_NR_lseek, "lseek" , NULL, NULL, NULL },
@@ -1116,7 +1119,7 @@
{ TARGET_NR_remap_file_pages, "remap_file_pages" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_removexattr
-{ TARGET_NR_removexattr, "removexattr" , NULL, NULL, NULL },
+{ TARGET_NR_removexattr, "removexattr" , NULL, print_removexattr, NULL },
#endif
#ifdef TARGET_NR_rename
{ TARGET_NR_rename, "rename" , NULL, print_rename, NULL },
--
2.26.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 07/12] linux-user: Add strace support for printing arguments of lseek()
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
` (5 preceding siblings ...)
2020-07-04 16:25 ` [PULL 06/12] linux-user: Add strace support for printing argument of syscalls used for extended attributes Laurent Vivier
@ 2020-07-04 16:25 ` Laurent Vivier
2020-07-04 16:25 ` [PULL 08/12] linux-user: Add strace support for printing arguments of chown()/lchown() Laurent Vivier
` (7 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Laurent Vivier @ 2020-07-04 16:25 UTC (permalink / raw)
To: qemu-devel
Cc: Filip Bozuta, Riku Voipio, Mark Cave-Ayland, Laurent Vivier,
Artyom Tarasenko
From: Filip Bozuta <Filip.Bozuta@syrmia.com>
This patch implements strace argument printing functionality for syscall:
*lseek - reposition read/write file offset
off_t lseek(int fd, off_t offset, int whence)
man page: https://www.man7.org/linux/man-pages/man2/lseek.2.html
Implementation notes:
The syscall's third argument "whence" has predefined values:
"SEEK_SET","SEEK_CUR","SEEK_END","SEEK_DATA","SEEK_HOLE"
and thus a separate printing function "print_lseek" was stated
in file "strace.list". This function is defined in "strace.c"
by using an existing function "print_raw_param()" to print
the first and second argument and a switch(case) statement
for the predefined values of the third argument.
Values "SEEK_DATA" and "SEEK_HOLE" are defined in kernel version 3.1.
That is the reason why case statements for these values are
enwrapped in #ifdef directive.
Signed-off-by: Filip Bozuta <Filip.Bozuta@syrmia.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200619123331.17387-5-filip.bozuta@syrmia.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/strace.c | 31 +++++++++++++++++++++++++++++++
linux-user/strace.list | 2 +-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/linux-user/strace.c b/linux-user/strace.c
index 760020132b5a..a26736516bab 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -1833,6 +1833,37 @@ print__llseek(const struct syscallname *name,
}
#endif
+#ifdef TARGET_NR_lseek
+static void
+print_lseek(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_raw_param("%d", arg0, 0);
+ print_raw_param(TARGET_ABI_FMT_ld, arg1, 0);
+ switch (arg2) {
+ case SEEK_SET:
+ qemu_log("SEEK_SET"); break;
+ case SEEK_CUR:
+ qemu_log("SEEK_CUR"); break;
+ case SEEK_END:
+ qemu_log("SEEK_END"); break;
+#ifdef SEEK_DATA
+ case SEEK_DATA:
+ qemu_log("SEEK_DATA"); break;
+#endif
+#ifdef SEEK_HOLE
+ case SEEK_HOLE:
+ qemu_log("SEEK_HOLE"); break;
+#endif
+ default:
+ print_raw_param("%#x", arg2, 1);
+ }
+ print_syscall_epilogue(name);
+}
+#endif
+
#if defined(TARGET_NR_socket)
static void
print_socket(const struct syscallname *name,
diff --git a/linux-user/strace.list b/linux-user/strace.list
index d04ad507b0fb..a4a8c61969cd 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -516,7 +516,7 @@
{ TARGET_NR_lremovexattr, "lremovexattr" , NULL, print_lremovexattr, NULL },
#endif
#ifdef TARGET_NR_lseek
-{ TARGET_NR_lseek, "lseek" , NULL, NULL, NULL },
+{ TARGET_NR_lseek, "lseek" , NULL, print_lseek, NULL },
#endif
#ifdef TARGET_NR_lsetxattr
{ TARGET_NR_lsetxattr, "lsetxattr" , NULL, NULL, NULL },
--
2.26.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 08/12] linux-user: Add strace support for printing arguments of chown()/lchown()
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
` (6 preceding siblings ...)
2020-07-04 16:25 ` [PULL 07/12] linux-user: Add strace support for printing arguments of lseek() Laurent Vivier
@ 2020-07-04 16:25 ` Laurent Vivier
2020-07-04 16:25 ` [PULL 09/12] linux-user: Add strace support for printing arguments of fallocate() Laurent Vivier
` (6 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Laurent Vivier @ 2020-07-04 16:25 UTC (permalink / raw)
To: qemu-devel
Cc: Filip Bozuta, Riku Voipio, Mark Cave-Ayland, Laurent Vivier,
Artyom Tarasenko
From: Filip Bozuta <Filip.Bozuta@syrmia.com>
This patch implements strace argument printing functionality for syscalls:
*chown, lchown - change ownership of a file
int chown(const char *pathname, uid_t owner, gid_t group)
int lchown(const char *pathname, uid_t owner, gid_t group)
man page: https://www.man7.org/linux/man-pages/man2/lchown.2.html
Implementation notes:
Both syscalls use strings as arguments and thus a separate
printing function was stated in "strace.list" for them.
Both syscalls share the same number and types of arguments
and thus share a same definition in file "syscall.c".
This defintion uses existing functions "print_string()" to
print the string argument and "print_raw_param()" to print
other two arguments that are of basic types.
Signed-off-by: Filip Bozuta <Filip.Bozuta@syrmia.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200619123331.17387-6-filip.bozuta@syrmia.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/strace.c | 15 +++++++++++++++
linux-user/strace.list | 4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/linux-user/strace.c b/linux-user/strace.c
index a26736516bab..957f08f1adf2 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -1452,6 +1452,21 @@ print_chmod(const struct syscallname *name,
}
#endif
+#if defined(TARGET_NR_chown) || defined(TARGET_NR_lchown)
+static void
+print_chown(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_string(arg0, 0);
+ print_raw_param("%d", arg1, 0);
+ print_raw_param("%d", arg2, 1);
+ print_syscall_epilogue(name);
+}
+#define print_lchown print_chown
+#endif
+
#ifdef TARGET_NR_clock_adjtime
static void
print_clock_adjtime(const struct syscallname *name,
diff --git a/linux-user/strace.list b/linux-user/strace.list
index a4a8c61969cd..e99030c9ef39 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -71,7 +71,7 @@
{ TARGET_NR_chmod, "chmod" , NULL, print_chmod, NULL },
#endif
#ifdef TARGET_NR_chown
-{ TARGET_NR_chown, "chown" , NULL, NULL, NULL },
+{ TARGET_NR_chown, "chown" , NULL, print_chown, NULL },
#endif
#ifdef TARGET_NR_chown32
{ TARGET_NR_chown32, "chown32" , NULL, NULL, NULL },
@@ -475,7 +475,7 @@
{ TARGET_NR_kill, "kill", NULL, print_kill, NULL },
#endif
#ifdef TARGET_NR_lchown
-{ TARGET_NR_lchown, "lchown" , NULL, NULL, NULL },
+{ TARGET_NR_lchown, "lchown" , NULL, print_lchown, NULL },
#endif
#ifdef TARGET_NR_lchown32
{ TARGET_NR_lchown32, "lchown32" , NULL, NULL, NULL },
--
2.26.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 09/12] linux-user: Add strace support for printing arguments of fallocate()
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
` (7 preceding siblings ...)
2020-07-04 16:25 ` [PULL 08/12] linux-user: Add strace support for printing arguments of chown()/lchown() Laurent Vivier
@ 2020-07-04 16:25 ` Laurent Vivier
2020-07-04 16:25 ` [PULL 10/12] linux-user: Add thunk argument types for SIOCGSTAMP and SIOCGSTAMPNS Laurent Vivier
` (5 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Laurent Vivier @ 2020-07-04 16:25 UTC (permalink / raw)
To: qemu-devel
Cc: Filip Bozuta, Riku Voipio, Mark Cave-Ayland, Laurent Vivier,
Artyom Tarasenko
From: Filip Bozuta <Filip.Bozuta@syrmia.com>
This patch implements strace argument printing functionality for following syscall:
*fallocate - manipulate file space
int fallocate(int fd, int mode, off_t offset, off_t len)
man page: https://www.man7.org/linux/man-pages/man2/fallocate.2.html
Implementation notes:
This syscall's second argument "mode" is composed of predefined values
which represent flags that determine the type of operation that is
to be performed on the file space. For that reason, a printing
function "print_fallocate" was stated in file "strace.list". This printing
function uses an already existing function "print_flags()" to print flags of
the "mode" argument. These flags are stated inside an array "falloc_flags"
that contains values of type "struct flags". These values are instantiated
using an existing macro "FLAG_GENERIC()". Most of these flags are defined
after kernel version 3.0 which is why they are enwrapped in an #ifdef
directive.
The syscall's third ant fourth argument are of type "off_t" which can
cause variations between 32/64-bit architectures. To handle this variation,
function "target_offset64()" was copied from file "strace.c" and used in
"print_fallocate" to print "off_t" arguments for 32-bit architectures.
Signed-off-by: Filip Bozuta <Filip.Bozuta@syrmia.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200619123331.17387-7-filip.bozuta@syrmia.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/qemu.h | 16 ++++++++++++++++
linux-user/strace.c | 40 ++++++++++++++++++++++++++++++++++++++++
linux-user/strace.list | 2 +-
linux-user/syscall.c | 16 ----------------
4 files changed, 57 insertions(+), 17 deletions(-)
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 8f938b8105b3..be67391ba49d 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -670,6 +670,22 @@ static inline int is_error(abi_long ret)
return (abi_ulong)ret >= (abi_ulong)(-4096);
}
+#if TARGET_ABI_BITS == 32
+static inline uint64_t target_offset64(uint32_t word0, uint32_t word1)
+{
+#ifdef TARGET_WORDS_BIGENDIAN
+ return ((uint64_t)word0 << 32) | word1;
+#else
+ return ((uint64_t)word1 << 32) | word0;
+#endif
+}
+#else /* TARGET_ABI_BITS == 32 */
+static inline uint64_t target_offset64(uint64_t word0, uint64_t word1)
+{
+ return word0;
+}
+#endif /* TARGET_ABI_BITS != 32 */
+
/**
* preexit_cleanup: housekeeping before the guest exits
*
diff --git a/linux-user/strace.c b/linux-user/strace.c
index 957f08f1adf2..32e5e987acbb 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -1135,6 +1135,26 @@ UNUSED static struct flags statx_mask[] = {
FLAG_END,
};
+UNUSED static struct flags falloc_flags[] = {
+ FLAG_GENERIC(FALLOC_FL_KEEP_SIZE),
+ FLAG_GENERIC(FALLOC_FL_PUNCH_HOLE),
+#ifdef FALLOC_FL_NO_HIDE_STALE
+ FLAG_GENERIC(FALLOC_FL_NO_HIDE_STALE),
+#endif
+#ifdef FALLOC_FL_COLLAPSE_RANGE
+ FLAG_GENERIC(FALLOC_FL_COLLAPSE_RANGE),
+#endif
+#ifdef FALLOC_FL_ZERO_RANGE
+ FLAG_GENERIC(FALLOC_FL_ZERO_RANGE),
+#endif
+#ifdef FALLOC_FL_INSERT_RANGE
+ FLAG_GENERIC(FALLOC_FL_INSERT_RANGE),
+#endif
+#ifdef FALLOC_FL_UNSHARE_RANGE
+ FLAG_GENERIC(FALLOC_FL_UNSHARE_RANGE),
+#endif
+};
+
/*
* print_xxx utility functions. These are used to print syscall
* parameters in certain format. All of these have parameter
@@ -1552,6 +1572,26 @@ print_faccessat(const struct syscallname *name,
}
#endif
+#ifdef TARGET_NR_fallocate
+static void
+print_fallocate(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_raw_param("%d", arg0, 0);
+ print_flags(falloc_flags, arg1, 0);
+#if TARGET_ABI_BITS == 32
+ print_raw_param("%" PRIu64, target_offset64(arg2, arg3), 0);
+ print_raw_param("%" PRIu64, target_offset64(arg4, arg5), 1);
+#else
+ print_raw_param(TARGET_ABI_FMT_ld, arg2, 0);
+ print_raw_param(TARGET_ABI_FMT_ld, arg3, 1);
+#endif
+ print_syscall_epilogue(name);
+}
+#endif
+
#ifdef TARGET_NR_fchmodat
static void
print_fchmodat(const struct syscallname *name,
diff --git a/linux-user/strace.list b/linux-user/strace.list
index e99030c9ef39..ebb713252ce3 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -182,7 +182,7 @@
{ TARGET_NR_fadvise64_64, "fadvise64_64" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_fallocate
-{ TARGET_NR_fallocate, "fallocate" , NULL, NULL, NULL },
+{ TARGET_NR_fallocate, "fallocate" , NULL, print_fallocate, NULL },
#endif
#ifdef TARGET_NR_fanotify_init
{ TARGET_NR_fanotify_init, "fanotify_init" , NULL, NULL, NULL },
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 1b971c06b270..506b94a12c1e 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -6712,22 +6712,6 @@ void syscall_init(void)
}
}
-#if TARGET_ABI_BITS == 32
-static inline uint64_t target_offset64(uint32_t word0, uint32_t word1)
-{
-#ifdef TARGET_WORDS_BIGENDIAN
- return ((uint64_t)word0 << 32) | word1;
-#else
- return ((uint64_t)word1 << 32) | word0;
-#endif
-}
-#else /* TARGET_ABI_BITS == 32 */
-static inline uint64_t target_offset64(uint64_t word0, uint64_t word1)
-{
- return word0;
-}
-#endif /* TARGET_ABI_BITS != 32 */
-
#ifdef TARGET_NR_truncate64
static inline abi_long target_truncate64(void *cpu_env, const char *arg1,
abi_long arg2,
--
2.26.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 10/12] linux-user: Add thunk argument types for SIOCGSTAMP and SIOCGSTAMPNS
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
` (8 preceding siblings ...)
2020-07-04 16:25 ` [PULL 09/12] linux-user: Add strace support for printing arguments of fallocate() Laurent Vivier
@ 2020-07-04 16:25 ` Laurent Vivier
2020-07-04 16:25 ` [PULL 11/12] linux-user: Add strace support for printing arguments of ioctl() Laurent Vivier
` (4 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Laurent Vivier @ 2020-07-04 16:25 UTC (permalink / raw)
To: qemu-devel
Cc: Filip Bozuta, Riku Voipio, Mark Cave-Ayland, Laurent Vivier,
Artyom Tarasenko
From: Filip Bozuta <Filip.Bozuta@syrmia.com>
Socket ioctls SIOCGSTAMP and SIOCGSTAMPNS, used for timestamping the socket
connection, are defined in file "ioctls.h" differently from other ioctls.
The reason for this difference is explained in the comments above their definition.
These ioctls didn't have defined thunk argument types before changes from this
patch. They have special handling functions ("do_ioctl_SIOCGSTAMP" and
"do_ioctl_SIOCGSTAMPNS") that take care of setting values for approppriate argument
types (struct timeval and struct timespec) and thus no thunk argument types were
needed for their implementation. But this patch adds those argument type definitions
in file "syscall_types.h" and "ioctls.h" as it is needed for printing arguments
of these ioctls with strace.
Implementation notes:
There are two variants of these ioctls: SIOCGSTAMP_OLD/SIOCGSTAM_NEW and
SIOCGSTAMPNS_OLD/SIOCGSTAMPNS_NEW. One is the old existing definition and the
other is the 2038 safe variant used for 32-bit architectures. Corresponding
structure definitions STRUCT_timespec/STRUCT__kernel_timespec and
STRUCT_timeval/STRUCT__kernel_sock_timeval were added for these variants.
STRUCT_timeval definition was already inside the file as it is used by
another implemented ioctl. Two cases were added for definitions
STRUCT_timeval/STRUCT__kernel_sock_timeval to manage the case when the
"u_sec" field of the timeval structure is of type int.
Signed-off-by: Filip Bozuta <Filip.Bozuta@syrmia.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200619124727.18080-2-filip.bozuta@syrmia.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/ioctls.h | 12 ++++++++----
linux-user/syscall_types.h | 22 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index f2e2fa9c878b..0713ae131162 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -279,13 +279,17 @@
* FIXME: create a macro to define this kind of entry
*/
{ TARGET_SIOCGSTAMP_OLD, TARGET_SIOCGSTAMP_OLD,
- "SIOCGSTAMP_OLD", IOC_R, do_ioctl_SIOCGSTAMP },
+ "SIOCGSTAMP_OLD", IOC_R, do_ioctl_SIOCGSTAMP,
+ { MK_PTR(MK_STRUCT(STRUCT_timeval)) } },
{ TARGET_SIOCGSTAMPNS_OLD, TARGET_SIOCGSTAMPNS_OLD,
- "SIOCGSTAMPNS_OLD", IOC_R, do_ioctl_SIOCGSTAMPNS },
+ "SIOCGSTAMPNS_OLD", IOC_R, do_ioctl_SIOCGSTAMPNS,
+ { MK_PTR(MK_STRUCT(STRUCT_timespec)) } },
{ TARGET_SIOCGSTAMP_NEW, TARGET_SIOCGSTAMP_NEW,
- "SIOCGSTAMP_NEW", IOC_R, do_ioctl_SIOCGSTAMP },
+ "SIOCGSTAMP_NEW", IOC_R, do_ioctl_SIOCGSTAMP,
+ { MK_PTR(MK_STRUCT(STRUCT__kernel_sock_timeval)) } },
{ TARGET_SIOCGSTAMPNS_NEW, TARGET_SIOCGSTAMPNS_NEW,
- "SIOCGSTAMPNS_NEW", IOC_R, do_ioctl_SIOCGSTAMPNS },
+ "SIOCGSTAMPNS_NEW", IOC_R, do_ioctl_SIOCGSTAMPNS,
+ { MK_PTR(MK_STRUCT(STRUCT__kernel_timespec)) } },
IOCTL(RNDGETENTCNT, IOC_R, MK_PTR(TYPE_INT))
IOCTL(RNDADDTOENTCNT, IOC_W, MK_PTR(TYPE_INT))
diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
index e2b0484f50e5..3f1f0334649b 100644
--- a/linux-user/syscall_types.h
+++ b/linux-user/syscall_types.h
@@ -137,10 +137,32 @@ STRUCT(snd_timer_params,
TYPE_INT, /* filter */
MK_ARRAY(TYPE_CHAR, 60)) /* reserved */
+#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
+STRUCT(timeval,
+ TYPE_LONG, /* tv_sec */
+ TYPE_INT) /* tv_usec */
+
+STRUCT(_kernel_sock_timeval,
+ TYPE_LONG, /* tv_sec */
+ TYPE_INT) /* tv_usec */
+#else
+STRUCT(timeval,
+ TYPE_LONG, /* tv_sec */
+ TYPE_LONG) /* tv_usec */
+
+STRUCT(_kernel_sock_timeval,
+ TYPE_LONGLONG, /* tv_sec */
+ TYPE_LONGLONG) /* tv_usec */
+#endif
+
STRUCT(timespec,
TYPE_LONG, /* tv_sec */
TYPE_LONG) /* tv_nsec */
+STRUCT(_kernel_timespec,
+ TYPE_LONGLONG, /* tv_sec */
+ TYPE_LONGLONG) /* tv_nsec */
+
STRUCT(snd_timer_status,
MK_STRUCT(STRUCT_timespec), /* tstamp */
TYPE_INT, /* resolution */
--
2.26.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 11/12] linux-user: Add strace support for printing arguments of ioctl()
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
` (9 preceding siblings ...)
2020-07-04 16:25 ` [PULL 10/12] linux-user: Add thunk argument types for SIOCGSTAMP and SIOCGSTAMPNS Laurent Vivier
@ 2020-07-04 16:25 ` Laurent Vivier
2020-07-09 15:20 ` Peter Maydell
2020-07-04 16:25 ` [PULL 12/12] MAINTAINERS: update linux-user maintainer Laurent Vivier
` (3 subsequent siblings)
14 siblings, 1 reply; 18+ messages in thread
From: Laurent Vivier @ 2020-07-04 16:25 UTC (permalink / raw)
To: qemu-devel
Cc: Filip Bozuta, Riku Voipio, Mark Cave-Ayland, Laurent Vivier,
Artyom Tarasenko
From: Filip Bozuta <Filip.Bozuta@syrmia.com>
This patch implements functionality for strace argument printing for ioctls.
When running ioctls through qemu with "-strace", they get printed in format:
"ioctl(fd_num,0x*,0x*) = ret_value"
where the request code an the ioctl's third argument get printed in a hexadicemal
format. This patch changes that by enabling strace to print both the request code
name and the contents of the third argument. For example, when running ioctl
RTC_SET_TIME with "-strace", with changes from this patch, it gets printed in
this way:
"ioctl(3,RTC_SET_TIME,{12,13,15,20,10,119,0,0,0}) = 0"
In case of IOC_R type ioctls, the contents of the third argument get printed
after the return value, and the argument inside the ioctl call gets printed
as pointer in hexadecimal format. For example, when running RTC_RD_TIME with
"-strace", with changes from this patch, it gets printed in this way:
"ioctl(3,RTC_RD_TIME,0x40800374) = 0 ({22,9,13,11,5,120,0,0,0})"
In case of IOC_RW type ioctls, the contents of the third argument get printed
both inside the ioctl call and after the return value.
Implementation notes:
Functions "print_ioctl()" and "print_syscall_ret_ioctl()", that are defined
in "strace.c", are listed in file "strace.list" as "call" and "result"
value for ioctl. Structure definition "IOCTLEntry" as well as predefined
values for IOC_R, IOC_W and IOC_RW were cut and pasted from file "syscall.c"
to file "qemu.h" so that they can be used by these functions to print the
contents of the third ioctl argument. Also, the "static" identifier for array
"ioctl_entries[]" was removed and this array was declared as "extern" in "qemu.h"
so that it can also be used by these functions. To decode the structure type
of the ioctl third argument, function "thunk_print()" was defined in file
"thunk.c" and its definition is somewhat simillar to that of function
"thunk_convert()".
Signed-off-by: Filip Bozuta <Filip.Bozuta@syrmia.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200619124727.18080-3-filip.bozuta@syrmia.com>
[lv: fix close-bracket]
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
include/exec/user/thunk.h | 1 +
linux-user/qemu.h | 20 +++++
linux-user/strace.c | 107 ++++++++++++++++++++++++++
linux-user/strace.list | 3 +-
linux-user/syscall.c | 20 +----
thunk.c | 154 ++++++++++++++++++++++++++++++++++++++
6 files changed, 285 insertions(+), 20 deletions(-)
diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h
index eae2c27f99da..7992475c9f8a 100644
--- a/include/exec/user/thunk.h
+++ b/include/exec/user/thunk.h
@@ -73,6 +73,7 @@ void thunk_register_struct_direct(int id, const char *name,
const StructEntry *se1);
const argtype *thunk_convert(void *dst, const void *src,
const argtype *type_ptr, int to_host);
+const argtype *thunk_print(void *arg, const argtype *type_ptr);
extern StructEntry *struct_entries;
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index be67391ba49d..5c964389c101 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -184,6 +184,26 @@ struct linux_binprm {
int (*core_dump)(int, const CPUArchState *); /* coredump routine */
};
+typedef struct IOCTLEntry IOCTLEntry;
+
+typedef abi_long do_ioctl_fn(const IOCTLEntry *ie, uint8_t *buf_temp,
+ int fd, int cmd, abi_long arg);
+
+struct IOCTLEntry {
+ int target_cmd;
+ unsigned int host_cmd;
+ const char *name;
+ int access;
+ do_ioctl_fn *do_ioctl;
+ const argtype arg_type[5];
+};
+
+extern IOCTLEntry ioctl_entries[];
+
+#define IOC_R 0x0001
+#define IOC_W 0x0002
+#define IOC_RW (IOC_R | IOC_W)
+
void do_init_thread(struct target_pt_regs *regs, struct image_info *infop);
abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp,
abi_ulong stringp, int push_ptr);
diff --git a/linux-user/strace.c b/linux-user/strace.c
index 32e5e987acbb..5235b2260cdd 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -860,6 +860,44 @@ print_syscall_ret_listxattr(const struct syscallname *name, abi_long ret,
#define print_syscall_ret_flistxattr print_syscall_ret_listxattr
#endif
+#ifdef TARGET_NR_ioctl
+static void
+print_syscall_ret_ioctl(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)
+{
+ print_syscall_err(ret);
+
+ if (ret >= 0) {
+ qemu_log(TARGET_ABI_FMT_ld, ret);
+
+ const IOCTLEntry *ie;
+ const argtype *arg_type;
+ void *argptr;
+ int target_size;
+
+ for (ie = ioctl_entries; ie->target_cmd != 0; ie++) {
+ if (ie->target_cmd == arg1) {
+ break;
+ }
+ }
+
+ if (ie->target_cmd == arg1 &&
+ (ie->access == IOC_R || ie->access == IOC_RW)) {
+ arg_type = ie->arg_type;
+ qemu_log(" (");
+ arg_type++;
+ target_size = thunk_type_size(arg_type, 0);
+ argptr = lock_user(VERIFY_READ, arg2, target_size, 1);
+ thunk_print(argptr, arg_type);
+ unlock_user(argptr, arg2, target_size);
+ qemu_log(")");
+ }
+ }
+ qemu_log("\n");
+}
+#endif
+
UNUSED static struct flags access_flags[] = {
FLAG_GENERIC(F_OK),
FLAG_GENERIC(R_OK),
@@ -3026,6 +3064,75 @@ print_statx(const struct syscallname *name,
}
#endif
+#ifdef TARGET_NR_ioctl
+static void
+print_ioctl(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_raw_param("%d", arg0, 0);
+
+ const IOCTLEntry *ie;
+ const argtype *arg_type;
+ void *argptr;
+ int target_size;
+
+ for (ie = ioctl_entries; ie->target_cmd != 0; ie++) {
+ if (ie->target_cmd == arg1) {
+ break;
+ }
+ }
+
+ if (ie->target_cmd == 0) {
+ print_raw_param("%#x", arg1, 0);
+ print_raw_param("%#x", arg2, 1);
+ } else {
+ qemu_log("%s", ie->name);
+ arg_type = ie->arg_type;
+
+ if (arg_type[0] != TYPE_NULL) {
+ qemu_log(",");
+
+ switch (arg_type[0]) {
+ case TYPE_PTRVOID:
+ print_pointer(arg2, 1);
+ break;
+ case TYPE_CHAR:
+ case TYPE_SHORT:
+ case TYPE_INT:
+ print_raw_param("%d", arg2, 1);
+ break;
+ case TYPE_LONG:
+ print_raw_param(TARGET_ABI_FMT_ld, arg2, 1);
+ break;
+ case TYPE_ULONG:
+ print_raw_param(TARGET_ABI_FMT_lu, arg2, 1);
+ break;
+ case TYPE_PTR:
+ switch (ie->access) {
+ case IOC_R:
+ print_pointer(arg2, 1);
+ break;
+ case IOC_W:
+ case IOC_RW:
+ arg_type++;
+ target_size = thunk_type_size(arg_type, 0);
+ argptr = lock_user(VERIFY_READ, arg2, target_size, 1);
+ thunk_print(argptr, arg_type);
+ unlock_user(argptr, arg2, target_size);
+ break;
+ }
+ break;
+ default:
+ g_assert_not_reached();
+ }
+ }
+ }
+ print_syscall_epilogue(name);
+}
+#endif
+
/*
* An array of all of the syscalls we know about
*/
diff --git a/linux-user/strace.list b/linux-user/strace.list
index ebb713252ce3..a04706a524ae 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -433,7 +433,8 @@
{ TARGET_NR_io_cancel, "io_cancel" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_ioctl
-{ TARGET_NR_ioctl, "ioctl" , "%s(%d,%#x,%#x)", NULL, NULL },
+{ TARGET_NR_ioctl, "ioctl" , NULL, print_ioctl,
+ print_syscall_ret_ioctl},
#endif
#ifdef TARGET_NR_io_destroy
{ TARGET_NR_io_destroy, "io_destroy" , NULL, NULL, NULL },
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 506b94a12c1e..82afadcea0e2 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -4481,24 +4481,6 @@ STRUCT_MAX
#undef STRUCT
#undef STRUCT_SPECIAL
-typedef struct IOCTLEntry IOCTLEntry;
-
-typedef abi_long do_ioctl_fn(const IOCTLEntry *ie, uint8_t *buf_temp,
- int fd, int cmd, abi_long arg);
-
-struct IOCTLEntry {
- int target_cmd;
- unsigned int host_cmd;
- const char *name;
- int access;
- do_ioctl_fn *do_ioctl;
- const argtype arg_type[5];
-};
-
-#define IOC_R 0x0001
-#define IOC_W 0x0002
-#define IOC_RW (IOC_R | IOC_W)
-
#define MAX_STRUCT_SIZE 4096
#ifdef CONFIG_FIEMAP
@@ -5374,7 +5356,7 @@ static abi_long do_ioctl_drm(const IOCTLEntry *ie, uint8_t *buf_temp,
#endif
-static IOCTLEntry ioctl_entries[] = {
+IOCTLEntry ioctl_entries[] = {
#define IOCTL(cmd, access, ...) \
{ TARGET_ ## cmd, cmd, #cmd, access, 0, { __VA_ARGS__ } },
#define IOCTL_SPECIAL(cmd, access, dofn, ...) \
diff --git a/thunk.c b/thunk.c
index 7f31cffe0968..c5d971974783 100644
--- a/thunk.c
+++ b/thunk.c
@@ -271,6 +271,160 @@ const argtype *thunk_convert(void *dst, const void *src,
return type_ptr;
}
+const argtype *thunk_print(void *arg, const argtype *type_ptr)
+{
+ int type;
+
+ type = *type_ptr++;
+
+ switch (type) {
+ case TYPE_CHAR:
+ qemu_log("%c", *(uint8_t *)arg);
+ break;
+ case TYPE_SHORT:
+ qemu_log("%" PRId16, tswap16(*(uint16_t *)arg));
+ break;
+ case TYPE_INT:
+ qemu_log("%" PRId32, tswap32(*(uint32_t *)arg));
+ break;
+ case TYPE_LONGLONG:
+ qemu_log("%" PRId64, tswap64(*(uint64_t *)arg));
+ break;
+ case TYPE_ULONGLONG:
+ qemu_log("%" PRIu64, tswap64(*(uint64_t *)arg));
+ break;
+#if HOST_LONG_BITS == 32 && TARGET_ABI_BITS == 32
+ case TYPE_PTRVOID:
+ qemu_log("0x%" PRIx32, tswap32(*(uint32_t *)arg));
+ break;
+ case TYPE_LONG:
+ qemu_log("%" PRId32, tswap32(*(uint32_t *)arg));
+ break;
+ case TYPE_ULONG:
+ qemu_log("%" PRIu32, tswap32(*(uint32_t *)arg));
+ break;
+#elif HOST_LONG_BITS == 64 && TARGET_ABI_BITS == 32
+ case TYPE_PTRVOID:
+ qemu_log("0x%" PRIx32, tswap32(*(uint64_t *)arg & 0xffffffff));
+ break;
+ case TYPE_LONG:
+ qemu_log("%" PRId32, tswap32(*(uint64_t *)arg & 0xffffffff));
+ break;
+ case TYPE_ULONG:
+ qemu_log("%" PRIu32, tswap32(*(uint64_t *)arg & 0xffffffff));
+ break;
+#elif HOST_LONG_BITS == 64 && TARGET_ABI_BITS == 64
+ case TYPE_PTRVOID:
+ qemu_log("0x%" PRIx64, tswap64(*(uint64_t *)arg));
+ break;
+ case TYPE_LONG:
+ qemu_log("%" PRId64, tswap64(*(uint64_t *)arg));
+ break;
+ case TYPE_ULONG:
+ qemu_log("%" PRIu64, tswap64(*(uint64_t *)arg));
+ break;
+#else
+ case TYPE_PTRVOID:
+ qemu_log("0x%" PRIx64, tswap64(*(uint64_t *)arg));
+ break;
+ case TYPE_LONG:
+ qemu_log("%" PRId64, tswap64(*(uint64_t *)arg));
+ break;
+ case TYPE_ULONG:
+ qemu_log("%" PRIu64, tswap64(*(uint64_t *)arg));
+ break;
+#endif
+ case TYPE_OLDDEVT:
+ {
+ uint64_t val = 0;
+ switch (thunk_type_size(type_ptr - 1, 1)) {
+ case 2:
+ val = *(uint16_t *)arg;
+ break;
+ case 4:
+ val = *(uint32_t *)arg;
+ break;
+ case 8:
+ val = *(uint64_t *)arg;
+ break;
+ }
+ switch (thunk_type_size(type_ptr - 1, 0)) {
+ case 2:
+ qemu_log("%" PRIu16, tswap16(val));
+ break;
+ case 4:
+ qemu_log("%" PRIu32, tswap32(val));
+ break;
+ case 8:
+ qemu_log("%" PRIu64, tswap64(val));
+ break;
+ }
+ }
+ break;
+ case TYPE_ARRAY:
+ {
+ int i, array_length, arg_size;
+ uint8_t *a;
+ int is_string = 0;
+
+ array_length = *type_ptr++;
+ arg_size = thunk_type_size(type_ptr, 0);
+ a = arg;
+
+ if (*type_ptr == TYPE_CHAR) {
+ qemu_log("\"");
+ is_string = 1;
+ } else {
+ qemu_log("[");
+ }
+
+ for (i = 0; i < array_length; i++) {
+ if (i > 0 && !is_string) {
+ qemu_log(",");
+ }
+ thunk_print(a, type_ptr);
+ a += arg_size;
+ }
+
+ if (is_string) {
+ qemu_log("\"");
+ } else {
+ qemu_log("]");
+ }
+
+ type_ptr = thunk_type_next(type_ptr);
+ }
+ break;
+ case TYPE_STRUCT:
+ {
+ int i;
+ const StructEntry *se;
+ uint8_t *a;
+ const argtype *field_types;
+ const int *arg_offsets;
+
+ se = struct_entries + *type_ptr++;
+ a = arg;
+
+ field_types = se->field_types;
+ arg_offsets = se->field_offsets[0];
+
+ qemu_log("{");
+ for (i = 0; i < se->nb_fields; i++) {
+ if (i > 0) {
+ qemu_log(",");
+ }
+ field_types = thunk_print(a + arg_offsets[i], field_types);
+ }
+ qemu_log("}");
+ }
+ break;
+ default:
+ g_assert_not_reached();
+ }
+ return type_ptr;
+}
+
/* from em86 */
/* Utility function: Table-driven functions to translate bitmasks
--
2.26.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 12/12] MAINTAINERS: update linux-user maintainer
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
` (10 preceding siblings ...)
2020-07-04 16:25 ` [PULL 11/12] linux-user: Add strace support for printing arguments of ioctl() Laurent Vivier
@ 2020-07-04 16:25 ` Laurent Vivier
2020-07-04 16:40 ` [PULL 00/12] Linux user for 5.1 patches no-reply
` (2 subsequent siblings)
14 siblings, 0 replies; 18+ messages in thread
From: Laurent Vivier @ 2020-07-04 16:25 UTC (permalink / raw)
To: qemu-devel
Cc: Riku Voipio, Riku Voipio, Mark Cave-Ayland, Laurent Vivier,
Philippe Mathieu-Daudé,
Artyom Tarasenko
From: Riku Voipio <riku.voipio@linaro.org>
I haven't been active for a while. Pass the maintainer hat
forward to Laurent, who has done a stellar job filling in.
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200702111636.25792-1-riku.voipio@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
MAINTAINERS | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index dec252f38b1d..29a23b6d3a5a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2629,8 +2629,7 @@ F: bsd-user/
F: default-configs/*-bsd-user.mak
Linux user
-M: Riku Voipio <riku.voipio@iki.fi>
-R: Laurent Vivier <laurent@vivier.eu>
+M: Laurent Vivier <laurent@vivier.eu>
S: Maintained
F: linux-user/
F: default-configs/*-linux-user.mak
--
2.26.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PULL 00/12] Linux user for 5.1 patches
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
` (11 preceding siblings ...)
2020-07-04 16:25 ` [PULL 12/12] MAINTAINERS: update linux-user maintainer Laurent Vivier
@ 2020-07-04 16:40 ` no-reply
2020-07-04 16:53 ` no-reply
2020-07-07 10:16 ` Peter Maydell
14 siblings, 0 replies; 18+ messages in thread
From: no-reply @ 2020-07-04 16:40 UTC (permalink / raw)
To: laurent; +Cc: riku.voipio, mark.cave-ayland, qemu-devel, atar4qemu, laurent
Patchew URL: https://patchew.org/QEMU/20200704162545.311133-1-laurent@vivier.eu/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Subject: [PULL 00/12] Linux user for 5.1 patches
Type: series
Message-id: 20200704162545.311133-1-laurent@vivier.eu
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
From https://github.com/patchew-project/qemu
* [new tag] patchew/20200704162545.311133-1-laurent@vivier.eu -> patchew/20200704162545.311133-1-laurent@vivier.eu
Switched to a new branch 'test'
cb3a4fc MAINTAINERS: update linux-user maintainer
7b3f6cd linux-user: Add strace support for printing arguments of ioctl()
9d17bbc linux-user: Add thunk argument types for SIOCGSTAMP and SIOCGSTAMPNS
58d847d linux-user: Add strace support for printing arguments of fallocate()
03bc028 linux-user: Add strace support for printing arguments of chown()/lchown()
53ad262 linux-user: Add strace support for printing arguments of lseek()
3f67ba4 linux-user: Add strace support for printing argument of syscalls used for extended attributes
161ae19 linux-user: Add strace support for a group of syscalls
db4c17d linux-user: Extend strace support to enable argument printing after syscall execution
22bc812 linux-user: syscall: ioctls: support DRM_IOCTL_VERSION
e97195e linux-user/sparc64: Fix the handling of window spill trap
575e0ad target/sparc: Translate flushw opcode
=== OUTPUT BEGIN ===
1/12 Checking commit 575e0adf7d7e (target/sparc: Translate flushw opcode)
2/12 Checking commit e97195ec31d7 (linux-user/sparc64: Fix the handling of window spill trap)
3/12 Checking commit 22bc81224268 (linux-user: syscall: ioctls: support DRM_IOCTL_VERSION)
4/12 Checking commit db4c17d404f2 (linux-user: Extend strace support to enable argument printing after syscall execution)
5/12 Checking commit 161ae192cebd (linux-user: Add strace support for a group of syscalls)
6/12 Checking commit 3f67ba4ddae0 (linux-user: Add strace support for printing argument of syscalls used for extended attributes)
7/12 Checking commit 53ad262300f4 (linux-user: Add strace support for printing arguments of lseek())
8/12 Checking commit 03bc02818e5f (linux-user: Add strace support for printing arguments of chown()/lchown())
9/12 Checking commit 58d847d0e8eb (linux-user: Add strace support for printing arguments of fallocate())
ERROR: storage class should be at the beginning of the declaration
#72: FILE: linux-user/strace.c:1138:
+UNUSED static struct flags falloc_flags[] = {
total: 1 errors, 0 warnings, 104 lines checked
Patch 9/12 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
10/12 Checking commit 9d17bbca2cab (linux-user: Add thunk argument types for SIOCGSTAMP and SIOCGSTAMPNS)
11/12 Checking commit 7b3f6cd1f53d (linux-user: Add strace support for printing arguments of ioctl())
12/12 Checking commit cb3a4fcab63a (MAINTAINERS: update linux-user maintainer)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20200704162545.311133-1-laurent@vivier.eu/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PULL 00/12] Linux user for 5.1 patches
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
` (12 preceding siblings ...)
2020-07-04 16:40 ` [PULL 00/12] Linux user for 5.1 patches no-reply
@ 2020-07-04 16:53 ` no-reply
2020-07-07 10:16 ` Peter Maydell
14 siblings, 0 replies; 18+ messages in thread
From: no-reply @ 2020-07-04 16:53 UTC (permalink / raw)
To: laurent; +Cc: riku.voipio, mark.cave-ayland, qemu-devel, atar4qemu, laurent
Patchew URL: https://patchew.org/QEMU/20200704162545.311133-1-laurent@vivier.eu/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Subject: [PULL 00/12] Linux user for 5.1 patches
Type: series
Message-id: 20200704162545.311133-1-laurent@vivier.eu
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
- [tag update] patchew/20200703090816.3295-1-vsementsov@virtuozzo.com -> patchew/20200703090816.3295-1-vsementsov@virtuozzo.com
- [tag update] patchew/20200704144943.18292-1-f4bug@amsat.org -> patchew/20200704144943.18292-1-f4bug@amsat.org
- [tag update] patchew/20200704162545.311133-1-laurent@vivier.eu -> patchew/20200704162545.311133-1-laurent@vivier.eu
* [new tag] patchew/20200704163927.28188-1-philmd@redhat.com -> patchew/20200704163927.28188-1-philmd@redhat.com
Switched to a new branch 'test'
694f568 MAINTAINERS: update linux-user maintainer
171c990 linux-user: Add strace support for printing arguments of ioctl()
a424bb6 linux-user: Add thunk argument types for SIOCGSTAMP and SIOCGSTAMPNS
27bf310 linux-user: Add strace support for printing arguments of fallocate()
f1b1206 linux-user: Add strace support for printing arguments of chown()/lchown()
9396f03 linux-user: Add strace support for printing arguments of lseek()
5c704cf linux-user: Add strace support for printing argument of syscalls used for extended attributes
7762a3d linux-user: Add strace support for a group of syscalls
e90d86c linux-user: Extend strace support to enable argument printing after syscall execution
7b88c97 linux-user: syscall: ioctls: support DRM_IOCTL_VERSION
8f4ede9 linux-user/sparc64: Fix the handling of window spill trap
fbf7216 target/sparc: Translate flushw opcode
=== OUTPUT BEGIN ===
1/12 Checking commit fbf72163152b (target/sparc: Translate flushw opcode)
2/12 Checking commit 8f4ede92f5cb (linux-user/sparc64: Fix the handling of window spill trap)
3/12 Checking commit 7b88c97552f7 (linux-user: syscall: ioctls: support DRM_IOCTL_VERSION)
4/12 Checking commit e90d86c96d96 (linux-user: Extend strace support to enable argument printing after syscall execution)
5/12 Checking commit 7762a3d9062f (linux-user: Add strace support for a group of syscalls)
6/12 Checking commit 5c704cf44345 (linux-user: Add strace support for printing argument of syscalls used for extended attributes)
7/12 Checking commit 9396f0375162 (linux-user: Add strace support for printing arguments of lseek())
8/12 Checking commit f1b120653fe1 (linux-user: Add strace support for printing arguments of chown()/lchown())
9/12 Checking commit 27bf310f6f8f (linux-user: Add strace support for printing arguments of fallocate())
ERROR: storage class should be at the beginning of the declaration
#72: FILE: linux-user/strace.c:1138:
+UNUSED static struct flags falloc_flags[] = {
total: 1 errors, 0 warnings, 104 lines checked
Patch 9/12 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
10/12 Checking commit a424bb625a68 (linux-user: Add thunk argument types for SIOCGSTAMP and SIOCGSTAMPNS)
11/12 Checking commit 171c990f6863 (linux-user: Add strace support for printing arguments of ioctl())
12/12 Checking commit 694f568cab30 (MAINTAINERS: update linux-user maintainer)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20200704162545.311133-1-laurent@vivier.eu/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PULL 00/12] Linux user for 5.1 patches
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
` (13 preceding siblings ...)
2020-07-04 16:53 ` no-reply
@ 2020-07-07 10:16 ` Peter Maydell
14 siblings, 0 replies; 18+ messages in thread
From: Peter Maydell @ 2020-07-07 10:16 UTC (permalink / raw)
To: Laurent Vivier
Cc: Riku Voipio, Mark Cave-Ayland, QEMU Developers, Artyom Tarasenko
On Sat, 4 Jul 2020 at 17:27, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit e7651153a8801dad6805d450ea8bef9b46c1adf5:
>
> Merge remote-tracking branch 'remotes/amarkovic/tags/mips-gsoc-queue-jun-27-2020' into staging (2020-06-27 22:57:36 +0100)
>
> are available in the Git repository at:
>
> git://github.com/vivier/qemu.git tags/linux-user-for-5.1-pull-request
>
> for you to fetch changes up to 8f902c540eccd72086e8f67d977e30e05659783f:
>
> MAINTAINERS: update linux-user maintainer (2020-07-04 18:09:29 +0200)
>
> ----------------------------------------------------------------
> linux-user pull request 2020-07-02
>
> Update linux-user maintainer
> Improve strace output for some syscalls
> Display contents of ioctl() parameters
> Fix sparc64 flushw operation
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PULL 11/12] linux-user: Add strace support for printing arguments of ioctl()
2020-07-04 16:25 ` [PULL 11/12] linux-user: Add strace support for printing arguments of ioctl() Laurent Vivier
@ 2020-07-09 15:20 ` Peter Maydell
2020-07-09 15:28 ` Laurent Vivier
0 siblings, 1 reply; 18+ messages in thread
From: Peter Maydell @ 2020-07-09 15:20 UTC (permalink / raw)
To: Laurent Vivier
Cc: Riku Voipio, Mark Cave-Ayland, QEMU Developers, Filip Bozuta,
Artyom Tarasenko
On Sat, 4 Jul 2020 at 17:36, Laurent Vivier <laurent@vivier.eu> wrote:
>
> From: Filip Bozuta <Filip.Bozuta@syrmia.com>
>
> This patch implements functionality for strace argument printing for ioctls.
Hi; Coverity points out some issues in this change:
> +#ifdef TARGET_NR_ioctl
> +static void
> +print_syscall_ret_ioctl(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)
> +{
> + print_syscall_err(ret);
> +
> + if (ret >= 0) {
> + qemu_log(TARGET_ABI_FMT_ld, ret);
> +
> + const IOCTLEntry *ie;
> + const argtype *arg_type;
> + void *argptr;
> + int target_size;
> +
> + for (ie = ioctl_entries; ie->target_cmd != 0; ie++) {
> + if (ie->target_cmd == arg1) {
> + break;
> + }
> + }
> +
> + if (ie->target_cmd == arg1 &&
> + (ie->access == IOC_R || ie->access == IOC_RW)) {
> + arg_type = ie->arg_type;
> + qemu_log(" (");
> + arg_type++;
> + target_size = thunk_type_size(arg_type, 0);
> + argptr = lock_user(VERIFY_READ, arg2, target_size, 1);
Here we fail to check that lock_user() didn't return NULL...
> + thunk_print(argptr, arg_type);
...which would cause a segfault in thunk_print().
This is CID 1430271.
> + unlock_user(argptr, arg2, target_size);
> + qemu_log(")");
> + }
> + }
> + qemu_log("\n");
> +}
> +#endif
> +#ifdef TARGET_NR_ioctl
> +static void
> +print_ioctl(const struct syscallname *name,
> + abi_long arg0, abi_long arg1, abi_long arg2,
> + abi_long arg3, abi_long arg4, abi_long arg5)
> +{
> + case TYPE_PTR:
> + switch (ie->access) {
> + case IOC_R:
> + print_pointer(arg2, 1);
> + break;
> + case IOC_W:
> + case IOC_RW:
> + arg_type++;
> + target_size = thunk_type_size(arg_type, 0);
> + argptr = lock_user(VERIFY_READ, arg2, target_size, 1);
> + thunk_print(argptr, arg_type);
Similarly here we need to check that lock_user didn't fail.
This is CID 1430272.
> + unlock_user(argptr, arg2, target_size);
> + break;
> + }
> + break;
> + default:
> + g_assert_not_reached();
> + }
> + }
> + }
> + print_syscall_epilogue(name);
> +}
thanks
-- PMM
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PULL 11/12] linux-user: Add strace support for printing arguments of ioctl()
2020-07-09 15:20 ` Peter Maydell
@ 2020-07-09 15:28 ` Laurent Vivier
0 siblings, 0 replies; 18+ messages in thread
From: Laurent Vivier @ 2020-07-09 15:28 UTC (permalink / raw)
To: Peter Maydell
Cc: Riku Voipio, Mark Cave-Ayland, QEMU Developers, Filip Bozuta,
Artyom Tarasenko
Le 09/07/2020 à 17:20, Peter Maydell a écrit :
> On Sat, 4 Jul 2020 at 17:36, Laurent Vivier <laurent@vivier.eu> wrote:
>>
>> From: Filip Bozuta <Filip.Bozuta@syrmia.com>
>>
>> This patch implements functionality for strace argument printing for ioctls.
>
> Hi; Coverity points out some issues in this change:
>
>
>> +#ifdef TARGET_NR_ioctl
>> +static void
>> +print_syscall_ret_ioctl(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)
>> +{
>> + print_syscall_err(ret);
>> +
>> + if (ret >= 0) {
>> + qemu_log(TARGET_ABI_FMT_ld, ret);
>> +
>> + const IOCTLEntry *ie;
>> + const argtype *arg_type;
>> + void *argptr;
>> + int target_size;
>> +
>> + for (ie = ioctl_entries; ie->target_cmd != 0; ie++) {
>> + if (ie->target_cmd == arg1) {
>> + break;
>> + }
>> + }
>> +
>> + if (ie->target_cmd == arg1 &&
>> + (ie->access == IOC_R || ie->access == IOC_RW)) {
>> + arg_type = ie->arg_type;
>> + qemu_log(" (");
>> + arg_type++;
>> + target_size = thunk_type_size(arg_type, 0);
>> + argptr = lock_user(VERIFY_READ, arg2, target_size, 1);
>
> Here we fail to check that lock_user() didn't return NULL...
>
>> + thunk_print(argptr, arg_type);
>
> ...which would cause a segfault in thunk_print().
> This is CID 1430271.
>
>> + unlock_user(argptr, arg2, target_size);
>> + qemu_log(")");
>> + }
>> + }
>> + qemu_log("\n");
>> +}
>> +#endif
>
>> +#ifdef TARGET_NR_ioctl
>> +static void
>> +print_ioctl(const struct syscallname *name,
>> + abi_long arg0, abi_long arg1, abi_long arg2,
>> + abi_long arg3, abi_long arg4, abi_long arg5)
>> +{
>
>> + case TYPE_PTR:
>> + switch (ie->access) {
>> + case IOC_R:
>> + print_pointer(arg2, 1);
>> + break;
>> + case IOC_W:
>> + case IOC_RW:
>> + arg_type++;
>> + target_size = thunk_type_size(arg_type, 0);
>> + argptr = lock_user(VERIFY_READ, arg2, target_size, 1);
>> + thunk_print(argptr, arg_type);
>
> Similarly here we need to check that lock_user didn't fail.
> This is CID 1430272.
>
>> + unlock_user(argptr, arg2, target_size);
>> + break;
>> + }
>> + break;
>> + default:
>> + g_assert_not_reached();
>> + }
>> + }
>> + }
>> + print_syscall_epilogue(name);
>> +}
Thank you Peter.
I fix that.
Laurent
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2020-07-09 15:30 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-04 16:25 [PULL 00/12] Linux user for 5.1 patches Laurent Vivier
2020-07-04 16:25 ` [PULL 01/12] target/sparc: Translate flushw opcode Laurent Vivier
2020-07-04 16:25 ` [PULL 02/12] linux-user/sparc64: Fix the handling of window spill trap Laurent Vivier
2020-07-04 16:25 ` [PULL 03/12] linux-user: syscall: ioctls: support DRM_IOCTL_VERSION Laurent Vivier
2020-07-04 16:25 ` [PULL 04/12] linux-user: Extend strace support to enable argument printing after syscall execution Laurent Vivier
2020-07-04 16:25 ` [PULL 05/12] linux-user: Add strace support for a group of syscalls Laurent Vivier
2020-07-04 16:25 ` [PULL 06/12] linux-user: Add strace support for printing argument of syscalls used for extended attributes Laurent Vivier
2020-07-04 16:25 ` [PULL 07/12] linux-user: Add strace support for printing arguments of lseek() Laurent Vivier
2020-07-04 16:25 ` [PULL 08/12] linux-user: Add strace support for printing arguments of chown()/lchown() Laurent Vivier
2020-07-04 16:25 ` [PULL 09/12] linux-user: Add strace support for printing arguments of fallocate() Laurent Vivier
2020-07-04 16:25 ` [PULL 10/12] linux-user: Add thunk argument types for SIOCGSTAMP and SIOCGSTAMPNS Laurent Vivier
2020-07-04 16:25 ` [PULL 11/12] linux-user: Add strace support for printing arguments of ioctl() Laurent Vivier
2020-07-09 15:20 ` Peter Maydell
2020-07-09 15:28 ` Laurent Vivier
2020-07-04 16:25 ` [PULL 12/12] MAINTAINERS: update linux-user maintainer Laurent Vivier
2020-07-04 16:40 ` [PULL 00/12] Linux user for 5.1 patches no-reply
2020-07-04 16:53 ` no-reply
2020-07-07 10:16 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.