* [Qemu-devel] [PATCH v14 1/5] linux-user: Add support for translation of statx() syscall
2019-06-27 15:31 [Qemu-devel] [PATCH v14 0/5] linux-user: A set of miscellaneous patches Aleksandar Markovic
@ 2019-06-27 15:31 ` Aleksandar Markovic
2019-06-27 17:07 ` Laurent Vivier
2019-06-27 15:31 ` [Qemu-devel] [PATCH v14 2/5] linux-user: Add support for strace for " Aleksandar Markovic
` (5 subsequent siblings)
6 siblings, 1 reply; 12+ messages in thread
From: Aleksandar Markovic @ 2019-06-27 15:31 UTC (permalink / raw)
To: qemu-devel, laurent; +Cc: Aleksandar Rikalo, amarkovic
From: Aleksandar Rikalo <arikalo@wavecomp.com>
Implement support for translation of system call statx().
The implementation is based on "best effort" approach: if host
is capable of executing statx(), host statx() is used. If not,
the implementation includes invoking a more mature system call
fstatat() on the host side to achieve as close as possible
functionality.
Support for statx() in kernel and glibc was, however, introduced
at different points of time (the difference is more than a year):
- kernel: Linux 4.11 (30 April 2017)
- glibc: glibc 2.28 (1 Aug 2018)
In this patch, the availability of statx() support is established
via __NR_statx (if it is defined, statx() is considered available).
This coincedes with statx() introduction in kernel.
However, the structure statx definition may not be available in
any header for hosts with glibc older than 2.28 (and it is, by
design, to be defined in one of glibc headers), even though the
full statx() functionality may be supported in kernel. Hence, a
structure "target_statx" is defined in this patch, to remove that
dependency on glibc headers, and to use statx() functionality as
soon as the host kernel is capable of supporting it. Such statx
structure definition is used for both target and host structures
statx (of course, this doesn't mean the endian arrangement is
the same on target and host - the endian conversion is done in
all necessary cases).
Signed-off-by: Aleksandar Rikalo <arikalo@wavecomp.com>
Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
---
linux-user/syscall.c | 115 +++++++++++++++++++++++++++++++++++++++++++++-
linux-user/syscall_defs.h | 37 +++++++++++++++
2 files changed, 151 insertions(+), 1 deletion(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index b187c12..2001266 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -43,6 +43,7 @@
#include <sys/times.h>
#include <sys/shm.h>
#include <sys/sem.h>
+#include <sys/stat.h>
#include <sys/statfs.h>
#include <utime.h>
#include <sys/sysinfo.h>
@@ -315,6 +316,14 @@ _syscall5(int, kcmp, pid_t, pid1, pid_t, pid2, int, type,
unsigned long, idx1, unsigned long, idx2)
#endif
+/*
+ * It is assumed that struct statx is architecture independent.
+ */
+#if defined(TARGET_NR_statx) && defined(__NR_statx)
+_syscall5(int, statx, int, dirfd, const char *, pathname, int, flags,
+ unsigned int, mask, struct target_statx *, statxbuf)
+#endif
+
static bitmask_transtbl fcntl_flags_tbl[] = {
{ TARGET_O_ACCMODE, TARGET_O_WRONLY, O_ACCMODE, O_WRONLY, },
{ TARGET_O_ACCMODE, TARGET_O_RDWR, O_ACCMODE, O_RDWR, },
@@ -6467,6 +6476,48 @@ static inline abi_long host_to_target_stat64(void *cpu_env,
}
#endif
+#if defined(TARGET_NR_statx) && defined(__NR_statx)
+static inline abi_long host_to_target_statx(struct target_statx *host_stx,
+ abi_ulong target_addr)
+{
+ struct target_statx *target_stx;
+
+ if (!lock_user_struct(VERIFY_WRITE, target_stx, target_addr, 0)) {
+ return -TARGET_EFAULT;
+ }
+ memset(target_stx, 0, sizeof(*target_stx));
+
+ __put_user(host_stx->stx_mask, &target_stx->stx_mask);
+ __put_user(host_stx->stx_blksize, &target_stx->stx_blksize);
+ __put_user(host_stx->stx_attributes, &target_stx->stx_attributes);
+ __put_user(host_stx->stx_nlink, &target_stx->stx_nlink);
+ __put_user(host_stx->stx_uid, &target_stx->stx_uid);
+ __put_user(host_stx->stx_gid, &target_stx->stx_gid);
+ __put_user(host_stx->stx_mode, &target_stx->stx_mode);
+ __put_user(host_stx->stx_ino, &target_stx->stx_ino);
+ __put_user(host_stx->stx_size, &target_stx->stx_size);
+ __put_user(host_stx->stx_blocks, &target_stx->stx_blocks);
+ __put_user(host_stx->stx_attributes_mask, &target_stx->stx_attributes_mask);
+ __put_user(host_stx->stx_atime.tv_sec, &target_stx->stx_atime.tv_sec);
+ __put_user(host_stx->stx_atime.tv_nsec, &target_stx->stx_atime.tv_nsec);
+ __put_user(host_stx->stx_btime.tv_sec, &target_stx->stx_atime.tv_sec);
+ __put_user(host_stx->stx_btime.tv_nsec, &target_stx->stx_atime.tv_nsec);
+ __put_user(host_stx->stx_ctime.tv_sec, &target_stx->stx_atime.tv_sec);
+ __put_user(host_stx->stx_ctime.tv_nsec, &target_stx->stx_atime.tv_nsec);
+ __put_user(host_stx->stx_mtime.tv_sec, &target_stx->stx_atime.tv_sec);
+ __put_user(host_stx->stx_mtime.tv_nsec, &target_stx->stx_atime.tv_nsec);
+ __put_user(host_stx->stx_rdev_major, &target_stx->stx_rdev_major);
+ __put_user(host_stx->stx_rdev_minor, &target_stx->stx_rdev_minor);
+ __put_user(host_stx->stx_dev_major, &target_stx->stx_dev_major);
+ __put_user(host_stx->stx_dev_minor, &target_stx->stx_dev_minor);
+
+ unlock_user_struct(target_stx, target_addr, 1);
+
+ return 0;
+}
+#endif
+
+
/* ??? Using host futex calls even when target atomic operations
are not really atomic probably breaks things. However implementing
futexes locally would make futexes shared between multiple processes
@@ -7045,7 +7096,8 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
abi_long ret;
#if defined(TARGET_NR_stat) || defined(TARGET_NR_stat64) \
|| defined(TARGET_NR_lstat) || defined(TARGET_NR_lstat64) \
- || defined(TARGET_NR_fstat) || defined(TARGET_NR_fstat64)
+ || defined(TARGET_NR_fstat) || defined(TARGET_NR_fstat64) \
+ || defined(TARGET_NR_statx)
struct stat st;
#endif
#if defined(TARGET_NR_statfs) || defined(TARGET_NR_statfs64) \
@@ -10123,6 +10175,67 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
ret = host_to_target_stat64(cpu_env, arg3, &st);
return ret;
#endif
+#if defined(TARGET_NR_statx)
+ case TARGET_NR_statx:
+ {
+ struct target_statx *target_stx;
+ int dirfd = arg1;
+ int flags = arg3;
+
+ p = lock_user_string(arg2);
+ if (p == NULL) {
+ return -TARGET_EFAULT;
+ }
+#if defined(__NR_statx)
+ {
+ /*
+ * It is assumed that struct statx is architecture independent.
+ */
+ struct target_statx host_stx;
+ int mask = arg4;
+
+ ret = get_errno(statx(dirfd, p, flags, mask, &host_stx));
+ if (!is_error(ret)) {
+ if (host_to_target_statx(&host_stx, arg5) != 0) {
+ unlock_user(p, arg2, 0);
+ return -TARGET_EFAULT;
+ }
+ }
+
+ if (ret != -TARGET_ENOSYS) {
+ unlock_user(p, arg2, 0);
+ return ret;
+ }
+ }
+#endif
+ ret = get_errno(fstatat(dirfd, path(p), &st, flags));
+ unlock_user(p, arg2, 0);
+
+ if (!is_error(ret)) {
+ if (!lock_user_struct(VERIFY_WRITE, target_stx, arg5, 0)) {
+ return -TARGET_EFAULT;
+ }
+ memset(target_stx, 0, sizeof(*target_stx));
+ __put_user(major(st.st_dev), &target_stx->stx_dev_major);
+ __put_user(minor(st.st_dev), &target_stx->stx_dev_minor);
+ __put_user(st.st_ino, &target_stx->stx_ino);
+ __put_user(st.st_mode, &target_stx->stx_mode);
+ __put_user(st.st_uid, &target_stx->stx_uid);
+ __put_user(st.st_gid, &target_stx->stx_gid);
+ __put_user(st.st_nlink, &target_stx->stx_nlink);
+ __put_user(major(st.st_rdev), &target_stx->stx_rdev_major);
+ __put_user(minor(st.st_rdev), &target_stx->stx_rdev_minor);
+ __put_user(st.st_size, &target_stx->stx_size);
+ __put_user(st.st_blksize, &target_stx->stx_blksize);
+ __put_user(st.st_blocks, &target_stx->stx_blocks);
+ __put_user(st.st_atime, &target_stx->stx_atime.tv_sec);
+ __put_user(st.st_mtime, &target_stx->stx_mtime.tv_sec);
+ __put_user(st.st_ctime, &target_stx->stx_ctime.tv_sec);
+ unlock_user_struct(target_stx, arg5, 1);
+ }
+ }
+ return ret;
+#endif
#ifdef TARGET_NR_lchown
case TARGET_NR_lchown:
if (!(p = lock_user_string(arg1)))
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 7f141f6..170c4dd 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -2536,4 +2536,41 @@ struct target_user_cap_data {
/* Return size of the log buffer */
#define TARGET_SYSLOG_ACTION_SIZE_BUFFER 10
+struct target_statx_timestamp {
+ int64_t tv_sec;
+ uint32_t tv_nsec;
+ int32_t __reserved;
+};
+
+struct target_statx {
+ /* 0x00 */
+ uint32_t stx_mask; /* What results were written [uncond] */
+ uint32_t stx_blksize; /* Preferred general I/O size [uncond] */
+ uint64_t stx_attributes; /* Flags conveying information about the file */
+ /* 0x10 */
+ uint32_t stx_nlink; /* Number of hard links */
+ uint32_t stx_uid; /* User ID of owner */
+ uint32_t stx_gid; /* Group ID of owner */
+ uint16_t stx_mode; /* File mode */
+ uint16_t __spare0[1];
+ /* 0x20 */
+ uint64_t stx_ino; /* Inode number */
+ uint64_t stx_size; /* File size */
+ uint64_t stx_blocks; /* Number of 512-byte blocks allocated */
+ uint64_t stx_attributes_mask; /* Mask to show what is supported */
+ /* 0x40 */
+ struct target_statx_timestamp stx_atime; /* Last access time */
+ struct target_statx_timestamp stx_btime; /* File creation time */
+ struct target_statx_timestamp stx_ctime; /* Last attribute change time */
+ struct target_statx_timestamp stx_mtime; /* Last data modification time */
+ /* 0x80 */
+ uint32_t stx_rdev_major; /* Device ID of special file [if bdev/cdev] */
+ uint32_t stx_rdev_minor;
+ uint32_t stx_dev_major; /* ID of device containing file [uncond] */
+ uint32_t stx_dev_minor;
+ /* 0x90 */
+ uint64_t __spare2[14]; /* Spare space for future expansion */
+ /* 0x100 */
+};
+
#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [Qemu-devel] [PATCH v14 1/5] linux-user: Add support for translation of statx() syscall
2019-06-27 15:31 ` [Qemu-devel] [PATCH v14 1/5] linux-user: Add support for translation of statx() syscall Aleksandar Markovic
@ 2019-06-27 17:07 ` Laurent Vivier
0 siblings, 0 replies; 12+ messages in thread
From: Laurent Vivier @ 2019-06-27 17:07 UTC (permalink / raw)
To: Aleksandar Markovic, qemu-devel; +Cc: Aleksandar Rikalo, amarkovic
Le 27/06/2019 à 17:31, Aleksandar Markovic a écrit :
> From: Aleksandar Rikalo <arikalo@wavecomp.com>
>
> Implement support for translation of system call statx().
>
> The implementation is based on "best effort" approach: if host
> is capable of executing statx(), host statx() is used. If not,
> the implementation includes invoking a more mature system call
> fstatat() on the host side to achieve as close as possible
> functionality.
>
> Support for statx() in kernel and glibc was, however, introduced
> at different points of time (the difference is more than a year):
>
> - kernel: Linux 4.11 (30 April 2017)
> - glibc: glibc 2.28 (1 Aug 2018)
>
> In this patch, the availability of statx() support is established
> via __NR_statx (if it is defined, statx() is considered available).
> This coincedes with statx() introduction in kernel.
>
> However, the structure statx definition may not be available in
> any header for hosts with glibc older than 2.28 (and it is, by
> design, to be defined in one of glibc headers), even though the
> full statx() functionality may be supported in kernel. Hence, a
> structure "target_statx" is defined in this patch, to remove that
> dependency on glibc headers, and to use statx() functionality as
> soon as the host kernel is capable of supporting it. Such statx
> structure definition is used for both target and host structures
> statx (of course, this doesn't mean the endian arrangement is
> the same on target and host - the endian conversion is done in
> all necessary cases).
>
> Signed-off-by: Aleksandar Rikalo <arikalo@wavecomp.com>
> Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
> ---
> linux-user/syscall.c | 115 +++++++++++++++++++++++++++++++++++++++++++++-
> linux-user/syscall_defs.h | 37 +++++++++++++++
> 2 files changed, 151 insertions(+), 1 deletion(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index b187c12..2001266 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -43,6 +43,7 @@
> #include <sys/times.h>
> #include <sys/shm.h>
> #include <sys/sem.h>
> +#include <sys/stat.h>
> #include <sys/statfs.h>
> #include <utime.h>
> #include <sys/sysinfo.h>
> @@ -315,6 +316,14 @@ _syscall5(int, kcmp, pid_t, pid1, pid_t, pid2, int, type,
> unsigned long, idx1, unsigned long, idx2)
> #endif
>
> +/*
> + * It is assumed that struct statx is architecture independent.
> + */
> +#if defined(TARGET_NR_statx) && defined(__NR_statx)
> +_syscall5(int, statx, int, dirfd, const char *, pathname, int, flags,
> + unsigned int, mask, struct target_statx *, statxbuf)
> +#endif
> +
> static bitmask_transtbl fcntl_flags_tbl[] = {
> { TARGET_O_ACCMODE, TARGET_O_WRONLY, O_ACCMODE, O_WRONLY, },
> { TARGET_O_ACCMODE, TARGET_O_RDWR, O_ACCMODE, O_RDWR, },
> @@ -6467,6 +6476,48 @@ static inline abi_long host_to_target_stat64(void *cpu_env,
> }
> #endif
>
> +#if defined(TARGET_NR_statx) && defined(__NR_statx)
> +static inline abi_long host_to_target_statx(struct target_statx *host_stx,
> + abi_ulong target_addr)
> +{
> + struct target_statx *target_stx;
> +
> + if (!lock_user_struct(VERIFY_WRITE, target_stx, target_addr, 0)) {
> + return -TARGET_EFAULT;
> + }
> + memset(target_stx, 0, sizeof(*target_stx));
> +
> + __put_user(host_stx->stx_mask, &target_stx->stx_mask);
> + __put_user(host_stx->stx_blksize, &target_stx->stx_blksize);
> + __put_user(host_stx->stx_attributes, &target_stx->stx_attributes);
> + __put_user(host_stx->stx_nlink, &target_stx->stx_nlink);
> + __put_user(host_stx->stx_uid, &target_stx->stx_uid);
> + __put_user(host_stx->stx_gid, &target_stx->stx_gid);
> + __put_user(host_stx->stx_mode, &target_stx->stx_mode);
> + __put_user(host_stx->stx_ino, &target_stx->stx_ino);
> + __put_user(host_stx->stx_size, &target_stx->stx_size);
> + __put_user(host_stx->stx_blocks, &target_stx->stx_blocks);
> + __put_user(host_stx->stx_attributes_mask, &target_stx->stx_attributes_mask);
> + __put_user(host_stx->stx_atime.tv_sec, &target_stx->stx_atime.tv_sec);
> + __put_user(host_stx->stx_atime.tv_nsec, &target_stx->stx_atime.tv_nsec);
> + __put_user(host_stx->stx_btime.tv_sec, &target_stx->stx_atime.tv_sec);
> + __put_user(host_stx->stx_btime.tv_nsec, &target_stx->stx_atime.tv_nsec);
> + __put_user(host_stx->stx_ctime.tv_sec, &target_stx->stx_atime.tv_sec);
> + __put_user(host_stx->stx_ctime.tv_nsec, &target_stx->stx_atime.tv_nsec);
> + __put_user(host_stx->stx_mtime.tv_sec, &target_stx->stx_atime.tv_sec);
> + __put_user(host_stx->stx_mtime.tv_nsec, &target_stx->stx_atime.tv_nsec);
> + __put_user(host_stx->stx_rdev_major, &target_stx->stx_rdev_major);
> + __put_user(host_stx->stx_rdev_minor, &target_stx->stx_rdev_minor);
> + __put_user(host_stx->stx_dev_major, &target_stx->stx_dev_major);
> + __put_user(host_stx->stx_dev_minor, &target_stx->stx_dev_minor);
> +
> + unlock_user_struct(target_stx, target_addr, 1);
> +
> + return 0;
> +}
> +#endif
> +
> +
> /* ??? Using host futex calls even when target atomic operations
> are not really atomic probably breaks things. However implementing
> futexes locally would make futexes shared between multiple processes
> @@ -7045,7 +7096,8 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> abi_long ret;
> #if defined(TARGET_NR_stat) || defined(TARGET_NR_stat64) \
> || defined(TARGET_NR_lstat) || defined(TARGET_NR_lstat64) \
> - || defined(TARGET_NR_fstat) || defined(TARGET_NR_fstat64)
> + || defined(TARGET_NR_fstat) || defined(TARGET_NR_fstat64) \
> + || defined(TARGET_NR_statx)
> struct stat st;
> #endif
> #if defined(TARGET_NR_statfs) || defined(TARGET_NR_statfs64) \
> @@ -10123,6 +10175,67 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> ret = host_to_target_stat64(cpu_env, arg3, &st);
> return ret;
> #endif
> +#if defined(TARGET_NR_statx)
> + case TARGET_NR_statx:
> + {
> + struct target_statx *target_stx;
> + int dirfd = arg1;
> + int flags = arg3;
> +
> + p = lock_user_string(arg2);
> + if (p == NULL) {
> + return -TARGET_EFAULT;
> + }
> +#if defined(__NR_statx)
> + {
> + /*
> + * It is assumed that struct statx is architecture independent.
> + */
> + struct target_statx host_stx;
> + int mask = arg4;
> +
> + ret = get_errno(statx(dirfd, p, flags, mask, &host_stx));
> + if (!is_error(ret)) {
> + if (host_to_target_statx(&host_stx, arg5) != 0) {
> + unlock_user(p, arg2, 0);
> + return -TARGET_EFAULT;
> + }
> + }
> +
> + if (ret != -TARGET_ENOSYS) {
> + unlock_user(p, arg2, 0);
> + return ret;
> + }
> + }
> +#endif
> + ret = get_errno(fstatat(dirfd, path(p), &st, flags));
> + unlock_user(p, arg2, 0);
> +
> + if (!is_error(ret)) {
> + if (!lock_user_struct(VERIFY_WRITE, target_stx, arg5, 0)) {
> + return -TARGET_EFAULT;
> + }
> + memset(target_stx, 0, sizeof(*target_stx));
> + __put_user(major(st.st_dev), &target_stx->stx_dev_major);
> + __put_user(minor(st.st_dev), &target_stx->stx_dev_minor);
> + __put_user(st.st_ino, &target_stx->stx_ino);
> + __put_user(st.st_mode, &target_stx->stx_mode);
> + __put_user(st.st_uid, &target_stx->stx_uid);
> + __put_user(st.st_gid, &target_stx->stx_gid);
> + __put_user(st.st_nlink, &target_stx->stx_nlink);
> + __put_user(major(st.st_rdev), &target_stx->stx_rdev_major);
> + __put_user(minor(st.st_rdev), &target_stx->stx_rdev_minor);
> + __put_user(st.st_size, &target_stx->stx_size);
> + __put_user(st.st_blksize, &target_stx->stx_blksize);
> + __put_user(st.st_blocks, &target_stx->stx_blocks);
> + __put_user(st.st_atime, &target_stx->stx_atime.tv_sec);
> + __put_user(st.st_mtime, &target_stx->stx_mtime.tv_sec);
> + __put_user(st.st_ctime, &target_stx->stx_ctime.tv_sec);
> + unlock_user_struct(target_stx, arg5, 1);
> + }
> + }
> + return ret;
> +#endif
> #ifdef TARGET_NR_lchown
> case TARGET_NR_lchown:
> if (!(p = lock_user_string(arg1)))
> diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
> index 7f141f6..170c4dd 100644
> --- a/linux-user/syscall_defs.h
> +++ b/linux-user/syscall_defs.h
> @@ -2536,4 +2536,41 @@ struct target_user_cap_data {
> /* Return size of the log buffer */
> #define TARGET_SYSLOG_ACTION_SIZE_BUFFER 10
>
> +struct target_statx_timestamp {
> + int64_t tv_sec;
> + uint32_t tv_nsec;
> + int32_t __reserved;
> +};
> +
> +struct target_statx {
> + /* 0x00 */
> + uint32_t stx_mask; /* What results were written [uncond] */
> + uint32_t stx_blksize; /* Preferred general I/O size [uncond] */
> + uint64_t stx_attributes; /* Flags conveying information about the file */
> + /* 0x10 */
> + uint32_t stx_nlink; /* Number of hard links */
> + uint32_t stx_uid; /* User ID of owner */
> + uint32_t stx_gid; /* Group ID of owner */
> + uint16_t stx_mode; /* File mode */
> + uint16_t __spare0[1];
> + /* 0x20 */
> + uint64_t stx_ino; /* Inode number */
> + uint64_t stx_size; /* File size */
> + uint64_t stx_blocks; /* Number of 512-byte blocks allocated */
> + uint64_t stx_attributes_mask; /* Mask to show what is supported */
> + /* 0x40 */
> + struct target_statx_timestamp stx_atime; /* Last access time */
> + struct target_statx_timestamp stx_btime; /* File creation time */
> + struct target_statx_timestamp stx_ctime; /* Last attribute change time */
> + struct target_statx_timestamp stx_mtime; /* Last data modification time */
> + /* 0x80 */
> + uint32_t stx_rdev_major; /* Device ID of special file [if bdev/cdev] */
> + uint32_t stx_rdev_minor;
> + uint32_t stx_dev_major; /* ID of device containing file [uncond] */
> + uint32_t stx_dev_minor;
> + /* 0x90 */
> + uint64_t __spare2[14]; /* Spare space for future expansion */
> + /* 0x100 */
> +};
> +
> #endif
>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Qemu-devel] [PATCH v14 2/5] linux-user: Add support for strace for statx() syscall
2019-06-27 15:31 [Qemu-devel] [PATCH v14 0/5] linux-user: A set of miscellaneous patches Aleksandar Markovic
2019-06-27 15:31 ` [Qemu-devel] [PATCH v14 1/5] linux-user: Add support for translation of statx() syscall Aleksandar Markovic
@ 2019-06-27 15:31 ` Aleksandar Markovic
2019-06-27 15:31 ` [Qemu-devel] [PATCH v14 3/5] linux-user: Fix flock structure for MIPS O64 ABI Aleksandar Markovic
` (4 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Aleksandar Markovic @ 2019-06-27 15:31 UTC (permalink / raw)
To: qemu-devel, laurent; +Cc: amarkovic, Jim Wilson
From: Jim Wilson <jimw@sifive.com>
All of the flags need to be conditional as old systems don't have
statx support. Otherwise it works the same as other stat family
syscalls. This requires the pending patch to add statx support.
Tested on Ubuntu 16.04 (no host statx) and Ubuntu 19.04 (with host
statx) using a riscv32-linux toolchain.
Signed-off-by: Jim Wilson <jimw@sifive.com>
Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/strace.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++
linux-user/strace.list | 3 ++
2 files changed, 89 insertions(+)
diff --git a/linux-user/strace.c b/linux-user/strace.c
index 6f72a74..c80e93b 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -976,6 +976,76 @@ UNUSED static struct flags msg_flags[] = {
FLAG_END,
};
+UNUSED static struct flags statx_flags[] = {
+#ifdef AT_EMPTY_PATH
+ FLAG_GENERIC(AT_EMPTY_PATH),
+#endif
+#ifdef AT_NO_AUTOMOUNT
+ FLAG_GENERIC(AT_NO_AUTOMOUNT),
+#endif
+#ifdef AT_SYMLINK_NOFOLLOW
+ FLAG_GENERIC(AT_SYMLINK_NOFOLLOW),
+#endif
+#ifdef AT_STATX_SYNC_AS_STAT
+ FLAG_GENERIC(AT_STATX_SYNC_AS_STAT),
+#endif
+#ifdef AT_STATX_FORCE_SYNC
+ FLAG_GENERIC(AT_STATX_FORCE_SYNC),
+#endif
+#ifdef AT_STATX_DONT_SYNC
+ FLAG_GENERIC(AT_STATX_DONT_SYNC),
+#endif
+ FLAG_END,
+};
+
+UNUSED static struct flags statx_mask[] = {
+/* This must come first, because it includes everything. */
+#ifdef STATX_ALL
+ FLAG_GENERIC(STATX_ALL),
+#endif
+/* This must come second; it includes everything except STATX_BTIME. */
+#ifdef STATX_BASIC_STATS
+ FLAG_GENERIC(STATX_BASIC_STATS),
+#endif
+#ifdef STATX_TYPE
+ FLAG_GENERIC(STATX_TYPE),
+#endif
+#ifdef STATX_MODE
+ FLAG_GENERIC(STATX_MODE),
+#endif
+#ifdef STATX_NLINK
+ FLAG_GENERIC(STATX_NLINK),
+#endif
+#ifdef STATX_UID
+ FLAG_GENERIC(STATX_UID),
+#endif
+#ifdef STATX_GID
+ FLAG_GENERIC(STATX_GID),
+#endif
+#ifdef STATX_ATIME
+ FLAG_GENERIC(STATX_ATIME),
+#endif
+#ifdef STATX_MTIME
+ FLAG_GENERIC(STATX_MTIME),
+#endif
+#ifdef STATX_CTIME
+ FLAG_GENERIC(STATX_CTIME),
+#endif
+#ifdef STATX_INO
+ FLAG_GENERIC(STATX_INO),
+#endif
+#ifdef STATX_SIZE
+ FLAG_GENERIC(STATX_SIZE),
+#endif
+#ifdef STATX_BLOCKS
+ FLAG_GENERIC(STATX_BLOCKS),
+#endif
+#ifdef STATX_BTIME
+ FLAG_GENERIC(STATX_BTIME),
+#endif
+ FLAG_END,
+};
+
/*
* print_xxx utility functions. These are used to print syscall
* parameters in certain format. All of these have parameter
@@ -2611,6 +2681,22 @@ print_tgkill(const struct syscallname *name,
}
#endif
+#ifdef TARGET_NR_statx
+static void
+print_statx(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_at_dirfd(arg0, 0);
+ print_string(arg1, 0);
+ print_flags(statx_flags, arg2, 0);
+ print_flags(statx_mask, arg3, 0);
+ print_pointer(arg4, 1);
+ 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 db21ce4..63a9466 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -1650,3 +1650,6 @@
#ifdef TARGET_NR_atomic_barrier
{ TARGET_NR_atomic_barrier, "atomic_barrier", NULL, NULL, NULL },
#endif
+#ifdef TARGET_NR_statx
+{ TARGET_NR_statx, "statx", NULL, print_statx, NULL },
+#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Qemu-devel] [PATCH v14 3/5] linux-user: Fix flock structure for MIPS O64 ABI
2019-06-27 15:31 [Qemu-devel] [PATCH v14 0/5] linux-user: A set of miscellaneous patches Aleksandar Markovic
2019-06-27 15:31 ` [Qemu-devel] [PATCH v14 1/5] linux-user: Add support for translation of statx() syscall Aleksandar Markovic
2019-06-27 15:31 ` [Qemu-devel] [PATCH v14 2/5] linux-user: Add support for strace for " Aleksandar Markovic
@ 2019-06-27 15:31 ` Aleksandar Markovic
2019-06-27 17:08 ` Laurent Vivier
2019-06-27 15:31 ` [Qemu-devel] [PATCH v14 4/5] linux-user: Introduce TARGET_HAVE_ARCH_STRUCT_FLOCK Aleksandar Markovic
` (3 subsequent siblings)
6 siblings, 1 reply; 12+ messages in thread
From: Aleksandar Markovic @ 2019-06-27 15:31 UTC (permalink / raw)
To: qemu-devel, laurent; +Cc: amarkovic
From: Aleksandar Markovic <amarkovic@wavecomp.com>
Only MIPS O32 and N32 have special (different than other
architectures) definition of structure flock in kernel.
Bring flock definition for MIPS O64 ABI to the correct state,
which is currently different than the most common definition,
and it should be the same.
Reported-by: Dragan Mladjenovic <dmladjenovic@wavecomp.com>
Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
---
linux-user/generic/fcntl.h | 2 +-
linux-user/mips/target_fcntl.h | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/linux-user/generic/fcntl.h b/linux-user/generic/fcntl.h
index a775a49..1b48dde 100644
--- a/linux-user/generic/fcntl.h
+++ b/linux-user/generic/fcntl.h
@@ -129,7 +129,7 @@ struct target_flock {
short l_whence;
abi_long l_start;
abi_long l_len;
-#if defined(TARGET_MIPS)
+#if defined(TARGET_MIPS) && (TARGET_ABI_BITS == 32)
abi_long l_sysid;
#endif
int l_pid;
diff --git a/linux-user/mips/target_fcntl.h b/linux-user/mips/target_fcntl.h
index 000527c..795bba7 100644
--- a/linux-user/mips/target_fcntl.h
+++ b/linux-user/mips/target_fcntl.h
@@ -27,7 +27,11 @@
#define TARGET_F_SETOWN 24 /* for sockets. */
#define TARGET_F_GETOWN 23 /* for sockets. */
+#if (TARGET_ABI_BITS == 32)
#define TARGET_ARCH_FLOCK_PAD abi_long pad[4];
+#else
+#define TARGET_ARCH_FLOCK_PAD
+#endif
#define TARGET_ARCH_FLOCK64_PAD
#define TARGET_F_GETLK64 33 /* using 'struct flock64' */
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [Qemu-devel] [PATCH v14 3/5] linux-user: Fix flock structure for MIPS O64 ABI
2019-06-27 15:31 ` [Qemu-devel] [PATCH v14 3/5] linux-user: Fix flock structure for MIPS O64 ABI Aleksandar Markovic
@ 2019-06-27 17:08 ` Laurent Vivier
0 siblings, 0 replies; 12+ messages in thread
From: Laurent Vivier @ 2019-06-27 17:08 UTC (permalink / raw)
To: Aleksandar Markovic, qemu-devel; +Cc: amarkovic
Le 27/06/2019 à 17:31, Aleksandar Markovic a écrit :
> From: Aleksandar Markovic <amarkovic@wavecomp.com>
>
> Only MIPS O32 and N32 have special (different than other
> architectures) definition of structure flock in kernel.
>
> Bring flock definition for MIPS O64 ABI to the correct state,
> which is currently different than the most common definition,
> and it should be the same.
>
> Reported-by: Dragan Mladjenovic <dmladjenovic@wavecomp.com>
> Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
> ---
> linux-user/generic/fcntl.h | 2 +-
> linux-user/mips/target_fcntl.h | 4 ++++
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/linux-user/generic/fcntl.h b/linux-user/generic/fcntl.h
> index a775a49..1b48dde 100644
> --- a/linux-user/generic/fcntl.h
> +++ b/linux-user/generic/fcntl.h
> @@ -129,7 +129,7 @@ struct target_flock {
> short l_whence;
> abi_long l_start;
> abi_long l_len;
> -#if defined(TARGET_MIPS)
> +#if defined(TARGET_MIPS) && (TARGET_ABI_BITS == 32)
> abi_long l_sysid;
> #endif
> int l_pid;
> diff --git a/linux-user/mips/target_fcntl.h b/linux-user/mips/target_fcntl.h
> index 000527c..795bba7 100644
> --- a/linux-user/mips/target_fcntl.h
> +++ b/linux-user/mips/target_fcntl.h
> @@ -27,7 +27,11 @@
> #define TARGET_F_SETOWN 24 /* for sockets. */
> #define TARGET_F_GETOWN 23 /* for sockets. */
>
> +#if (TARGET_ABI_BITS == 32)
> #define TARGET_ARCH_FLOCK_PAD abi_long pad[4];
> +#else
> +#define TARGET_ARCH_FLOCK_PAD
> +#endif
> #define TARGET_ARCH_FLOCK64_PAD
>
> #define TARGET_F_GETLK64 33 /* using 'struct flock64' */
>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Qemu-devel] [PATCH v14 4/5] linux-user: Introduce TARGET_HAVE_ARCH_STRUCT_FLOCK
2019-06-27 15:31 [Qemu-devel] [PATCH v14 0/5] linux-user: A set of miscellaneous patches Aleksandar Markovic
` (2 preceding siblings ...)
2019-06-27 15:31 ` [Qemu-devel] [PATCH v14 3/5] linux-user: Fix flock structure for MIPS O64 ABI Aleksandar Markovic
@ 2019-06-27 15:31 ` Aleksandar Markovic
2019-06-27 17:11 ` Laurent Vivier
2019-06-27 15:31 ` [Qemu-devel] [PATCH v14 5/5] linux-user: Handle EXCP_FPE properly for MIPS Aleksandar Markovic
` (2 subsequent siblings)
6 siblings, 1 reply; 12+ messages in thread
From: Aleksandar Markovic @ 2019-06-27 15:31 UTC (permalink / raw)
To: qemu-devel, laurent; +Cc: amarkovic
From: Aleksandar Markovic <amarkovic@wavecomp.com>
Bring target_flock definitions to be more in sync with the way
flock is defined in kernel.
Basically, the rules from the kernel are:
1. Majority of architectures have a common flock definition.
2. Architectures with 32-bit MIPS ABIs have a sligtly different
flock definition; those architectures are the only arcitectures
that have HAVE_ARCH_STRUCT_FLOCK defined, and that preprocessor
constant is used in the common header as a flag for including or
not including common flock definition.
3. Sparc architectures also have a sligtly different flock
definition, but the difference is only the padding at the end of
the structure. The presence of that padding is determined by
preprocessor constants __ARCH_FLOCK6_PAD and __ARCH_FLOCK64_PAD.
QEMU linux-user already implements rules 1. and 3. in a very
similar way as they are implemented in kernel. However, rule 2.
is implemented in a dissimilar way (for example, the constant
TARGET_HAVE_ARCH_STRUCT_FLOCK is missing), and this patch brings
QEMU implementation much closer to the kernel implementation.
TARGET_HAVE_ARCH_STRUCT_FLOCK64 constant is also introduced to
mimic HAVE_ARCH_STRUCT_FLOCK64 from kernel, but it is not defined
anywhere, however, this is the case with HAVE_ARCH_STRUCT_FLOCK64
in kernel as well.
Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
---
linux-user/generic/fcntl.h | 8 +++++---
linux-user/mips/target_fcntl.h | 17 +++++++++++++----
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/linux-user/generic/fcntl.h b/linux-user/generic/fcntl.h
index 1b48dde..9f727d4 100644
--- a/linux-user/generic/fcntl.h
+++ b/linux-user/generic/fcntl.h
@@ -120,6 +120,7 @@ struct target_f_owner_ex {
#define TARGET_F_SHLCK 8
#endif
+#ifndef TARGET_HAVE_ARCH_STRUCT_FLOCK
#ifndef TARGET_ARCH_FLOCK_PAD
#define TARGET_ARCH_FLOCK_PAD
#endif
@@ -129,13 +130,12 @@ struct target_flock {
short l_whence;
abi_long l_start;
abi_long l_len;
-#if defined(TARGET_MIPS) && (TARGET_ABI_BITS == 32)
- abi_long l_sysid;
-#endif
int l_pid;
TARGET_ARCH_FLOCK_PAD
};
+#endif
+#ifndef TARGET_HAVE_ARCH_STRUCT_FLOCK64
#ifndef TARGET_ARCH_FLOCK64_PAD
#define TARGET_ARCH_FLOCK64_PAD
#endif
@@ -149,3 +149,5 @@ struct target_flock64 {
TARGET_ARCH_FLOCK64_PAD
};
#endif
+
+#endif
diff --git a/linux-user/mips/target_fcntl.h b/linux-user/mips/target_fcntl.h
index 795bba7..6fc7b8a 100644
--- a/linux-user/mips/target_fcntl.h
+++ b/linux-user/mips/target_fcntl.h
@@ -28,11 +28,20 @@
#define TARGET_F_GETOWN 23 /* for sockets. */
#if (TARGET_ABI_BITS == 32)
-#define TARGET_ARCH_FLOCK_PAD abi_long pad[4];
-#else
-#define TARGET_ARCH_FLOCK_PAD
+
+struct target_flock {
+ short l_type;
+ short l_whence;
+ abi_long l_start;
+ abi_long l_len;
+ abi_long l_sysid;
+ int l_pid;
+ abi_long pad[4];
+};
+
+#define TARGET_HAVE_ARCH_STRUCT_FLOCK
+
#endif
-#define TARGET_ARCH_FLOCK64_PAD
#define TARGET_F_GETLK64 33 /* using 'struct flock64' */
#define TARGET_F_SETLK64 34
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [Qemu-devel] [PATCH v14 4/5] linux-user: Introduce TARGET_HAVE_ARCH_STRUCT_FLOCK
2019-06-27 15:31 ` [Qemu-devel] [PATCH v14 4/5] linux-user: Introduce TARGET_HAVE_ARCH_STRUCT_FLOCK Aleksandar Markovic
@ 2019-06-27 17:11 ` Laurent Vivier
0 siblings, 0 replies; 12+ messages in thread
From: Laurent Vivier @ 2019-06-27 17:11 UTC (permalink / raw)
To: Aleksandar Markovic, qemu-devel; +Cc: amarkovic
Le 27/06/2019 à 17:31, Aleksandar Markovic a écrit :
> From: Aleksandar Markovic <amarkovic@wavecomp.com>
>
> Bring target_flock definitions to be more in sync with the way
> flock is defined in kernel.
>
> Basically, the rules from the kernel are:
>
> 1. Majority of architectures have a common flock definition.
>
> 2. Architectures with 32-bit MIPS ABIs have a sligtly different
> flock definition; those architectures are the only arcitectures
> that have HAVE_ARCH_STRUCT_FLOCK defined, and that preprocessor
> constant is used in the common header as a flag for including or
> not including common flock definition.
>
> 3. Sparc architectures also have a sligtly different flock
> definition, but the difference is only the padding at the end of
> the structure. The presence of that padding is determined by
> preprocessor constants __ARCH_FLOCK6_PAD and __ARCH_FLOCK64_PAD.
>
> QEMU linux-user already implements rules 1. and 3. in a very
> similar way as they are implemented in kernel. However, rule 2.
> is implemented in a dissimilar way (for example, the constant
> TARGET_HAVE_ARCH_STRUCT_FLOCK is missing), and this patch brings
> QEMU implementation much closer to the kernel implementation.
> TARGET_HAVE_ARCH_STRUCT_FLOCK64 constant is also introduced to
> mimic HAVE_ARCH_STRUCT_FLOCK64 from kernel, but it is not defined
> anywhere, however, this is the case with HAVE_ARCH_STRUCT_FLOCK64
> in kernel as well.
>
> Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
> ---
> linux-user/generic/fcntl.h | 8 +++++---
> linux-user/mips/target_fcntl.h | 17 +++++++++++++----
> 2 files changed, 18 insertions(+), 7 deletions(-)
>
> diff --git a/linux-user/generic/fcntl.h b/linux-user/generic/fcntl.h
> index 1b48dde..9f727d4 100644
> --- a/linux-user/generic/fcntl.h
> +++ b/linux-user/generic/fcntl.h
> @@ -120,6 +120,7 @@ struct target_f_owner_ex {
> #define TARGET_F_SHLCK 8
> #endif
>
> +#ifndef TARGET_HAVE_ARCH_STRUCT_FLOCK
> #ifndef TARGET_ARCH_FLOCK_PAD
> #define TARGET_ARCH_FLOCK_PAD
> #endif
> @@ -129,13 +130,12 @@ struct target_flock {
> short l_whence;
> abi_long l_start;
> abi_long l_len;
> -#if defined(TARGET_MIPS) && (TARGET_ABI_BITS == 32)
> - abi_long l_sysid;
> -#endif
> int l_pid;
> TARGET_ARCH_FLOCK_PAD
> };
> +#endif
>
> +#ifndef TARGET_HAVE_ARCH_STRUCT_FLOCK64
> #ifndef TARGET_ARCH_FLOCK64_PAD
> #define TARGET_ARCH_FLOCK64_PAD
> #endif
> @@ -149,3 +149,5 @@ struct target_flock64 {
> TARGET_ARCH_FLOCK64_PAD
> };
> #endif
> +
> +#endif
> diff --git a/linux-user/mips/target_fcntl.h b/linux-user/mips/target_fcntl.h
> index 795bba7..6fc7b8a 100644
> --- a/linux-user/mips/target_fcntl.h
> +++ b/linux-user/mips/target_fcntl.h
> @@ -28,11 +28,20 @@
> #define TARGET_F_GETOWN 23 /* for sockets. */
>
> #if (TARGET_ABI_BITS == 32)
> -#define TARGET_ARCH_FLOCK_PAD abi_long pad[4];
> -#else
> -#define TARGET_ARCH_FLOCK_PAD
> +
> +struct target_flock {
> + short l_type;
> + short l_whence;
> + abi_long l_start;
> + abi_long l_len;
> + abi_long l_sysid;
> + int l_pid;
> + abi_long pad[4];
> +};
> +
> +#define TARGET_HAVE_ARCH_STRUCT_FLOCK
> +
> #endif
> -#define TARGET_ARCH_FLOCK64_PAD
>
> #define TARGET_F_GETLK64 33 /* using 'struct flock64' */
> #define TARGET_F_SETLK64 34
>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Qemu-devel] [PATCH v14 5/5] linux-user: Handle EXCP_FPE properly for MIPS
2019-06-27 15:31 [Qemu-devel] [PATCH v14 0/5] linux-user: A set of miscellaneous patches Aleksandar Markovic
` (3 preceding siblings ...)
2019-06-27 15:31 ` [Qemu-devel] [PATCH v14 4/5] linux-user: Introduce TARGET_HAVE_ARCH_STRUCT_FLOCK Aleksandar Markovic
@ 2019-06-27 15:31 ` Aleksandar Markovic
2019-06-27 17:17 ` Laurent Vivier
2019-06-27 17:57 ` [Qemu-devel] [PATCH v14 0/5] linux-user: A set of miscellaneous patches no-reply
2019-06-27 18:48 ` no-reply
6 siblings, 1 reply; 12+ messages in thread
From: Aleksandar Markovic @ 2019-06-27 15:31 UTC (permalink / raw)
To: qemu-devel, laurent; +Cc: amarkovic
From: Aleksandar Markovic <amarkovic@wavecomp.com>
Handle EXCP_FPE properly for MIPS in cpu loop.
Note that a vast majority of FP instructions are not affected by
the absence of the code in this patch, as they use alternative code
paths for handling floating point exceptions (see, for example,
invocations of update_fcr31()) - they rely on softfloat library for
keeping track on exceptions that needs to be raised. However, there
are few MIPS FP instructions (an example is CTC1) that use function
do_raise_exception() directly, and they need the case that is added
in this patch to propagate the FPE exception as designed.
Reported-by: Yunqiang Su <ysu@wavecomp.com>
Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
---
linux-user/mips/cpu_loop.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c
index 43ba267..7d3c6b9 100644
--- a/linux-user/mips/cpu_loop.c
+++ b/linux-user/mips/cpu_loop.c
@@ -540,6 +540,12 @@ done_syscall:
info.si_code = TARGET_ILL_ILLOPC;
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
break;
+ case EXCP_FPE:
+ info.si_signo = TARGET_SIGFPE;
+ info.si_errno = 0;
+ info.si_code = 0;
+ queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ break;
/* The code below was inspired by the MIPS Linux kernel trap
* handling code in arch/mips/kernel/traps.c.
*/
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [Qemu-devel] [PATCH v14 5/5] linux-user: Handle EXCP_FPE properly for MIPS
2019-06-27 15:31 ` [Qemu-devel] [PATCH v14 5/5] linux-user: Handle EXCP_FPE properly for MIPS Aleksandar Markovic
@ 2019-06-27 17:17 ` Laurent Vivier
0 siblings, 0 replies; 12+ messages in thread
From: Laurent Vivier @ 2019-06-27 17:17 UTC (permalink / raw)
To: Aleksandar Markovic, qemu-devel; +Cc: amarkovic
Le 27/06/2019 à 17:31, Aleksandar Markovic a écrit :
> From: Aleksandar Markovic <amarkovic@wavecomp.com>
>
> Handle EXCP_FPE properly for MIPS in cpu loop.
>
> Note that a vast majority of FP instructions are not affected by
> the absence of the code in this patch, as they use alternative code
> paths for handling floating point exceptions (see, for example,
> invocations of update_fcr31()) - they rely on softfloat library for
> keeping track on exceptions that needs to be raised. However, there
> are few MIPS FP instructions (an example is CTC1) that use function
> do_raise_exception() directly, and they need the case that is added
> in this patch to propagate the FPE exception as designed.
>
> Reported-by: Yunqiang Su <ysu@wavecomp.com>
> Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
> ---
> linux-user/mips/cpu_loop.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c
> index 43ba267..7d3c6b9 100644
> --- a/linux-user/mips/cpu_loop.c
> +++ b/linux-user/mips/cpu_loop.c
> @@ -540,6 +540,12 @@ done_syscall:
> info.si_code = TARGET_ILL_ILLOPC;
> queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
> break;
> + case EXCP_FPE:
> + info.si_signo = TARGET_SIGFPE;
> + info.si_errno = 0;
> + info.si_code = 0;
> + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
> + break;
> /* The code below was inspired by the MIPS Linux kernel trap
> * handling code in arch/mips/kernel/traps.c.
> */
>
I think you should set si_code according to FCSR Cause bits.
See force_fcr31_sig() in arch/mips/kernel/traps.c.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Qemu-devel] [PATCH v14 0/5] linux-user: A set of miscellaneous patches
2019-06-27 15:31 [Qemu-devel] [PATCH v14 0/5] linux-user: A set of miscellaneous patches Aleksandar Markovic
` (4 preceding siblings ...)
2019-06-27 15:31 ` [Qemu-devel] [PATCH v14 5/5] linux-user: Handle EXCP_FPE properly for MIPS Aleksandar Markovic
@ 2019-06-27 17:57 ` no-reply
2019-06-27 18:48 ` no-reply
6 siblings, 0 replies; 12+ messages in thread
From: no-reply @ 2019-06-27 17:57 UTC (permalink / raw)
To: aleksandar.markovic; +Cc: qemu-devel, amarkovic, laurent
Patchew URL: https://patchew.org/QEMU/1561649510-21183-1-git-send-email-aleksandar.markovic@rt-rk.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Message-id: 1561649510-21183-1-git-send-email-aleksandar.markovic@rt-rk.com
Type: series
Subject: [Qemu-devel] [PATCH v14 0/5] linux-user: A set of miscellaneous patches
=== 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/1561649510-21183-1-git-send-email-aleksandar.markovic@rt-rk.com -> patchew/1561649510-21183-1-git-send-email-aleksandar.markovic@rt-rk.com
Switched to a new branch 'test'
f9b2b3c6f1 linux-user: Handle EXCP_FPE properly for MIPS
89b4275c89 linux-user: Introduce TARGET_HAVE_ARCH_STRUCT_FLOCK
646a096d0f linux-user: Fix flock structure for MIPS O64 ABI
1ddd32b67c linux-user: Add support for strace for statx() syscall
869e2a4f75 linux-user: Add support for translation of statx() syscall
=== OUTPUT BEGIN ===
1/5 Checking commit 869e2a4f75c0 (linux-user: Add support for translation of statx() syscall)
WARNING: architecture specific defines should be avoided
#60: FILE: linux-user/syscall.c:322:
+#if defined(TARGET_NR_statx) && defined(__NR_statx)
WARNING: architecture specific defines should be avoided
#72: FILE: linux-user/syscall.c:6479:
+#if defined(TARGET_NR_statx) && defined(__NR_statx)
WARNING: architecture specific defines should be avoided
#142: FILE: linux-user/syscall.c:10189:
+#if defined(__NR_statx)
total: 0 errors, 3 warnings, 186 lines checked
Patch 1/5 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
2/5 Checking commit 1ddd32b67c80 (linux-user: Add support for strace for statx() syscall)
ERROR: storage class should be at the beginning of the declaration
#27: FILE: linux-user/strace.c:979:
+UNUSED static struct flags statx_flags[] = {
ERROR: storage class should be at the beginning of the declaration
#49: FILE: linux-user/strace.c:1001:
+UNUSED static struct flags statx_mask[] = {
total: 2 errors, 0 warnings, 104 lines checked
Patch 2/5 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
3/5 Checking commit 646a096d0f06 (linux-user: Fix flock structure for MIPS O64 ABI)
4/5 Checking commit 89b4275c893f (linux-user: Introduce TARGET_HAVE_ARCH_STRUCT_FLOCK)
5/5 Checking commit f9b2b3c6f1f0 (linux-user: Handle EXCP_FPE properly for MIPS)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/1561649510-21183-1-git-send-email-aleksandar.markovic@rt-rk.com/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] 12+ messages in thread* Re: [Qemu-devel] [PATCH v14 0/5] linux-user: A set of miscellaneous patches
2019-06-27 15:31 [Qemu-devel] [PATCH v14 0/5] linux-user: A set of miscellaneous patches Aleksandar Markovic
` (5 preceding siblings ...)
2019-06-27 17:57 ` [Qemu-devel] [PATCH v14 0/5] linux-user: A set of miscellaneous patches no-reply
@ 2019-06-27 18:48 ` no-reply
6 siblings, 0 replies; 12+ messages in thread
From: no-reply @ 2019-06-27 18:48 UTC (permalink / raw)
To: aleksandar.markovic; +Cc: qemu-devel, amarkovic, laurent
Patchew URL: https://patchew.org/QEMU/1561649510-21183-1-git-send-email-aleksandar.markovic@rt-rk.com/
Hi,
This series failed build test on s390x host. Please find the details below.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
# Testing script will be invoked under the git checkout with
# HEAD pointing to a commit that has the patches applied on top of "base"
# branch
set -e
CC=$HOME/bin/cc
INSTALL=$PWD/install
BUILD=$PWD/build
mkdir -p $BUILD $INSTALL
SRC=$PWD
cd $BUILD
$SRC/configure --cc=$CC --prefix=$INSTALL
make -j4
# XXX: we need reliable clean up
# make check -j4 V=1
make install
echo
echo "=== ENV ==="
env
echo
echo "=== PACKAGES ==="
rpm -qa
=== TEST SCRIPT END ===
CC mips64-linux-user/linux-user/main.o
CC mips64-linux-user/linux-user/syscall.o
CC mipsel-linux-user/thunk.o
/var/tmp/patchew-tester-tmp-xs2cvb4o/src/linux-user/syscall.c:323:16: error: conflicting types for ‘statx’
323 | _syscall5(int, statx, int, dirfd, const char *, pathname, int, flags,
| ^~~~~
/var/tmp/patchew-tester-tmp-xs2cvb4o/src/linux-user/syscall.c:214:13: note: in definition of macro ‘_syscall5’
---
CC mipsel-linux-user/accel/tcg/user-exec-stub.o
CC mipsel-linux-user/linux-user/main.o
CC mipsel-linux-user/linux-user/syscall.o
/var/tmp/patchew-tester-tmp-xs2cvb4o/src/linux-user/syscall.c:323:16: error: conflicting types for ‘statx’
323 | _syscall5(int, statx, int, dirfd, const char *, pathname, int, flags,
| ^~~~~
/var/tmp/patchew-tester-tmp-xs2cvb4o/src/linux-user/syscall.c:214:13: note: in definition of macro ‘_syscall5’
---
CC mips64el-linux-user/linux-user/main.o
CC mips64el-linux-user/linux-user/syscall.o
CC mips64el-linux-user/linux-user/strace.o
/var/tmp/patchew-tester-tmp-xs2cvb4o/src/linux-user/syscall.c:323:16: error: conflicting types for ‘statx’
323 | _syscall5(int, statx, int, dirfd, const char *, pathname, int, flags,
| ^~~~~
/var/tmp/patchew-tester-tmp-xs2cvb4o/src/linux-user/syscall.c:214:13: note: in definition of macro ‘_syscall5’
The full log is available at
http://patchew.org/logs/1561649510-21183-1-git-send-email-aleksandar.markovic@rt-rk.com/testing.s390x/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 12+ messages in thread