From patchwork Tue Mar 24 11:16:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 184770 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp5229556ile; Tue, 24 Mar 2020 04:19:23 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvbCnGZJzzZ6VuK9uD7Kd8VrHrjOV/iN/OuZ0o5Phy1PjIwHm/MG2mJOg7keXycEQ2ro5dR X-Received: by 2002:a0c:f207:: with SMTP id h7mr6506651qvk.20.1585048763099; Tue, 24 Mar 2020 04:19:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585048763; cv=none; d=google.com; s=arc-20160816; b=vxwucnCfLv+IM1l9M9N0oMLgwusTUb00a/D8KQ65WpEJ+IqgQVqgHn2SV6TEoVfyNa 7VkiSqeUwMyD/xqNekfddZfoMmBPdWqkEPZGa/3jQZOL2WVQ3kgraMxbSUhTuWkhFb5Q mdS03baB/xbrUoOjX+DeiENhfq4mFQCoCrPRmDVR3XiqKe9PrTztltH9FBOuwnxEa2cA DXmVKp83Dib+pLMLjqLOOzC5CQuu5AsHcvbI+dDDcforh1yP46C67vxa3ZaO4YMbPHtx CE0lCD4Li8p6FkYCkv8cVaBRuEwLi0355+WOfWatW35oaZEJmzVukaaTbQT2UqGqm91y cr5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=zepXS5Ctu4clbwPElZa3Q+vMPu2qLGth3bMCdfXA4m0=; b=km0N4UX4dt+VjQZ+wpTmU2W/0PqelbJYPw0jvFdbn7MvF6Efts1e9vAUy0fnszlO+y EbfG53YEl7FgKRsd2uulL60EyZ6f+TEVKLi/07TySLUZQ6tUj4qlDpqrePlzIFuS1DBS mnLzPC3JDZ9INAOy4IJzceFUHAgDvhbMUyiDSTZvQdS2eleqh44Bthe2DNReYM6LeCgI a7vjx/i+YtvAiJqnk9ufcl0tLSBPU783Ns2chM9TMSiGfbAVBv/UIc6ROc9Llu2jFWuu maF9NCyiVARc9n0zVAmSTUWX7VNRTDu45SvfcOb8cWFOIORxq5RFg1jRPLCYOKXmjEID CzoQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s43si10699692qtj.330.2020.03.24.04.19.23 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Mar 2020 04:19:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:46900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGhac-000521-LR for patch@linaro.org; Tue, 24 Mar 2020 07:19:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33414) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGhYg-0002GF-KE for qemu-devel@nongnu.org; Tue, 24 Mar 2020 07:17:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGhYd-0007Ls-Hp for qemu-devel@nongnu.org; Tue, 24 Mar 2020 07:17:22 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:53075) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGhYb-0007L7-RN for qemu-devel@nongnu.org; Tue, 24 Mar 2020 07:17:19 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mz9lL-1jTzTW1qjb-00wDIK; Tue, 24 Mar 2020 12:17:05 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 1/5] target/i386: Renumber EXCP_SYSCALL Date: Tue, 24 Mar 2020 12:16:56 +0100 Message-Id: <20200324111700.595531-2-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200324111700.595531-1-laurent@vivier.eu> References: <20200324111700.595531-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:g2Fxb0GuhkTYvAajYGpmLlPs4e+ymKt2URFzBGmu2d6DmhoH3Ol daC9J+Tw1v2vob3eQU0EAe5MGgfbuuO//uwUcETQb28GQbLDapznh8dInZpBSMzBjtdV0t0 Rjp32akl6j4Te5M8FDRkVHX/KLS9mWfEIMXTenFeY+1EQfGT+59hF2omCIRqYvimmwKfjuW Nom86Jvsc9zgTdX6RY0xA== X-UI-Out-Filterresults: notjunk:1; V03:K0:+vbHFAJH61I=:MqwAeJqI+2YJRqL2X7N2Z7 4oc73e1VLASG3Lx9IrYIaY/N/KXFXtJ+pW6Q8fM7nWqrHmypi7H1R5VW5/GZ9imxr7ZPqsJ/b QWY9ePriHVFNIolM8GpI0n4EFt2yQxpfKowYKP8ncJXZWwOFDmt3z01QVnIqn4p9lcQC7sE5p offlu6PlisXXl2eytbhU/OyA5A26rP24OokMQvGBvnMKtMO1wmIrTrUWDob2LvvW2P07ayrPI 2AoBQTvEypWYMhQ+Ho1ydCRIOwmkkHEXB6+9l0A3WNVcVBMoV6nuJewByno8+3y6KerBVJ3Zs pyFh8kmoNQaeS1MkF4lgeXfZYR8YGxtuou5mxaXDg3wMT0sVf2TA5FqXoYI6k6hwKK28duN2G p/q+9yNk/maHdceX2ciI6q1T4E7jw1bg/QGwrITA+/sfarRjX/E1JGIC7Hy2Y3zEAwmYbr+ud g2dziIKhlBwG7vl3LLmVeoJFXWjVDoqv02r8xgheJgaZLctxcWg3P/0oID9iE+vCTA8ic0q7x PpbXIbUgjeH+KlhXjDNE62tpWagdT3A/4X3lJZm+I5Ky7I2AdUayc6ms/CX9oMrIxjyPV1Y7n W0ojlKgcl+hE2im1sV7HOlrDiNyUPT2kdUgMABLo/f0O0+WHT0RACvrQ9OgvKrrAp5CDIyqRn QkcA7AhFLeg394XIWkkXBezdSf92amGt6639mJBCc927Kj2zCIBE0A/0VyG6SYEjXqNuYeupZ Gs2478S2wqOhkq1HLOLsFrznym3/u4WR10MCeMBXixuIgE1Paug0v8cLSeBja+mXyjfYN8B1/ lvJteJV2QfNrH8ShrChUgXSdYfQwSa/X2Y+3Hl7lGvpGQqOMi9cVtCiLVyuXd+v3XSMP1Xp X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.130 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Riku Voipio , Richard Henderson , Laurent Vivier , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson 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 Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Message-Id: <20200213032223.14643-2-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- target/i386/cpu.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.25.1 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 From patchwork Tue Mar 24 11:16:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 184771 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp5230863ile; Tue, 24 Mar 2020 04:20:31 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvzC1NECjhBEWYbcWr1m8rZWUBulYGudI/R6/FvwzKv8ed81jUTB6SD9bZICYsz4KP1t05J X-Received: by 2002:a37:9c8b:: with SMTP id f133mr25301758qke.482.1585048831485; Tue, 24 Mar 2020 04:20:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585048831; cv=none; d=google.com; s=arc-20160816; b=AsA0S0Z2GmXMMuLMn1c3AcviS99odG5u61d0SN9i1qy++/RWV3M3ht9hT6Xa7mJGmB FNIRjO1NR/HNlwfScee/xEmMe99jPejFS7WurPZzTQaRdGYGbl8yGX4wvsev37QpvSMZ 8kq0WUvNvGRF89KFclC+2vPJCdLYRQe62CfUQ1EnWvX7IxM3kNw1SpjVZBTpCCwJSyMo kGjjKP+6bIpK39KD8YySVU3dE61FHt/KMcEXf95+HyoUjSYy4F88F/rHws/EvjXzVI+n 8F1oceGWQgNh8k4AJctjSSZPZXfl2Pvd9fv490kFc7vIP57dbjLojA57HM3lKCNiZfvy fJhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=YEkw+BD3XM1DvhPhvynvQr2RL1QhFvPB4Cz5qQZtHws=; b=MbwZ43TOOXvTou3tk6KzWadshRBfWSiLM24rUMlE9ONllMXPA6r731gTaBPlrg2C34 sMWrU56sFSCdCkEFHc50JXMIA7eG0RIdqrs5xjvDxh3OWRQyH7YuNGgr//9bDwYu18IX /5Hzjth4Egd8ah7+1+f6zNuWo0Go/7xgnoASHIhD+gqZGMc9OaVcFOUSycbnILyP+0Od VMJANHalnWxhQQCS7srrta73E6xEx3/dpFpp4e0FzocFZUm9DDvLgJgD7Kf3KODipMCE uc5D2wQnaonhC+nUBjrTBK1/S1e8fXg/noYp3tCcxdLGsSHrPCCgIZyURDX895BwMJcL 47MA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v50si10217902qtc.167.2020.03.24.04.20.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Mar 2020 04:20:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:46930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGhbj-0007V2-10 for patch@linaro.org; Tue, 24 Mar 2020 07:20:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33416) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGhYg-0002GH-Kn for qemu-devel@nongnu.org; Tue, 24 Mar 2020 07:17:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGhYd-0007M8-PM for qemu-devel@nongnu.org; Tue, 24 Mar 2020 07:17:22 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:55871) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGhYd-0007Lh-HV for qemu-devel@nongnu.org; Tue, 24 Mar 2020 07:17:19 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M2w4S-1jFaYw0i5c-003PmV; Tue, 24 Mar 2020 12:17:06 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 2/5] linux-user/i386: Split out gen_signal Date: Tue, 24 Mar 2020 12:16:57 +0100 Message-Id: <20200324111700.595531-3-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200324111700.595531-1-laurent@vivier.eu> References: <20200324111700.595531-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:VxCE7RwwZyD4HXt9FVuqM2pyJZNZ8hqs/H4L6BTFKFF5gVAh4RH 09o4ToLBxY96xrBdRtnBQ7KozaPqS4gXvZXYESjdBs+OCWNNOh7pRP9p9c+4ppMBZwHDafn JUVHU/Xz5u0jiJUxhqEWvEFMMFB9XtUM0Tas68TYGMuTSyEYh4idlKfLe/kEoDzWOFCGHwV uvrmcDhRXzdpcygdXU/WQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:iwzPQFpzSsc=:7Gl50LPpX2hTZ5nmL9nLeu X6qLqKfWRFPZ4jjn/i2I0jtq7FO6P6qEYVu3nN0ztSYlc2rMhwEpR4SbLVcFZRzi4Tg9UvEtb ynigiE99mpLX9cefN2cFfQfgybOSbRY83FVMuKgu4zk2jitKGXw1oYBL95ptvbmh2QVHXPJNy RMLRqliUsJV9thYR7yGrIvywueelmF+mdlzrzgmRFQYZ7obRwZ9KoQSIRJxmnxJytOxB8ij8N lGm2MeZcBtQu/mtDTaBEja66Y+uLaPqRKMp2oiVA3cDgF75fI0xPCvCueGYjoCj/nSwyjaYhl jDEnItF83kdwXT+r7SeIAGoyD8smmgXzG/c7v/AvWB7wJL3wkAsw8Dvq4nkFuiBzYxT3HhBWs MBNkhiHFzdq6Q/Ds5rhWMsiBZDWnLYMQuJog8WMZiibirwMVII3Z3ShXXdPGp4Wc/zLdGYxct 14AN5m+mwP//P4sTmEW3MBox4k/3+YQA3YXWNgqlkHqMWwFWfoOZj7sidqp5peARIwUZWH9B6 5xOkpPVal5rD/Iqrj92J9cDuVnykRaiVv71oSico5ADoxbaQxcIt4juNcI5xkOIav5/RPf2tR gG3TdMODv6690/FlUhYhO5K/XWBZRNtidj5iHE7iztloYpCsZEJzBvYT/O1xovbNhWQ3rhK/e zHB4oA0X/guAljoxjoUVy9OZOYvJS9vG4Gbxxb7rIiBRmSr9JJvoukQr0YDN3iGAnBXZ+FnJp bZBQAsqR8O5e77Fv3xI4GUwN1gsmpC+5q/F+KCMGWgcAC7OhSLWqtE/8Iijj8y2JvicaMiTg3 njTU+9HNgXf3wj64nngVImg2S3wJmK6fpWDSLTTRbGbdmMkXQ89zwY+vteN59TQeaFZQMCl X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Riku Voipio , Richard Henderson , Laurent Vivier , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson 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 Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Message-Id: <20200213032223.14643-3-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/i386/cpu_loop.c | 93 ++++++++++++++------------------------ 1 file changed, 33 insertions(+), 60 deletions(-) -- 2.25.1 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); From patchwork Tue Mar 24 11:16:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 184772 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp5231096ile; Tue, 24 Mar 2020 04:20:44 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsfugvnPqlvno8P+jpz8SlfpAye9OG1MlzRXwdznjHFayLhFpviKC+qdqnaVZcl0RJZEMa6 X-Received: by 2002:a37:6606:: with SMTP id a6mr24322100qkc.364.1585048843938; Tue, 24 Mar 2020 04:20:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585048843; cv=none; d=google.com; s=arc-20160816; b=RQnsW3K1WGUiJeKyApGv0H9CCjc6v9pObjiJU0wfHvUH4mH/+pl1vMhPFMKQxiI4sd yUNPbnLVl3Gl3bgEBqlCLkM75MhUT9b1ecIeco1ntkz8CuDN+FKPB/78ZH7nelUw8C5l LLoVXW5ApiR2McxKrjt0JfXIAdjcFD7lPeKqo/BpLwUFcZtffq+WFrMq+AnQB6f5RMQe 6SDrGnTwyfwYHipnIJ0EUkeXzyhCT8DAripcZyc2TU+V8etTf6jZ+Ox/vFlnvU2FSwmH Vv94o4oIfje/40GMrH8+SmJ/T7ImbfxVTBWja3lsBV0PQphwvxI4AMdbkaRfDYgB1DHU AOSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=HQcuny2i8MP7gcqKAR5NYN2iqfp4S26wayfcH9K+ABI=; b=e/PJzg8tPz5VI99SqwKmQEpz6f0NTGE0xHGemv05QbuynScWCM09Czj1H/MvjkhEnD HOaRgQVUl3rw58FIjeUN4mk7VnmrX3Jk64i9IYj96pSddTQg/giwd1B9kU/hfmSmqAX2 IUuLU1w7qkGUF8E9aJ9EBTHxHacv6YZyepj+MiixY4GH/rTgu0E2+1EDPtMKZmckcRiB lQ++O5gLSJ3ho4oH9SL+l6xPHpnPFIp0bWF3U8i59m7DWs5N6xjiWYkSWdnakcBhPupA IacBNtEOyexN90i7GEYqP2pjtnFjkNNmuk5OJkQp4DkL8GsDd0TSW9sUiLqlnbE0uyvI IjHg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v17si10151556qtk.303.2020.03.24.04.20.43 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Mar 2020 04:20:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:46926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGhbv-0007Ox-8L for patch@linaro.org; Tue, 24 Mar 2020 07:20:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33415) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGhYg-0002GG-K1 for qemu-devel@nongnu.org; Tue, 24 Mar 2020 07:17:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGhYd-0007M2-Oj for qemu-devel@nongnu.org; Tue, 24 Mar 2020 07:17:22 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:58085) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGhYd-0007Lb-GZ for qemu-devel@nongnu.org; Tue, 24 Mar 2020 07:17:19 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MKKER-1iyCR33L8Z-00Lm0m; Tue, 24 Mar 2020 12:17:07 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 3/5] linux-user/i386: Emulate x86_64 vsyscalls Date: Tue, 24 Mar 2020 12:16:58 +0100 Message-Id: <20200324111700.595531-4-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200324111700.595531-1-laurent@vivier.eu> References: <20200324111700.595531-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:r9JZFDzHesbtdtjjLFO5e8F/goXYNKkaI25sGWvvho31XKg365x 1AS7MiJIEQrC+Y3yXUa+kBdVcdJy3ouC3IRNsm5hmi4t6p14diEGEvKGmSNm0z2rwxxIMzZ H6MLWiQMZ2v//B6EOzSIQWI+O+wgnES490hop+LwHdetUH1wDjiqIqBT0GKb1X3tzJTm1bW 6DLIY6Uo0eSHvZDexTYAg== X-UI-Out-Filterresults: notjunk:1; V03:K0:dnkYpM5ijW0=:eZphKNc94bqgjwwFsHSHsr iau5gIhsrLDWh/Rr7ona2aXKH1PNINk/QrpxPPn3nd4RwmuAmFO5lPfvJ4a9Ch0ZwtoBxpzTi UF1dJuMG3JP5osk5HBUuwoIuX7pu6f9UUYIbEnqzA5s2FygVWZKmH0dOr/bC3/dE5Za+J7BkI xvVxkF9wz6S0JkBGILFhTpoofJ/O751ZSof1oav+SSX/yNvDUt+dGxLR6J79tVUY5HKk45IW5 hGEtqqFReRdO5vfyI/aP26r93h8O1wS0xna5sIRVLh7KJXDPVGjoUdAfYvK+HpDOYrxRpfrJ/ c7NH4YHre46Px1lpQczh980ungR7R5lOtLFo5ojW//fRY5TTKkLI8yDmeUWcuaRG7sQzkqWzF UoIciW+BK/pufcqh9zAaQkIQ4DMThLJQKZAcq+8h/XIjOrhn4HRWI5TwqMhVJ+QcqWrPQM4Kv QPP3VB2Pb01cc8MsNGxZwELoN/ySt65j2oJxwZRhi7r01wQcYCHIiZCmfUlz41hzrFYVVuEnS PFjLWWGhagsEwVh1i1zV6UFTV8rNf6euMVuVYnfSzKnAVb53TMTvRGKMzyRAGSNL8rEc4b2WV 5B5o3j4donOU/ZWnhc4S2g1OesuCabRnm/CscVoAXHKZk6vB0aAAvCy+xAvc5WoD6AiZ5HQ+e rbNUZw0Jp9OcP5ng+ECs2E7+T8vr7lFgomwsVX8nU9hdPIPpSn6h/snLYvooVc22BUyevt/Df 9+olJwF1Qo/lP3LbdgI9heXfll0tfl8t2KDxVbe0IfBqzWgdSqqiyD2gTQnhtRUJZK45mlB7S VkUStpF5RABZbZBnPs1DLPiL2oNqrmT9828GZ2TDThU36E/PKdWTqK8qSEjZUi+ZZLM21FH X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Riku Voipio , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson 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 Signed-off-by: Richard Henderson Message-Id: <20200213032223.14643-4-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/i386/cpu_loop.c | 108 +++++++++++++++++++++++++++++++++++++ target/i386/cpu.h | 7 +++ target/i386/translate.c | 14 ++++- 3 files changed, 128 insertions(+), 1 deletion(-) -- 2.25.1 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 From patchwork Tue Mar 24 11:16:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 184769 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp5227897ile; Tue, 24 Mar 2020 04:17:40 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu11G5T/2wZGrC9IeY5KX0J7SsgAN/swRLZEGiMtV1ArEogQBLhtvPacNhamBK2VZs8B4zO X-Received: by 2002:a37:b944:: with SMTP id j65mr24899264qkf.374.1585048660555; Tue, 24 Mar 2020 04:17:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585048660; cv=none; d=google.com; s=arc-20160816; b=Vo7ROGBzAF5hlyZ1sMTELrp0O1l/+IF8fr0sZeXKUIBojrfFx/e6bX/qK1XQxQRaqM IA/iJ7QVgzPpm+krFiSpwtyELw1e7Gwzp0ydV0yyiI9ufiAsChyGhRwxAX1WvWjfmUw5 tRRiu4LK0eoyWZviIeTceCosc3T9+YIicJ8rQRQJZumqmRQwD1qvzEu5fudOFU+O31/+ CtFRZlRtScNXX7y1EiJhp4d7gTjEG0UI5S/sDlUhbdlSQJ2A1pUDiGxOa4pZj1KiUVR3 dO3LYq3+hQ9Dnlil40tS4dinMXIumoyZ/Dt6eSUpO6HkL+lxq2cRZ66j0K1MJtXBn5Fo 3cXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=mCV/6oi7njnCoIzMHyWV2UoCZd8lSLJWcIDwV87Mbcc=; b=Z0oL/pVUduBrVfJFtOkzKGqDqhnXa+V7UtB4gkBy+J8SNx4ab30ZS9badmc9ytdnv6 9AkE/SE+YE2U93JTXKAO3WQP93WMGKUxEtTah8+q7aVHQOW3SmUPWBpyr7SkKyxC4jnw zu+0hZ9ra3ZtGi7KxMDFWy/WsXpa2WqshzdOiKwbu08mfSK+HeluEOLNKWc8lncie4nt AeByZD8TXofgcu41DVWn1x+NmFKrW8V71rvjEImNVeCxK3auAvQO0ZZBNWERJB6HF0bW ndnrYvTJQSHoecaKe3DdYgAJ8dMLBRI7MibAkhuwQ0zvIAa6BwHCgR1stvTLCvjW74Bh X6wg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id dw19si9494412qvb.71.2020.03.24.04.17.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Mar 2020 04:17:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:46880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGhYy-0002GS-2p for patch@linaro.org; Tue, 24 Mar 2020 07:17:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33386) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGhYd-0002G8-Ky for qemu-devel@nongnu.org; Tue, 24 Mar 2020 07:17:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGhYb-0007LP-QE for qemu-devel@nongnu.org; Tue, 24 Mar 2020 07:17:19 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:41005) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGhYb-0007Kc-BN for qemu-devel@nongnu.org; Tue, 24 Mar 2020 07:17:17 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mw9Dg-1jZBsV1QUW-00s4Yd; Tue, 24 Mar 2020 12:17:07 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 4/5] linux-user: Add x86_64 vsyscall page to /proc/self/maps Date: Tue, 24 Mar 2020 12:16:59 +0100 Message-Id: <20200324111700.595531-5-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200324111700.595531-1-laurent@vivier.eu> References: <20200324111700.595531-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:U6JARm6Ix8awta0eIImuBEUlY9n4vZEjhbE9pGunEfXSgs883wI qZXU2uF5r3u5Pt+d5ru6xic8PbYdT3XI/ku97J+ptCqiSG7QWEMC72+ca8Bhe/mjoB713rA qKB3mwMMK9CR4IzOr9BYqfH7lLcaaeYJWlauvw6BHubsTAk4eaYWGFMmZcm2+59qr/eyNCT awX0PjBFM68ZQXLJ41e1A== X-UI-Out-Filterresults: notjunk:1; V03:K0:pcOySjJuoMU=:VT52kz82ERI8Ua8SYi6uY+ cdSO94GLycR+sJgwHxnXWmZ/xLXKaIhK4eJOt7PW3feFcFueGjC0iLq7QFQebqBm0W5flNUp8 cnf3r6Lp6MD5C2DlzqLNSc42qrRbkzEw54q0QwVLQE9DCO2bGIMzjCNnk0zgd3a/VXLYVjS6a bcHr1AoRr5HHfA5tfpYyOb93/UPz1mNVzoxLUxO06X3Pr7fxGMX7w6RnLegiSkUEYSv0+03w0 NihHTXkeYA8DoGCW0A9w3U74mCylNzg6YfNlcG9M1Tmnt7BStuq8Itk6iOhUHxx4WZ33nfQfE 6yoKxWHw7kQ6uniQQdwh/CbPMMHS9qoZdCtxTqRZ/g0BydkhblkHvyRcZTnrb3iCVo9kvDVon pYUIZZ7BWKEXOVncDbU5n65kFxD9pUofZOCqzidGUD6apWm6FL/EgXJ3q5nVWCK0IKtbkoniU tNrElbSddKN6VaD/M16XVdisKCggm9EnMzjadmCm5IlVDPtDqutSIXIb2ZtARtNKzwEHKUk08 J5er4F7vXRtUMEzpmpNPnirwE4s7pExbatb0xZab8nbNZNbkf/DhKZZ/Ti4fGYh5CGQOP9c8D f6+BXUXmoGdzCZ1RVgJIHOrCYVtlLuj3MDyZNy0dvsr6KhzUC3el1G5cj1Zd+CcJzkmnPFLvL 2OpuvFvJvagKdVOnd+6agn5Ac7xllD1w6ednghRZm7+SUUx0MzxoO01YieWZqYfYlFTQIMV2O k7CVw4Ilts1QgAEc1YFYN47jTnUcEfweQBKACSslsYsIm3lE+viSKW3acOEudJMQlSsB3rQH1 TC6YjwMbES+gjuq4cW30HdzUiPcilDUcl3cXymvtuNw3PRkj9meHuzD+sXIJzVSN+qwND5l X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.134 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson 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 Message-Id: <20200213032223.14643-5-richard.henderson@linaro.org> [lv: remove trailing space] Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.25.1 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 35f414666243..dbdd56e42077 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); From patchwork Tue Mar 24 11:17:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 184773 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp5231486ile; Tue, 24 Mar 2020 04:21:04 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvSpyI4gs85hv8mLUUJBlIpjzSgAbazYB31/hQVzWffCUuIqrFwtmF4PCrBBWLyxcuEpK7b X-Received: by 2002:ac8:7c8c:: with SMTP id y12mr13073969qtv.125.1585048864252; Tue, 24 Mar 2020 04:21:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585048864; cv=none; d=google.com; s=arc-20160816; b=xCx3ns3U8jU6mnFB/8ybbRc5hsrucKFsZozoOcOial5ob7sKE9SrmnPRtylX86XJ2J +iWSguCNNcLy1oiQpUpL3887GgaLSBdv4XP/cC/k/e8AU/7mV1tgXeOeG0+y6xb1vcKG W6Mp6T7w+o6iBxiy0Mbd2sTwVcZo7Bgc756rCWYKUqgZqx2S8g7Xn9mhe1BzZLKSIcq2 5wqBMTaYkND8WKxrzabFvxQ0pu9dbWRxJpVcCL6mqbP6/n3fqFkdMgrwaoH5rGSI5rZD 63BEpCbGbV7ulersckWfHSqVXE75O22rwVRl+XpfinlZZgbAidF8wkxEssW1jP5bIuFh V0sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=YkItsWsh646TTO0fzSehG+84gTKI50FwAt3l4hA2Gu0=; b=ziDrjj8T0XCpb+Fl4eBt5LGRwCWgppqJUpcbif1f7xkx9QLzVkDovKgBNneiYOQHql vgQMYKznddP1U0ApLGZdNnW7p5j4+M1dtcJftZRKjxjQA7uuNFCPFP6VscrsitTjCucL rzcXbUGHuWt7T7OGGxfgAxPuiF/Kmqu7w7zAxpuiBcDxsd8OcaXmzE20qEQzs3+PusAi xWbqNB7uxIeB925BxQJnHbEtNBh/XaTGifM9i2nx3ZYnF1/5gNyZrcy8jGdfaL7hLDUC E6z61VWo/MtRcPMZtgAnZVlRb/3L6iBX/YUKehtXj3N2EDNeagfzln53+5uEGn+sPT4V +3fg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n7si12032716qvm.205.2020.03.24.04.21.04 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Mar 2020 04:21:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:46934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGhcF-0007ba-Qh for patch@linaro.org; Tue, 24 Mar 2020 07:21:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33526) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGhZJ-00035w-L4 for qemu-devel@nongnu.org; Tue, 24 Mar 2020 07:18:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGhZI-0007bt-Eo for qemu-devel@nongnu.org; Tue, 24 Mar 2020 07:18:01 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:44447) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGhZI-0007bi-65 for qemu-devel@nongnu.org; Tue, 24 Mar 2020 07:18:00 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N49xZ-1jOzGE40vp-0100ec; Tue, 24 Mar 2020 12:17:08 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 5/5] linux-user: Flush out implementation of gettimeofday Date: Tue, 24 Mar 2020 12:17:00 +0100 Message-Id: <20200324111700.595531-6-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200324111700.595531-1-laurent@vivier.eu> References: <20200324111700.595531-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:nxNTZT40BDeQWB/pCBr2MQyPGlh4spQuOikUnuwKc+qNYYzVl9H tZdUzBP9eldOdp55TCExUBUEE+oRP6NZpOPG/LIsF/OaEbEpFQmA9buPBx5gHkJEGnmfVZ4 YG39jT6DsusHQbhflTUqsccaqCHkfag5/WPsJJaF34HiSNXLZxSEHm/Fsq2Kazdvm90F1VP i7di1p3fOh+Sw+EtAJ8OQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:Rhltnc+KlBU=:4IxLpHu/oKnm8CSNwBba6b 6DhFB7DqW4tSd89qrxpZyBV7Kgglh4bOYPw5RYjJEMdwqoxMtYzNXE+NAjvx2O5z1K0Pjviul YkeQcLqQzomLkin62DYzjYGIsP+ZjjqL7G2Rq3CUh42U608Tvu6P1qB2LLBYoeZ+N1zXre1W5 7H8uwyHVGscU60R60bqY+GPy3jECm4EaMfsGm2NXTLwR1xTr3ZoEvcZVmpIc21Lj9ff29L0Gk 1PS96VkICBekF3IWA47pjQV3XjtkqsOPycu41u87d/uynWTqL+MbWlkbTwYdwkaN1vZjRbUf8 NCz79J/j/7r1ZIiTKKZgwpYkX1soynkdxaUZoqn+2LkrGRrCL5yCDmwx9Xn25hVKnxeK8LJ2G knnygqmV1IpUjumjv23tmqsc0ZfAgNQ9dqyLh13l8cQimWaZZcx/U6R3J1fal0xQZl8LuDH1I eY6o1Q7PkI7I0Sst/AeGIlEUIC6RIxel1lBY/oxeJ4LhwOjx7EHPDSePz7w7ZWoXJy92RvN5G iRx1irjv/JMJ6SryBkl4mZlGhuIbCklGMGmgP1GTkOYuqhoq7fKCunmXu6V3w7dnxDRCBXydl jrpC5p77lAgwHLTFpXcbIaMSnvKFMKfwh6ZLBYwJp9GLL47fC6I0bTPOnK8mXhCEu93/qsTI9 +XgDQ5lc7KQ/Bi8hXW1POA/RoL/iKb4L8xwdzOPEeRSVuEM787107/dWm5o72Dy6FTGb9HTM+ kGadevAtZwU5PydCVrN1ZMRZJFhBXxW7PdyUPPLKvVOcNt1WONYwKQL30Yv55WWzeT+zwRgps 14/lE6s7qJR9ekw8/5um2BAe635gVyL9mwVlzusrB30l1tcQQmiHMGyGcu+OhEWiZgaJOTc X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.135 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Riku Voipio , Richard Henderson , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson 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 Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Message-Id: <20200213032223.14643-6-richard.henderson@linaro.org> [lv: add "#if defined(TARGET_NR_gettimeofday)"] Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index dbdd56e42077..49395dcea978 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;