* [PULL 0/5] Linux user for 5.0 patches
@ 2020-03-24 10:03 Laurent Vivier
2020-03-24 10:03 ` [PULL 1/5] target/i386: Renumber EXCP_SYSCALL Laurent Vivier
` (6 more replies)
0 siblings, 7 replies; 11+ messages in thread
From: Laurent Vivier @ 2020-03-24 10:03 UTC (permalink / raw)
To: qemu-devel; +Cc: Riku Voipio, Laurent Vivier
The following changes since commit 29e0855c5af62bbb0b0b6fed792e004dad92ba95:
Merge remote-tracking branch 'remotes/elmarco/tags/slirp-pull-request' into staging (2020-03-22 21:00:38 +0000)
are available in the Git repository at:
git://github.com/vivier/qemu.git tags/linux-user-for-5.0-pull-request
for you to fetch changes up to 2582e3016c674c61abe38503c51fd8adffc0d0b3:
linux-user: Flush out implementation of gettimeofday (2020-03-23 16:12:36 +0100)
----------------------------------------------------------------
Emulate x86_64 vsyscall
----------------------------------------------------------------
Richard Henderson (5):
target/i386: Renumber EXCP_SYSCALL
linux-user/i386: Split out gen_signal
linux-user/i386: Emulate x86_64 vsyscalls
linux-user: Add x86_64 vsyscall page to /proc/self/maps
linux-user: Flush out implementation of gettimeofday
linux-user/i386/cpu_loop.c | 201 ++++++++++++++++++++++++++-----------
linux-user/syscall.c | 39 ++++++-
target/i386/cpu.h | 12 ++-
target/i386/translate.c | 14 ++-
4 files changed, 200 insertions(+), 66 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PULL 1/5] target/i386: Renumber EXCP_SYSCALL
2020-03-24 10:03 [PULL 0/5] Linux user for 5.0 patches Laurent Vivier
@ 2020-03-24 10:03 ` Laurent Vivier
2020-03-24 10:03 ` [PULL 2/5] linux-user/i386: Split out gen_signal Laurent Vivier
` (5 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Laurent Vivier @ 2020-03-24 10:03 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé,
Riku Voipio, Richard Henderson, Laurent Vivier, Paolo Bonzini,
Alex Bennée
From: Richard Henderson <richard.henderson@linaro.org>
We are not short of numbers for EXCP_*. There is no need to confuse things
by having EXCP_VMEXIT and EXCP_SYSCALL overlap, even though the former is
only used for system mode and the latter is only used for user mode.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200213032223.14643-2-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
target/i386/cpu.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 60d797d5941f..49ecc23104c9 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1001,9 +1001,8 @@ typedef uint64_t FeatureWordArray[FEATURE_WORDS];
#define EXCP11_ALGN 17
#define EXCP12_MCHK 18
-#define EXCP_SYSCALL 0x100 /* only happens in user only emulation
- for syscall instruction */
-#define EXCP_VMEXIT 0x100
+#define EXCP_VMEXIT 0x100 /* only for system emulation */
+#define EXCP_SYSCALL 0x101 /* only for user emulation */
/* i386-specific interrupt pending bits. */
#define CPU_INTERRUPT_POLL CPU_INTERRUPT_TGT_EXT_1
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PULL 2/5] linux-user/i386: Split out gen_signal
2020-03-24 10:03 [PULL 0/5] Linux user for 5.0 patches Laurent Vivier
2020-03-24 10:03 ` [PULL 1/5] target/i386: Renumber EXCP_SYSCALL Laurent Vivier
@ 2020-03-24 10:03 ` Laurent Vivier
2020-03-24 10:03 ` [PULL 3/5] linux-user/i386: Emulate x86_64 vsyscalls Laurent Vivier
` (4 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Laurent Vivier @ 2020-03-24 10:03 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé,
Riku Voipio, Richard Henderson, Laurent Vivier, Paolo Bonzini,
Alex Bennée
From: Richard Henderson <richard.henderson@linaro.org>
This is a bit tidier than open-coding the 5 lines necessary
to initialize the target_siginfo_t. In addition, this zeros
the remaining bytes of the target_siginfo_t, rather than
passing in garbage.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200213032223.14643-3-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/i386/cpu_loop.c | 93 ++++++++++++++------------------------
1 file changed, 33 insertions(+), 60 deletions(-)
diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c
index 024b6f4d588c..e217cca5ee1e 100644
--- a/linux-user/i386/cpu_loop.c
+++ b/linux-user/i386/cpu_loop.c
@@ -81,13 +81,23 @@ static void set_idt(int n, unsigned int dpl)
}
#endif
+static void gen_signal(CPUX86State *env, int sig, int code, abi_ptr addr)
+{
+ target_siginfo_t info = {
+ .si_signo = sig,
+ .si_code = code,
+ ._sifields._sigfault._addr = addr
+ };
+
+ queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+}
+
void cpu_loop(CPUX86State *env)
{
CPUState *cs = env_cpu(env);
int trapnr;
abi_ulong pc;
abi_ulong ret;
- target_siginfo_t info;
for(;;) {
cpu_exec_start(cs);
@@ -134,70 +144,45 @@ void cpu_loop(CPUX86State *env)
#endif
case EXCP0B_NOSEG:
case EXCP0C_STACK:
- info.si_signo = TARGET_SIGBUS;
- info.si_errno = 0;
- info.si_code = TARGET_SI_KERNEL;
- info._sifields._sigfault._addr = 0;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ gen_signal(env, TARGET_SIGBUS, TARGET_SI_KERNEL, 0);
break;
case EXCP0D_GPF:
/* XXX: potential problem if ABI32 */
#ifndef TARGET_X86_64
if (env->eflags & VM_MASK) {
handle_vm86_fault(env);
- } else
-#endif
- {
- info.si_signo = TARGET_SIGSEGV;
- info.si_errno = 0;
- info.si_code = TARGET_SI_KERNEL;
- info._sifields._sigfault._addr = 0;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ break;
}
+#endif
+ gen_signal(env, TARGET_SIGSEGV, TARGET_SI_KERNEL, 0);
break;
case EXCP0E_PAGE:
- info.si_signo = TARGET_SIGSEGV;
- info.si_errno = 0;
- if (!(env->error_code & 1))
- info.si_code = TARGET_SEGV_MAPERR;
- else
- info.si_code = TARGET_SEGV_ACCERR;
- info._sifields._sigfault._addr = env->cr[2];
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ gen_signal(env, TARGET_SIGSEGV,
+ (env->error_code & 1 ?
+ TARGET_SEGV_ACCERR : TARGET_SEGV_MAPERR),
+ env->cr[2]);
break;
case EXCP00_DIVZ:
#ifndef TARGET_X86_64
if (env->eflags & VM_MASK) {
handle_vm86_trap(env, trapnr);
- } else
-#endif
- {
- /* division by zero */
- info.si_signo = TARGET_SIGFPE;
- info.si_errno = 0;
- info.si_code = TARGET_FPE_INTDIV;
- info._sifields._sigfault._addr = env->eip;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ break;
}
+#endif
+ gen_signal(env, TARGET_SIGFPE, TARGET_FPE_INTDIV, env->eip);
break;
case EXCP01_DB:
case EXCP03_INT3:
#ifndef TARGET_X86_64
if (env->eflags & VM_MASK) {
handle_vm86_trap(env, trapnr);
- } else
+ break;
+ }
#endif
- {
- info.si_signo = TARGET_SIGTRAP;
- info.si_errno = 0;
- if (trapnr == EXCP01_DB) {
- info.si_code = TARGET_TRAP_BRKPT;
- info._sifields._sigfault._addr = env->eip;
- } else {
- info.si_code = TARGET_SI_KERNEL;
- info._sifields._sigfault._addr = 0;
- }
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ if (trapnr == EXCP01_DB) {
+ gen_signal(env, TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->eip);
+ } else {
+ gen_signal(env, TARGET_SIGTRAP, TARGET_SI_KERNEL, 0);
}
break;
case EXCP04_INTO:
@@ -205,31 +190,19 @@ void cpu_loop(CPUX86State *env)
#ifndef TARGET_X86_64
if (env->eflags & VM_MASK) {
handle_vm86_trap(env, trapnr);
- } else
-#endif
- {
- info.si_signo = TARGET_SIGSEGV;
- info.si_errno = 0;
- info.si_code = TARGET_SI_KERNEL;
- info._sifields._sigfault._addr = 0;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ break;
}
+#endif
+ gen_signal(env, TARGET_SIGSEGV, TARGET_SI_KERNEL, 0);
break;
case EXCP06_ILLOP:
- info.si_signo = TARGET_SIGILL;
- info.si_errno = 0;
- info.si_code = TARGET_ILL_ILLOPN;
- info._sifields._sigfault._addr = env->eip;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ gen_signal(env, TARGET_SIGILL, TARGET_ILL_ILLOPN, env->eip);
break;
case EXCP_INTERRUPT:
/* just indicate that signals should be handled asap */
break;
case EXCP_DEBUG:
- info.si_signo = TARGET_SIGTRAP;
- info.si_errno = 0;
- info.si_code = TARGET_TRAP_BRKPT;
- queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ gen_signal(env, TARGET_SIGTRAP, TARGET_TRAP_BRKPT, 0);
break;
case EXCP_ATOMIC:
cpu_exec_step_atomic(cs);
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PULL 3/5] linux-user/i386: Emulate x86_64 vsyscalls
2020-03-24 10:03 [PULL 0/5] Linux user for 5.0 patches Laurent Vivier
2020-03-24 10:03 ` [PULL 1/5] target/i386: Renumber EXCP_SYSCALL Laurent Vivier
2020-03-24 10:03 ` [PULL 2/5] linux-user/i386: Split out gen_signal Laurent Vivier
@ 2020-03-24 10:03 ` Laurent Vivier
2020-03-24 10:03 ` [PULL 4/5] linux-user: Add x86_64 vsyscall page to /proc/self/maps Laurent Vivier
` (3 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Laurent Vivier @ 2020-03-24 10:03 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Riku Voipio, Richard Henderson, Laurent Vivier
From: Richard Henderson <richard.henderson@linaro.org>
Notice the magic page during translate, much like we already
do for the arm32 commpage. At runtime, raise an exception to
return cpu_loop for emulation.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200213032223.14643-4-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/i386/cpu_loop.c | 108 +++++++++++++++++++++++++++++++++++++
target/i386/cpu.h | 7 +++
target/i386/translate.c | 14 ++++-
3 files changed, 128 insertions(+), 1 deletion(-)
diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c
index e217cca5ee1e..70cde417e605 100644
--- a/linux-user/i386/cpu_loop.c
+++ b/linux-user/i386/cpu_loop.c
@@ -92,6 +92,109 @@ static void gen_signal(CPUX86State *env, int sig, int code, abi_ptr addr)
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
}
+#ifdef TARGET_X86_64
+static bool write_ok_or_segv(CPUX86State *env, abi_ptr addr, size_t len)
+{
+ /*
+ * For all the vsyscalls, NULL means "don't write anything" not
+ * "write it at address 0".
+ */
+ if (addr == 0 || access_ok(VERIFY_WRITE, addr, len)) {
+ return true;
+ }
+
+ env->error_code = PG_ERROR_W_MASK | PG_ERROR_U_MASK;
+ gen_signal(env, TARGET_SIGSEGV, TARGET_SEGV_MAPERR, addr);
+ return false;
+}
+
+/*
+ * Since v3.1, the kernel traps and emulates the vsyscall page.
+ * Entry points other than the official generate SIGSEGV.
+ */
+static void emulate_vsyscall(CPUX86State *env)
+{
+ int syscall;
+ abi_ulong ret;
+ uint64_t caller;
+
+ /*
+ * Validate the entry point. We have already validated the page
+ * during translation to get here; now verify the offset.
+ */
+ switch (env->eip & ~TARGET_PAGE_MASK) {
+ case 0x000:
+ syscall = TARGET_NR_gettimeofday;
+ break;
+ case 0x400:
+ syscall = TARGET_NR_time;
+ break;
+ case 0x800:
+ syscall = TARGET_NR_getcpu;
+ break;
+ default:
+ goto sigsegv;
+ }
+
+ /*
+ * Validate the return address.
+ * Note that the kernel treats this the same as an invalid entry point.
+ */
+ if (get_user_u64(caller, env->regs[R_ESP])) {
+ goto sigsegv;
+ }
+
+ /*
+ * Validate the the pointer arguments.
+ */
+ switch (syscall) {
+ case TARGET_NR_gettimeofday:
+ if (!write_ok_or_segv(env, env->regs[R_EDI],
+ sizeof(struct target_timeval)) ||
+ !write_ok_or_segv(env, env->regs[R_ESI],
+ sizeof(struct target_timezone))) {
+ return;
+ }
+ break;
+ case TARGET_NR_time:
+ if (!write_ok_or_segv(env, env->regs[R_EDI], sizeof(abi_long))) {
+ return;
+ }
+ break;
+ case TARGET_NR_getcpu:
+ if (!write_ok_or_segv(env, env->regs[R_EDI], sizeof(uint32_t)) ||
+ !write_ok_or_segv(env, env->regs[R_ESI], sizeof(uint32_t))) {
+ return;
+ }
+ break;
+ default:
+ g_assert_not_reached();
+ }
+
+ /*
+ * Perform the syscall. None of the vsyscalls should need restarting.
+ */
+ ret = do_syscall(env, syscall, env->regs[R_EDI], env->regs[R_ESI],
+ env->regs[R_EDX], env->regs[10], env->regs[8],
+ env->regs[9], 0, 0);
+ g_assert(ret != -TARGET_ERESTARTSYS);
+ g_assert(ret != -TARGET_QEMU_ESIGRETURN);
+ if (ret == -TARGET_EFAULT) {
+ goto sigsegv;
+ }
+ env->regs[R_EAX] = ret;
+
+ /* Emulate a ret instruction to leave the vsyscall page. */
+ env->eip = caller;
+ env->regs[R_ESP] += 8;
+ return;
+
+ sigsegv:
+ /* Like force_sig(SIGSEGV). */
+ gen_signal(env, TARGET_SIGSEGV, TARGET_SI_KERNEL, 0);
+}
+#endif
+
void cpu_loop(CPUX86State *env)
{
CPUState *cs = env_cpu(env);
@@ -141,6 +244,11 @@ void cpu_loop(CPUX86State *env)
env->regs[R_EAX] = ret;
}
break;
+#endif
+#ifdef TARGET_X86_64
+ case EXCP_VSYSCALL:
+ emulate_vsyscall(env);
+ break;
#endif
case EXCP0B_NOSEG:
case EXCP0C_STACK:
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 49ecc23104c9..9af1b0c12e8e 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1003,6 +1003,7 @@ typedef uint64_t FeatureWordArray[FEATURE_WORDS];
#define EXCP_VMEXIT 0x100 /* only for system emulation */
#define EXCP_SYSCALL 0x101 /* only for user emulation */
+#define EXCP_VSYSCALL 0x102 /* only for user emulation */
/* i386-specific interrupt pending bits. */
#define CPU_INTERRUPT_POLL CPU_INTERRUPT_TGT_EXT_1
@@ -2218,4 +2219,10 @@ static inline bool hyperv_feat_enabled(X86CPU *cpu, int feat)
return !!(cpu->hyperv_features & BIT(feat));
}
+#if defined(TARGET_X86_64) && \
+ defined(CONFIG_USER_ONLY) && \
+ defined(CONFIG_LINUX)
+# define TARGET_VSYSCALL_PAGE (UINT64_C(-10) << 20)
+#endif
+
#endif /* I386_CPU_H */
diff --git a/target/i386/translate.c b/target/i386/translate.c
index d9af8f4078b3..5e5dbb41b0ce 100644
--- a/target/i386/translate.c
+++ b/target/i386/translate.c
@@ -8555,7 +8555,19 @@ static bool i386_tr_breakpoint_check(DisasContextBase *dcbase, CPUState *cpu,
static void i386_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
{
DisasContext *dc = container_of(dcbase, DisasContext, base);
- target_ulong pc_next = disas_insn(dc, cpu);
+ target_ulong pc_next;
+
+#ifdef TARGET_VSYSCALL_PAGE
+ /*
+ * Detect entry into the vsyscall page and invoke the syscall.
+ */
+ if ((dc->base.pc_next & TARGET_PAGE_MASK) == TARGET_VSYSCALL_PAGE) {
+ gen_exception(dc, EXCP_VSYSCALL, dc->base.pc_next);
+ return;
+ }
+#endif
+
+ pc_next = disas_insn(dc, cpu);
if (dc->tf || (dc->base.tb->flags & HF_INHIBIT_IRQ_MASK)) {
/* if single step mode, we generate only one instruction and
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PULL 4/5] linux-user: Add x86_64 vsyscall page to /proc/self/maps
2020-03-24 10:03 [PULL 0/5] Linux user for 5.0 patches Laurent Vivier
` (2 preceding siblings ...)
2020-03-24 10:03 ` [PULL 3/5] linux-user/i386: Emulate x86_64 vsyscalls Laurent Vivier
@ 2020-03-24 10:03 ` Laurent Vivier
2020-03-24 10:03 ` [PULL 5/5] linux-user: Flush out implementation of gettimeofday Laurent Vivier
` (2 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Laurent Vivier @ 2020-03-24 10:03 UTC (permalink / raw)
To: qemu-devel; +Cc: Riku Voipio, Richard Henderson, Laurent Vivier
From: Richard Henderson <richard.henderson@linaro.org>
The page isn't (necessarily) present in the host /proc/self/maps,
and even if it might be it isn't present in page_flags, and even
if it was it might not have the same set of page permissions.
The easiest thing to do, particularly when it comes to the
"[vsyscall]" note at the end of line, is to special case it.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200213032223.14643-5-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/syscall.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 35f414666243..5675eca962d7 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7144,6 +7144,16 @@ static int open_self_maps(void *cpu_env, int fd)
}
}
+#ifdef TARGET_VSYSCALL_PAGE
+ /*
+ * We only support execution from the vsyscall page.
+ * This is as if CONFIG_LEGACY_VSYSCALL_XONLY=y from v5.3.
+ */
+ dprintf(fd, TARGET_FMT_lx "-" TARGET_FMT_lx
+ " --xp 00000000 00:00 0 [vsyscall]\n",
+ TARGET_VSYSCALL_PAGE, TARGET_VSYSCALL_PAGE + TARGET_PAGE_SIZE);
+#endif
+
free(line);
fclose(fp);
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PULL 5/5] linux-user: Flush out implementation of gettimeofday
2020-03-24 10:03 [PULL 0/5] Linux user for 5.0 patches Laurent Vivier
` (3 preceding siblings ...)
2020-03-24 10:03 ` [PULL 4/5] linux-user: Add x86_64 vsyscall page to /proc/self/maps Laurent Vivier
@ 2020-03-24 10:03 ` Laurent Vivier
2020-03-24 11:00 ` [PULL 0/5] Linux user for 5.0 patches no-reply
2020-03-24 12:32 ` no-reply
6 siblings, 0 replies; 11+ messages in thread
From: Laurent Vivier @ 2020-03-24 10:03 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Riku Voipio, Richard Henderson, Laurent Vivier,
Philippe Mathieu-Daudé
From: Richard Henderson <richard.henderson@linaro.org>
The first argument, timeval, is allowed to be NULL.
The second argument, timezone, was missing. While its use is
deprecated, it is still present in the syscall.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200213032223.14643-6-richard.henderson@linaro.org>
[lv: add "#if defined(TARGET_NR_gettimeofday)"]
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/syscall.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 5675eca962d7..b7e8a98d4dc6 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1273,6 +1273,25 @@ static inline abi_long host_to_target_timespec64(abi_ulong target_addr,
return 0;
}
+#if defined(TARGET_NR_gettimeofday)
+static inline abi_long copy_to_user_timezone(abi_ulong target_tz_addr,
+ struct timezone *tz)
+{
+ struct target_timezone *target_tz;
+
+ if (!lock_user_struct(VERIFY_WRITE, target_tz, target_tz_addr, 1)) {
+ return -TARGET_EFAULT;
+ }
+
+ __put_user(tz->tz_minuteswest, &target_tz->tz_minuteswest);
+ __put_user(tz->tz_dsttime, &target_tz->tz_dsttime);
+
+ unlock_user_struct(target_tz, target_tz_addr, 1);
+
+ return 0;
+}
+#endif
+
#if defined(TARGET_NR_settimeofday)
static inline abi_long copy_from_user_timezone(struct timezone *tz,
abi_ulong target_tz_addr)
@@ -8710,10 +8729,16 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_gettimeofday:
{
struct timeval tv;
- ret = get_errno(gettimeofday(&tv, NULL));
+ struct timezone tz;
+
+ ret = get_errno(gettimeofday(&tv, &tz));
if (!is_error(ret)) {
- if (copy_to_user_timeval(arg1, &tv))
+ if (arg1 && copy_to_user_timeval(arg1, &tv)) {
+ return -TARGET_EFAULT;
+ }
+ if (arg2 && copy_to_user_timezone(arg2, &tz)) {
return -TARGET_EFAULT;
+ }
}
}
return ret;
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PULL 0/5] Linux user for 5.0 patches
2020-03-24 10:03 [PULL 0/5] Linux user for 5.0 patches Laurent Vivier
` (4 preceding siblings ...)
2020-03-24 10:03 ` [PULL 5/5] linux-user: Flush out implementation of gettimeofday Laurent Vivier
@ 2020-03-24 11:00 ` no-reply
2020-03-24 11:06 ` Laurent Vivier
2020-03-24 12:32 ` no-reply
6 siblings, 1 reply; 11+ messages in thread
From: no-reply @ 2020-03-24 11:00 UTC (permalink / raw)
To: laurent; +Cc: riku.voipio, qemu-devel, laurent
Patchew URL: https://patchew.org/QEMU/20200324100311.588288-1-laurent@vivier.eu/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Subject: [PULL 0/5] Linux user for 5.0 patches
Message-id: 20200324100311.588288-1-laurent@vivier.eu
Type: series
=== 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 ===
Switched to a new branch 'test'
58fa059 linux-user: Flush out implementation of gettimeofday
f253e7a linux-user: Add x86_64 vsyscall page to /proc/self/maps
ad06327 linux-user/i386: Emulate x86_64 vsyscalls
2dccb44 linux-user/i386: Split out gen_signal
1ab05c1 target/i386: Renumber EXCP_SYSCALL
=== OUTPUT BEGIN ===
1/5 Checking commit 1ab05c10ed02 (target/i386: Renumber EXCP_SYSCALL)
2/5 Checking commit 2dccb4427740 (linux-user/i386: Split out gen_signal)
3/5 Checking commit ad0632716d07 (linux-user/i386: Emulate x86_64 vsyscalls)
4/5 Checking commit f253e7a47cf4 (linux-user: Add x86_64 vsyscall page to /proc/self/maps)
ERROR: trailing whitespace
#32: FILE: linux-user/syscall.c:7152:
+ dprintf(fd, TARGET_FMT_lx "-" TARGET_FMT_lx $
total: 1 errors, 0 warnings, 16 lines checked
Patch 4/5 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/5 Checking commit 58fa0592ae77 (linux-user: Flush out implementation of gettimeofday)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20200324100311.588288-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] 11+ messages in thread
* Re: [PULL 0/5] Linux user for 5.0 patches
2020-03-24 11:00 ` [PULL 0/5] Linux user for 5.0 patches no-reply
@ 2020-03-24 11:06 ` Laurent Vivier
0 siblings, 0 replies; 11+ messages in thread
From: Laurent Vivier @ 2020-03-24 11:06 UTC (permalink / raw)
To: qemu-devel; +Cc: riku.voipio
Le 24/03/2020 à 12:00, no-reply@patchew.org a écrit :
> Patchew URL: https://patchew.org/QEMU/20200324100311.588288-1-laurent@vivier.eu/
>
>
>
> Hi,
>
> This series seems to have some coding style problems. See output below for
> more information:
>
> Subject: [PULL 0/5] Linux user for 5.0 patches
> Message-id: 20200324100311.588288-1-laurent@vivier.eu
> Type: series
>
> === 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 ===
>
> Switched to a new branch 'test'
> 58fa059 linux-user: Flush out implementation of gettimeofday
> f253e7a linux-user: Add x86_64 vsyscall page to /proc/self/maps
> ad06327 linux-user/i386: Emulate x86_64 vsyscalls
> 2dccb44 linux-user/i386: Split out gen_signal
> 1ab05c1 target/i386: Renumber EXCP_SYSCALL
>
> === OUTPUT BEGIN ===
> 1/5 Checking commit 1ab05c10ed02 (target/i386: Renumber EXCP_SYSCALL)
> 2/5 Checking commit 2dccb4427740 (linux-user/i386: Split out gen_signal)
> 3/5 Checking commit ad0632716d07 (linux-user/i386: Emulate x86_64 vsyscalls)
> 4/5 Checking commit f253e7a47cf4 (linux-user: Add x86_64 vsyscall page to /proc/self/maps)
> ERROR: trailing whitespace
> #32: FILE: linux-user/syscall.c:7152:
> + dprintf(fd, TARGET_FMT_lx "-" TARGET_FMT_lx $
>
> total: 1 errors, 0 warnings, 16 lines checked
>
> Patch 4/5 has style problems, please review. If any of these errors
> are false positives report them to the maintainer, see
> CHECKPATCH in MAINTAINERS.
>
> 5/5 Checking commit 58fa0592ae77 (linux-user: Flush out implementation of gettimeofday)
> === OUTPUT END ===
>
> Test command exited with code: 1
>
>
> The full log is available at
> http://patchew.org/logs/20200324100311.588288-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
>
Sorry, fixed that on previous PR, not in this new one.
I'm going to send a v2 shortly.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PULL 0/5] Linux user for 5.0 patches
2020-03-24 10:03 [PULL 0/5] Linux user for 5.0 patches Laurent Vivier
` (5 preceding siblings ...)
2020-03-24 11:00 ` [PULL 0/5] Linux user for 5.0 patches no-reply
@ 2020-03-24 12:32 ` no-reply
6 siblings, 0 replies; 11+ messages in thread
From: no-reply @ 2020-03-24 12:32 UTC (permalink / raw)
To: laurent; +Cc: riku.voipio, qemu-devel, laurent
Patchew URL: https://patchew.org/QEMU/20200324100311.588288-1-laurent@vivier.eu/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Subject: [PULL 0/5] Linux user for 5.0 patches
Message-id: 20200324100311.588288-1-laurent@vivier.eu
Type: series
=== 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
* [new tag] patchew/20200324121216.23899-1-peter.maydell@linaro.org -> patchew/20200324121216.23899-1-peter.maydell@linaro.org
* [new tag] patchew/20200324121636.24136-1-berto@igalia.com -> patchew/20200324121636.24136-1-berto@igalia.com
* [new tag] patchew/20200324122044.1131326-1-mreitz@redhat.com -> patchew/20200324122044.1131326-1-mreitz@redhat.com
Switched to a new branch 'test'
cd99da6 linux-user: Flush out implementation of gettimeofday
94aeacd linux-user: Add x86_64 vsyscall page to /proc/self/maps
4555b29 linux-user/i386: Emulate x86_64 vsyscalls
b4652ed linux-user/i386: Split out gen_signal
7915a1d target/i386: Renumber EXCP_SYSCALL
=== OUTPUT BEGIN ===
1/5 Checking commit 7915a1d69d09 (target/i386: Renumber EXCP_SYSCALL)
2/5 Checking commit b4652edb33e9 (linux-user/i386: Split out gen_signal)
3/5 Checking commit 4555b297005d (linux-user/i386: Emulate x86_64 vsyscalls)
4/5 Checking commit 94aeacd76e83 (linux-user: Add x86_64 vsyscall page to /proc/self/maps)
ERROR: trailing whitespace
#32: FILE: linux-user/syscall.c:7152:
+ dprintf(fd, TARGET_FMT_lx "-" TARGET_FMT_lx $
total: 1 errors, 0 warnings, 16 lines checked
Patch 4/5 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/5 Checking commit cd99da680137 (linux-user: Flush out implementation of gettimeofday)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20200324100311.588288-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] 11+ messages in thread
* Re: [PULL 0/5] Linux user for 5.0 patches
2020-02-13 12:21 Laurent Vivier
@ 2020-02-14 17:56 ` Peter Maydell
0 siblings, 0 replies; 11+ messages in thread
From: Peter Maydell @ 2020-02-14 17:56 UTC (permalink / raw)
To: Laurent Vivier; +Cc: Riku Voipio, QEMU Developers
On Thu, 13 Feb 2020 at 12:22, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit e18e5501d8ac692d32657a3e1ef545b14e72b730:
>
> Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20200210' into staging (2020-02-10 18:09:14 +0000)
>
> are available in the Git repository at:
>
> git://github.com/vivier/qemu.git tags/linux-user-for-5.0-pull-request
>
> for you to fetch changes up to 6d485a55d0cd8fbb8b4337b298f79ddb0c2a5511:
>
> linux-user: implement TARGET_SO_PEERSEC (2020-02-12 18:56:45 +0100)
>
> ----------------------------------------------------------------
> Implement TARGET_SO_PEERSEC
> Fix rt signals management
>
> ----------------------------------------------------------------
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PULL 0/5] Linux user for 5.0 patches
@ 2020-02-13 12:21 Laurent Vivier
2020-02-14 17:56 ` Peter Maydell
0 siblings, 1 reply; 11+ messages in thread
From: Laurent Vivier @ 2020-02-13 12:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Riku Voipio, Laurent Vivier
The following changes since commit e18e5501d8ac692d32657a3e1ef545b14e72b730:
Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20200210' into staging (2020-02-10 18:09:14 +0000)
are available in the Git repository at:
git://github.com/vivier/qemu.git tags/linux-user-for-5.0-pull-request
for you to fetch changes up to 6d485a55d0cd8fbb8b4337b298f79ddb0c2a5511:
linux-user: implement TARGET_SO_PEERSEC (2020-02-12 18:56:45 +0100)
----------------------------------------------------------------
Implement TARGET_SO_PEERSEC
Fix rt signals management
----------------------------------------------------------------
Laurent Vivier (5):
linux-user: add missing TARGET_SIGRTMIN for hppa
linux-user: cleanup signal.c
linux-user: fix TARGET_NSIG and _NSIG uses
linux-user: fix use of SIGRTMIN
linux-user: implement TARGET_SO_PEERSEC
linux-user/hppa/target_signal.h | 1 +
linux-user/signal.c | 134 ++++++++++++++++++++++++--------
linux-user/syscall.c | 22 ++++++
linux-user/trace-events | 3 +
4 files changed, 128 insertions(+), 32 deletions(-)
--
2.24.1
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-03-24 12:32 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-24 10:03 [PULL 0/5] Linux user for 5.0 patches Laurent Vivier
2020-03-24 10:03 ` [PULL 1/5] target/i386: Renumber EXCP_SYSCALL Laurent Vivier
2020-03-24 10:03 ` [PULL 2/5] linux-user/i386: Split out gen_signal Laurent Vivier
2020-03-24 10:03 ` [PULL 3/5] linux-user/i386: Emulate x86_64 vsyscalls Laurent Vivier
2020-03-24 10:03 ` [PULL 4/5] linux-user: Add x86_64 vsyscall page to /proc/self/maps Laurent Vivier
2020-03-24 10:03 ` [PULL 5/5] linux-user: Flush out implementation of gettimeofday Laurent Vivier
2020-03-24 11:00 ` [PULL 0/5] Linux user for 5.0 patches no-reply
2020-03-24 11:06 ` Laurent Vivier
2020-03-24 12:32 ` no-reply
-- strict thread matches above, loose matches on Subject: below --
2020-02-13 12:21 Laurent Vivier
2020-02-14 17:56 ` Peter Maydell
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).