From: Laurent Vivier <laurent@vivier.eu>
To: Filip Bozuta <Filip.Bozuta@syrmia.com>, qemu-devel@nongnu.org
Subject: Re: [PATCH v4 3/5] linux-user: Add strace support for printing arguments of syscalls used to lock and unlock memory
Date: Mon, 24 Aug 2020 22:46:42 +0200 [thread overview]
Message-ID: <8c05d92c-a31b-4aeb-f220-c6106c75eded@vivier.eu> (raw)
In-Reply-To: <20200811164553.27713-4-Filip.Bozuta@syrmia.com>
Le 11/08/2020 à 18:45, Filip Bozuta a écrit :
> This patch implements strace argument printing functionality for following syscalls:
>
> * mlock, munlock, mlockall, munlockall - lock and unlock memory
>
> int mlock(const void *addr, size_t len)
> int munlock(const void *addr, size_t len)
> int mlockall(int flags)
> int munlockall(void)
> man page: https://man7.org/linux/man-pages/man2/mlock.2.html
>
> Implementation notes:
>
> Syscall mlockall() takes an argument that is composed of predefined values
> which represent flags that determine the type of locking operation that is
> to be performed. For that reason, a printing function "print_mlockall" was
> stated in file "strace.list". This printing function uses an already existing
> function "print_flags()" to print the "flags" argument. These flags are stated
> inside an array "mlockall_flags" that contains values of type "struct flags".
> These values are instantiated using an existing macro "FLAG_TARGET()" that
> crates aproppriate target flag values based on those defined in files
> '/target_syscall.h'. These target flag values were changed from
> "TARGET_MLOCKALL_MCL*" to "TARGET_MCL_*" so that they can be aproppriately set
> and recognised in "strace.c" with "FLAG_TARGET()". Value for "MCL_ONFAULT"
> was added in this patch. This value was also added in "syscall.c" in function
> "target_to_host_mlockall_arg()". Because this flag value was added in kernel
> version 4.4, it is enwrapped in an #ifdef directive (both in "syscall.c" and
> in "strace.c") as to support older kernel versions.
> 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". Syscall mlock2() is not implemented in
> "syscall.c" and thus it's argument printing is not implemented in this patch.
>
> Signed-off-by: Filip Bozuta <Filip.Bozuta@syrmia.com>
> Reviewed-by: Laurent Vivier <laurent@vivier.eu>
> ---
> linux-user/aarch64/target_syscall.h | 5 +++--
> linux-user/alpha/target_syscall.h | 5 +++--
> linux-user/arm/target_syscall.h | 6 ++++--
> linux-user/cris/target_syscall.h | 5 +++--
> linux-user/hppa/target_syscall.h | 5 +++--
> linux-user/i386/target_syscall.h | 5 +++--
> linux-user/m68k/target_syscall.h | 6 +++---
> linux-user/microblaze/target_syscall.h | 5 +++--
> linux-user/mips/target_syscall.h | 5 +++--
> linux-user/mips64/target_syscall.h | 5 +++--
> linux-user/nios2/target_syscall.h | 5 +++--
> linux-user/openrisc/target_syscall.h | 5 +++--
> linux-user/ppc/target_syscall.h | 5 +++--
> linux-user/riscv/target_syscall.h | 5 +++--
> linux-user/s390x/target_syscall.h | 5 +++--
> linux-user/sh4/target_syscall.h | 5 +++--
> linux-user/sparc/target_syscall.h | 5 +++--
> linux-user/sparc64/target_syscall.h | 5 +++--
> linux-user/strace.c | 21 +++++++++++++++++++++
> linux-user/strace.list | 8 ++++----
> linux-user/syscall.c | 10 ++++++++--
> linux-user/tilegx/target_syscall.h | 5 +++--
> linux-user/x86_64/target_syscall.h | 5 +++--
> linux-user/xtensa/target_syscall.h | 5 +++--
> 24 files changed, 97 insertions(+), 49 deletions(-)
>
> diff --git a/linux-user/aarch64/target_syscall.h b/linux-user/aarch64/target_syscall.h
> index 995e475c73..3194e6b009 100644
> --- a/linux-user/aarch64/target_syscall.h
> +++ b/linux-user/aarch64/target_syscall.h
> @@ -16,8 +16,9 @@ struct target_pt_regs {
> #define UNAME_MINIMUM_RELEASE "3.8.0"
> #define TARGET_CLONE_BACKWARDS
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
>
> #define TARGET_PR_SVE_SET_VL 50
> #define TARGET_PR_SVE_GET_VL 51
> diff --git a/linux-user/alpha/target_syscall.h b/linux-user/alpha/target_syscall.h
> index 3426cc5b4e..fd389422e3 100644
> --- a/linux-user/alpha/target_syscall.h
> +++ b/linux-user/alpha/target_syscall.h
> @@ -258,7 +258,8 @@ struct target_pt_regs {
> #define TARGET_UAC_NOFIX 2
> #define TARGET_UAC_SIGBUS 4
> #define TARGET_MINSIGSTKSZ 4096
> -#define TARGET_MLOCKALL_MCL_CURRENT 0x2000
> -#define TARGET_MLOCKALL_MCL_FUTURE 0x4000
> +#define TARGET_MCL_CURRENT 0x2000
> +#define TARGET_MCL_FUTURE 0x4000
> +#define TARGET_MCL_ONFAULT 0x8000
>
> #endif /* ALPHA_TARGET_SYSCALL_H */
> diff --git a/linux-user/arm/target_syscall.h b/linux-user/arm/target_syscall.h
> index f85cbdaf56..e870ed7a54 100644
> --- a/linux-user/arm/target_syscall.h
> +++ b/linux-user/arm/target_syscall.h
> @@ -28,8 +28,10 @@ struct target_pt_regs {
> #define TARGET_CLONE_BACKWARDS
>
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
> +
> #define TARGET_WANT_OLD_SYS_SELECT
>
> #define TARGET_FORCE_SHMLBA
> diff --git a/linux-user/cris/target_syscall.h b/linux-user/cris/target_syscall.h
> index 29d69009ff..d109a6b42a 100644
> --- a/linux-user/cris/target_syscall.h
> +++ b/linux-user/cris/target_syscall.h
> @@ -40,7 +40,8 @@ struct target_pt_regs {
>
> #define TARGET_CLONE_BACKWARDS2
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
>
> #endif
> diff --git a/linux-user/hppa/target_syscall.h b/linux-user/hppa/target_syscall.h
> index e2f366839d..f34e05edb5 100644
> --- a/linux-user/hppa/target_syscall.h
> +++ b/linux-user/hppa/target_syscall.h
> @@ -23,8 +23,9 @@ struct target_pt_regs {
> #define UNAME_MINIMUM_RELEASE "2.6.32"
> #define TARGET_CLONE_BACKWARDS
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
>
> #undef TARGET_ENOMSG
> #define TARGET_ENOMSG 35
> diff --git a/linux-user/i386/target_syscall.h b/linux-user/i386/target_syscall.h
> index 2854758134..ed356b3908 100644
> --- a/linux-user/i386/target_syscall.h
> +++ b/linux-user/i386/target_syscall.h
> @@ -151,8 +151,9 @@ struct target_vm86plus_struct {
>
> #define TARGET_CLONE_BACKWARDS
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
> #define TARGET_WANT_OLD_SYS_SELECT
>
> #endif /* I386_TARGET_SYSCALL_H */
> diff --git a/linux-user/m68k/target_syscall.h b/linux-user/m68k/target_syscall.h
> index c0366b1c62..23359a6299 100644
> --- a/linux-user/m68k/target_syscall.h
> +++ b/linux-user/m68k/target_syscall.h
> @@ -21,9 +21,9 @@ struct target_pt_regs {
> #define UNAME_MINIMUM_RELEASE "2.6.32"
>
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> -
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
> #define TARGET_WANT_OLD_SYS_SELECT
>
> #endif /* M68K_TARGET_SYSCALL_H */
> diff --git a/linux-user/microblaze/target_syscall.h b/linux-user/microblaze/target_syscall.h
> index 4141cbaa5e..7f653db34f 100644
> --- a/linux-user/microblaze/target_syscall.h
> +++ b/linux-user/microblaze/target_syscall.h
> @@ -50,8 +50,9 @@ struct target_pt_regs {
>
> #define TARGET_CLONE_BACKWARDS
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
>
> #define TARGET_WANT_NI_OLD_SELECT
>
> diff --git a/linux-user/mips/target_syscall.h b/linux-user/mips/target_syscall.h
> index d5509a34a7..dd6fd7af8e 100644
> --- a/linux-user/mips/target_syscall.h
> +++ b/linux-user/mips/target_syscall.h
> @@ -234,8 +234,9 @@ struct target_pt_regs {
>
> #define TARGET_CLONE_BACKWARDS
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
>
> #define TARGET_FORCE_SHMLBA
>
> diff --git a/linux-user/mips64/target_syscall.h b/linux-user/mips64/target_syscall.h
> index 8ccc46822c..8594955eec 100644
> --- a/linux-user/mips64/target_syscall.h
> +++ b/linux-user/mips64/target_syscall.h
> @@ -231,8 +231,9 @@ struct target_pt_regs {
>
> #define TARGET_CLONE_BACKWARDS
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
>
> #define TARGET_FORCE_SHMLBA
>
> diff --git a/linux-user/nios2/target_syscall.h b/linux-user/nios2/target_syscall.h
> index f3b2a500f4..78006c24d4 100644
> --- a/linux-user/nios2/target_syscall.h
> +++ b/linux-user/nios2/target_syscall.h
> @@ -31,7 +31,8 @@ struct target_pt_regs {
> };
>
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
>
> #endif /* NIOS2_TARGET_SYSCALL_H */
> diff --git a/linux-user/openrisc/target_syscall.h b/linux-user/openrisc/target_syscall.h
> index d586d2a018..ef0d89a551 100644
> --- a/linux-user/openrisc/target_syscall.h
> +++ b/linux-user/openrisc/target_syscall.h
> @@ -16,8 +16,9 @@ struct target_pt_regs {
> #define UNAME_MINIMUM_RELEASE "2.6.32"
>
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
>
> #define MMAP_SHIFT TARGET_PAGE_BITS
>
> diff --git a/linux-user/ppc/target_syscall.h b/linux-user/ppc/target_syscall.h
> index afc0570410..c461f878f2 100644
> --- a/linux-user/ppc/target_syscall.h
> +++ b/linux-user/ppc/target_syscall.h
> @@ -72,8 +72,9 @@ struct target_revectored_struct {
> #define TARGET_CLONE_BACKWARDS
>
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 0x2000
> -#define TARGET_MLOCKALL_MCL_FUTURE 0x4000
> +#define TARGET_MCL_CURRENT 0x2000
> +#define TARGET_MCL_FUTURE 0x4000
> +#define TARGET_MCL_ONFAULT 0x8000
> #define TARGET_WANT_NI_OLD_SELECT
>
> #endif /* PPC_TARGET_SYSCALL_H */
> diff --git a/linux-user/riscv/target_syscall.h b/linux-user/riscv/target_syscall.h
> index a88e821f73..dc597c8972 100644
> --- a/linux-user/riscv/target_syscall.h
> +++ b/linux-user/riscv/target_syscall.h
> @@ -51,8 +51,9 @@ struct target_pt_regs {
> #define UNAME_MINIMUM_RELEASE "4.15.0"
>
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
>
> /* clone(flags, newsp, ptidptr, tls, ctidptr) for RISC-V */
> /* This comes from linux/kernel/fork.c, CONFIG_CLONE_BACKWARDS */
> diff --git a/linux-user/s390x/target_syscall.h b/linux-user/s390x/target_syscall.h
> index 8d4f609eaa..94f84178db 100644
> --- a/linux-user/s390x/target_syscall.h
> +++ b/linux-user/s390x/target_syscall.h
> @@ -28,7 +28,8 @@ struct target_pt_regs {
>
> #define TARGET_CLONE_BACKWARDS2
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
>
> #endif /* S390X_TARGET_SYSCALL_H */
> diff --git a/linux-user/sh4/target_syscall.h b/linux-user/sh4/target_syscall.h
> index 2b5f75be13..c1437adafe 100644
> --- a/linux-user/sh4/target_syscall.h
> +++ b/linux-user/sh4/target_syscall.h
> @@ -16,8 +16,9 @@ struct target_pt_regs {
> #define UNAME_MINIMUM_RELEASE "2.6.32"
>
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
>
> #define TARGET_FORCE_SHMLBA
>
> diff --git a/linux-user/sparc/target_syscall.h b/linux-user/sparc/target_syscall.h
> index b9160a771b..d8ea04ea83 100644
> --- a/linux-user/sparc/target_syscall.h
> +++ b/linux-user/sparc/target_syscall.h
> @@ -21,8 +21,9 @@ struct target_pt_regs {
> */
> #define TARGET_CLONE_BACKWARDS
> #define TARGET_MINSIGSTKSZ 4096
> -#define TARGET_MLOCKALL_MCL_CURRENT 0x2000
> -#define TARGET_MLOCKALL_MCL_FUTURE 0x4000
> +#define TARGET_MCL_CURRENT 0x2000
> +#define TARGET_MCL_FUTURE 0x4000
> +#define TARGET_MCL_ONFAULT 0x8000
>
> /* For SPARC SHMLBA is determined at runtime in the kernel, and
> * libc has to runtime-detect it using the hwcaps (see glibc
> diff --git a/linux-user/sparc64/target_syscall.h b/linux-user/sparc64/target_syscall.h
> index 3073a23e03..696a68b1ed 100644
> --- a/linux-user/sparc64/target_syscall.h
> +++ b/linux-user/sparc64/target_syscall.h
> @@ -22,8 +22,9 @@ struct target_pt_regs {
> */
> #define TARGET_CLONE_BACKWARDS
> #define TARGET_MINSIGSTKSZ 4096
> -#define TARGET_MLOCKALL_MCL_CURRENT 0x2000
> -#define TARGET_MLOCKALL_MCL_FUTURE 0x4000
> +#define TARGET_MCL_CURRENT 0x2000
> +#define TARGET_MCL_FUTURE 0x4000
> +#define TARGET_MCL_ONFAULT 0x8000
>
> #define TARGET_FORCE_SHMLBA
>
> diff --git a/linux-user/strace.c b/linux-user/strace.c
> index 7dc239b9f1..40f863c6e2 100644
> --- a/linux-user/strace.c
> +++ b/linux-user/strace.c
> @@ -1194,6 +1194,15 @@ UNUSED static struct flags falloc_flags[] = {
> #endif
> };
>
> +UNUSED static struct flags mlockall_flags[] = {
> + FLAG_TARGET(MCL_CURRENT),
> + FLAG_TARGET(MCL_FUTURE),
> +#ifdef MCL_ONFAULT
> + FLAG_TARGET(MCL_ONFAULT),
> +#endif
> + FLAG_END,
> +};
> +
> /*
> * print_xxx utility functions. These are used to print syscall
> * parameters in certain format. All of these have parameter
> @@ -2005,6 +2014,18 @@ print_ftruncate64(void *cpu_env, const struct syscallname *name,
> }
> #endif
>
> +#ifdef TARGET_NR_mlockall
> +static void
> +print_mlockall(void *cpu_env, const struct syscallname *name,
> + abi_long arg0, abi_long arg1, abi_long arg2,
> + abi_long arg3, abi_long arg4, abi_long arg5)
> +{
> + print_syscall_prologue(name);
> + print_flags(mlockall_flags, arg0, 1);
> + print_syscall_epilogue(name);
> +}
> +#endif
> +
> #if defined(TARGET_NR_socket)
> static void
> print_socket(void *cpu_env, const struct syscallname *name,
> diff --git a/linux-user/strace.list b/linux-user/strace.list
> index 8e5303d035..d0ea7f3464 100644
> --- a/linux-user/strace.list
> +++ b/linux-user/strace.list
> @@ -568,13 +568,13 @@
> { TARGET_NR_mknodat, "mknodat" , NULL, print_mknodat, NULL },
> #endif
> #ifdef TARGET_NR_mlock
> -{ TARGET_NR_mlock, "mlock" , NULL, NULL, NULL },
> +{ TARGET_NR_mlock, "mlock" , "%s(%p," TARGET_FMT_lu ")", NULL, NULL },
> #endif
> #ifdef TARGET_NR_mlock2
> { TARGET_NR_mlock2, "mlock2" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_mlockall
> -{ TARGET_NR_mlockall, "mlockall" , NULL, NULL, NULL },
> +{ TARGET_NR_mlockall, "mlockall" , NULL, print_mlockall, NULL },
> #endif
> #ifdef TARGET_NR_mmap
> { TARGET_NR_mmap, "mmap" , NULL, print_mmap, print_syscall_ret_addr },
> @@ -637,10 +637,10 @@
> { TARGET_NR_multiplexer, "multiplexer" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_munlock
> -{ TARGET_NR_munlock, "munlock" , NULL, NULL, NULL },
> +{ TARGET_NR_munlock, "munlock" , "%s(%p," TARGET_FMT_lu ")", NULL, NULL },
> #endif
> #ifdef TARGET_NR_munlockall
> -{ TARGET_NR_munlockall, "munlockall" , NULL, NULL, NULL },
> +{ TARGET_NR_munlockall, "munlockall" , "%s()", NULL, NULL },
> #endif
> #ifdef TARGET_NR_munmap
> { TARGET_NR_munmap, "munmap" , NULL, print_munmap, NULL },
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 1517096a9b..24d915f0ff 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -6906,12 +6906,18 @@ static inline int target_to_host_mlockall_arg(int arg)
> {
> int result = 0;
>
> - if (arg & TARGET_MLOCKALL_MCL_CURRENT) {
> + if (arg & TARGET_MCL_CURRENT) {
> result |= MCL_CURRENT;
> }
> - if (arg & TARGET_MLOCKALL_MCL_FUTURE) {
> + if (arg & TARGET_MCL_FUTURE) {
> result |= MCL_FUTURE;
> }
> +#ifdef MCL_ONFAULT
> + if (arg & TARGET_MCL_ONFAULT) {
> + result |= MCL_ONFAULT;
> + }
> +#endif
> +
> return result;
> }
> #endif
> diff --git a/linux-user/tilegx/target_syscall.h b/linux-user/tilegx/target_syscall.h
> index d731acdafa..8e9db734b8 100644
> --- a/linux-user/tilegx/target_syscall.h
> +++ b/linux-user/tilegx/target_syscall.h
> @@ -34,8 +34,9 @@ struct target_pt_regs {
> tilegx_reg_t pad[2];
> };
>
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
>
> /* For faultnum */
> #define TARGET_INT_SWINT_1 14
> diff --git a/linux-user/x86_64/target_syscall.h b/linux-user/x86_64/target_syscall.h
> index 5e221e1d9d..3ecccb72be 100644
> --- a/linux-user/x86_64/target_syscall.h
> +++ b/linux-user/x86_64/target_syscall.h
> @@ -101,7 +101,8 @@ struct target_msqid64_ds {
> #define TARGET_ARCH_GET_FS 0x1003
> #define TARGET_ARCH_GET_GS 0x1004
> #define TARGET_MINSIGSTKSZ 2048
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
>
> #endif /* X86_64_TARGET_SYSCALL_H */
> diff --git a/linux-user/xtensa/target_syscall.h b/linux-user/xtensa/target_syscall.h
> index 3866dad849..afc86a153f 100644
> --- a/linux-user/xtensa/target_syscall.h
> +++ b/linux-user/xtensa/target_syscall.h
> @@ -43,7 +43,8 @@ struct target_pt_regs {
> xtensa_reg_t areg[16];
> };
>
> -#define TARGET_MLOCKALL_MCL_CURRENT 1
> -#define TARGET_MLOCKALL_MCL_FUTURE 2
> +#define TARGET_MCL_CURRENT 1
> +#define TARGET_MCL_FUTURE 2
> +#define TARGET_MCL_ONFAULT 4
>
> #endif
>
Applied to my linux-user-for-5.2 branch.
Thanks,
Laurent
next prev parent reply other threads:[~2020-08-24 20:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-11 16:45 [PATCH v4 0/5] Add strace support for printing arguments for a group of selected syscalls Filip Bozuta
2020-08-11 16:45 ` [PATCH v4 1/5] linux-user: Make cpu_env accessible in strace.c Filip Bozuta
2020-08-24 20:44 ` Laurent Vivier
2020-08-11 16:45 ` [PATCH v4 2/5] linux-user: Add strace support for printing arguments of truncate()/ftruncate() and getsid() Filip Bozuta
2020-08-24 20:45 ` Laurent Vivier
2020-08-11 16:45 ` [PATCH v4 3/5] linux-user: Add strace support for printing arguments of syscalls used to lock and unlock memory Filip Bozuta
2020-08-24 20:46 ` Laurent Vivier [this message]
2020-08-11 16:45 ` [PATCH v4 4/5] linux-user: Add an api to print enumareted argument values with strace Filip Bozuta
2020-08-24 20:48 ` Laurent Vivier
2020-08-11 16:45 ` [PATCH v4 5/5] linux-user: Add strace support for printing arguments of some clock and time functions Filip Bozuta
2020-08-24 17:01 ` Laurent Vivier
2020-08-24 20:57 ` Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8c05d92c-a31b-4aeb-f220-c6106c75eded@vivier.eu \
--to=laurent@vivier.eu \
--cc=Filip.Bozuta@syrmia.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).