From patchwork Thu Mar 26 07:23:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 184840 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp1531814ile; Thu, 26 Mar 2020 00:25:01 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtcgP5xLQBg9cjh4dgOsYMh2HAKZ/QkfGdKus7lxaXEyQz3tzEWmSw1Zvno6V9ueZZlfNmg X-Received: by 2002:a37:9544:: with SMTP id x65mr6178187qkd.48.1585207500896; Thu, 26 Mar 2020 00:25:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585207500; cv=none; d=google.com; s=arc-20160816; b=RVuQPJfJcM/VSq/ZHBdcjvUUc+5RAknwq1bRhcKJNSmiMj+rnh1Ea1Q5tppL9JqzJw ehmvOpxOjrxpfLJsumtrZ+LrldsT43q7wUmM2yprMpVGX5QVSnyxBaO8TJK1F/TvsYX9 MbiAwQwRfp8KQjRBhmjDWkX6tb0OiiDCCiVo102WKtToKYpTepWbH4H9WNaQdPXqO7IM s+PEghO90+Qrd5c2N/S45NC+CB2p+p/ta/B9bs2Cq01W5rYa2DtIImcQAFxBMftKVA/G AlHGrbiucYZ8ih4PV7/kHnFzPQ2osinK9V1kdQ/Jq05iVWkBKI0tuGAtkpMAbhrF0wre U7Ig== 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=eRMHibZeflyDjl/e+Iekgmc2LlbHDRRwCNNE4F66vSsvkub6cVzRNI6VcrG4GlcM2u Alri0jxje6CP6wZD59fbDtayu/YXclt7M3wzEj4EDB36M6E6cOJSgbuHsFGX37LftHak iffezYLuRTHUUZFpU8qiMUssleQk11Meb/SFFr3xVKXk4LL2Cce0HvW18mxizgReC7rU LZnJppZYUZAumKjSDFO6IUaTYSQhdlEt4ZUkYUwAJ0Mtm8h65uAUhpVimaIQ94vRYL+C x/rbtFrfLum+7MKdJPsWI4UTGJxDmnegjoxWwbREngbwOWVmEzzpigs0ioEf5ea3206C lgtg== 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 h18si743672qtp.95.2020.03.26.00.25.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Mar 2020 00:25:00 -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]:47486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMsu-0006MA-EF for patch@linaro.org; Thu, 26 Mar 2020 03:25:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57239) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMsf-0006Hu-J1 for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHMse-00084a-I7 for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:45 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:50619) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHMse-00084D-9g for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:44 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M4alK-1jGpAZ2Cn8-001l68; Thu, 26 Mar 2020 08:23:57 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 2/6] target/i386: Renumber EXCP_SYSCALL Date: Thu, 26 Mar 2020 08:23:48 +0100 Message-Id: <20200326072352.2056553-3-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200326072352.2056553-1-laurent@vivier.eu> References: <20200326072352.2056553-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Lbxy7qW3EMtPMQ3XrOVl2AkDuZWMyEnCNeYhJD9bBc7JOqd4xPV Q9Yet6h5P+8YRHrCS0i8W37Wfx2OGnGdpXTRfQW4qFwc0uExv49M/rxyA+C/zTivdXJGH19 nS1zVnUlq/x8KkuvDKaVCZG74GeitDIUT+lGK3jm4my12GEx+w11rs9vTdrVbA/6ZncYim2 /IMYC4OBLChSSO6akxxXg== X-UI-Out-Filterresults: notjunk:1; V03:K0:jAeKhWV8fO8=:iqq8Ppf8a3LBs3Xr9W9OLg +B7cN1G4bv2nKVIrl5Xc9BmkkQ/Hs11a7q73HM2GjfMdW0JTfP0PmSA3IDoanX+HPO/HL6c0q RyE/6YyNyYbG06LjTPIIo2N7wOEjMCGU/nb8wgNPqKsY9hjpplGjYXqXOo+fjQm3MkR3F/BCV wQkVk1/usmk5mRNJepBjefNEx6nE2FssecvOLBuq8/drKkruif9YQ5w3woz8n7duMnA79vdqC r3knjkMkSdc10pQSP67y9Tz4qUPzs6PMi38FBSfmwwk8/O9cSQXvpzTVqcKuAjMDouHBXdxm+ QsLl5aAYaijJ3CHoUoD1WWIdwd9ljMkRrrh89Dv37r0597Sw32YjnNMum5eYiOWhxpoeO7s5Z GYt4sp+FjK56/eOSsn5qQEIGWFToCWsXAwapuhmI5GICdQrAu0URnHFEqJrPk7mJYsywj18SV priBfYrUYl+4mH+BZend5lblUY9+h4zARKYNyP4R4QlzRjK5BUtPGh8V4x4ux4cwYfpyFUmSG Wb+vp5rq7j8Ub/Pzd0TfXp0TAM1YYyQDceRpkkzfzptz0EmDMr8cZZrXZkZgxIJiKpTSUIq/o w6r6IHy1W8HAyll61hTv6ouYilydy1GZasxbzRXzEvUgI9RnBYnI1vQBqx0icAEFOuh1TWpTw oB1aT5PHbZ3YF5gRNhUIpG3sfrM3AG1M6YalvSiLepnCQ1zIJ2MSIDfY2mU95r4rdlLYronkI 3NwJgFvzyOmOEFM94bJ3Pfy54Mq4MVsFJGATCef8hwSJqRa/9bH+kf2P9SWPhHB5GhXSuwRzN cqowc1IHZENjGZqBlwQnk8fD2HEwKKm8keHdwMzDnVabGq+QwaK2H+r5DYjKC96K4K6K7S6 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: =?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 Thu Mar 26 07:23:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 184843 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp1534518ile; Thu, 26 Mar 2020 00:29:10 -0700 (PDT) X-Google-Smtp-Source: ADFU+vukVCrMQf5YCMNUVdzXNfoVM/V4ePLaXoWR8383ReLVBVv4Ac+6UMZ5s4PSa36Znktdell7 X-Received: by 2002:ac8:4e94:: with SMTP id 20mr6719566qtp.314.1585207750430; Thu, 26 Mar 2020 00:29:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585207750; cv=none; d=google.com; s=arc-20160816; b=c0aNN2sZC3VpxWvOVOiJSFsTcTeAiztl3zd5enD1SLGt85HZrG82rDaD7HJ4fePCdX Jmv9VGgrv5XA7/njs3sAr3/MhWZquXYhfzR8nj781tDQ6DdXxDh5P3SViJRXLzk5P4aS bziyTYzd0wO/4WNAMnBjGVvG4o49ZJdtTYnuWL2lnG7LjJpQ0SO24mgCEUxK9jBZXnnl jZRvBKeUq0cWl/PfJbKdxfChw60OmldX6lroIoSMkUn1mXPWGGyn2Cj9Uw5I7hUTdSfp KBpOsUmXVNdeToJVeAI+Z+GIhIrbtI4NRrZ15UEqk0gYC81i3GtwbUIRNOl3zQNGAN88 kaoQ== 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=iKf4i0j3I+U7DzwXjrywT86E//R5UD/sPtnZwwGwaHz+J8dnW95yNePuPho7xEPfqR z4keh+1a2q721AVlzOes7uzTGgbbxc84YO6mfSv2vlovt9awnXG1aD0XFriaAcg0gY4p U5iBqGa+PFHlQHJ4wUblgMG2CB48tfe1wAvn53j4oSGOI1kb7aXYCitPDfyA6Qwp3g2F wEPcnsex3IFtkXgv5ckHUjsET1gOUdd1LjJV3WnqJ+wnyCCUtJrVn/MeLg3F4XfKzVUN 4pxZPhvxTy5Jf1jEW72z1CiVqtqejKxSy730vVwvA1lh2qNnwE1+opOqNiO38fuYXXfW rgmQ== 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 i50si755543qtc.349.2020.03.26.00.29.10 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Mar 2020 00:29:10 -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]:47542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMwv-0003cQ-V4 for patch@linaro.org; Thu, 26 Mar 2020 03:29:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57173) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMsA-0005RQ-K8 for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHMs9-0007uN-6u for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:14 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:42271) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHMs8-0007uC-UA for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:13 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MwQCb-1jYDQh0sKL-00sLgZ; Thu, 26 Mar 2020 08:23:58 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 3/6] linux-user/i386: Split out gen_signal Date: Thu, 26 Mar 2020 08:23:49 +0100 Message-Id: <20200326072352.2056553-4-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200326072352.2056553-1-laurent@vivier.eu> References: <20200326072352.2056553-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:EX6P3vYaK2SZb/NgMTn3mSfuNyAZ1lq6tVRtSvJB0QTSO715RBW wkw5ixuk/4UOo7QMMkFdY85iDr1VDyzS2PwogmUN9ibsHnGkq4DCekmE0eJag/NKV8/KdoY YcxOJQ6yo4VuV8bFf7FuK0hB0dewGf1E3Wmcif6fFawd1vZtx/trsuM5L83bTK2HzCpPhFG 6fenm5f7L7Hdq6Gldps4Q== X-UI-Out-Filterresults: notjunk:1; V03:K0:UOZocdcNJgE=:M1EahAV9yHIRWoeEYRk2Sy RUoettWY3ytnqK0Ots3dsVXmSN1dMjEdp7xVGo2ShLN5Dw9wsm3krrpRPVVzMndwQoAGXwEqt 0VCqii6gjhhaW15JQaKJEfpzj+foe3NbgI+8TZU7X7ri+hvTJ/0X9VwY+nqKq5T7OcnWfFTcJ OISCvzXSOvQWo+ksBeBANkCNe4NwgsEgtM6rugFx+EU6xek8hJqNRf6v0BudyWBG/as60geKZ OPfxKOszNrSY1x0ogeXpoLIbZohZ7n1Y6FtCt60NPvo2ZYp7GwWQMxpSJo7P+wANDfnwgpGUA W0OvWyh1T5Wpk3n+qwZ0k1U4azBOWPkk7IE7WNIKAQDmuCkxgDPD4w7deOM12vh7tKzah3TuA eCNEBrh/TNaGvZroCbN/QeKrzgzakjBiIZohZ2yV6H6J7mrVVFWKD1UODoeNqCah4Kyr/yBTV QaDfEWa0VYtoyn5NaAXhCGnQCxhRuiRGI1SEVYSG/sHwU+HjRh2T/HqCYCOdGIAkBp5AkhSxA ZEj+1+gQmxO8ir2J3NF93HykguoJw0NUp1PyWy88knxOMFpplGergZniezRZ7KqH5yrHAeMo/ qn/Plxdt224sDu8YMT7xWNS2O156Aak4cEB+YvVsv42HOcnDwLKoQdoCfVOZBmeme2XXmnWLj tMs46RBwT46cw8SV8moBsEsewk8Qv//a1ORhoxtIRWVDlFAugigBajPIlC4IAsjpindMY0Ra0 y0pYDJ+j7PxKcAWRu9Ajdz1Mv/waq2kmKnnoZNJCaufK7/pOWWKRfjFs55AAN3xH03CHcxZWW T1x2JmP9g7EcXRBTfIkWOsWvdpwZmFxPmZsscjTfCv9xOjvTfUvL587SxEhYeSbxAZl2Qy0 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?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 Thu Mar 26 07:23:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 184842 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp1533451ile; Thu, 26 Mar 2020 00:27:35 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuWem5GltBuBBy8xScCOaNhboCMh5TqSwBmhkXcIKvkeUCcRHcd+tnYVhBtWhQj+mqnvGqP X-Received: by 2002:ac8:1c72:: with SMTP id j47mr6936370qtk.377.1585207655544; Thu, 26 Mar 2020 00:27:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585207655; cv=none; d=google.com; s=arc-20160816; b=suoGMs6b70VADIE7sxlsa2D2WX9iAhSA38blif1Rd7ErZDRSpmxQznyuluvk0g+eT0 yEhY+UZ4yLKFZDBTtf5TkevY7gbYz3x95LJANQ83qeafeQ8vT4kdZE8+Ti3pWLtDK3p6 9siaMAsIGmqTMsM7opiRzTE6fWo0iHPE65KeENc9554aH8Ti+W+9x4jlo1XMmP6wDRGx BdCQeV7YkA2/Czv2tGP66mf3iTMs1zD9j4O4crr3w8rPQbX57GE5bYtbaFt+s78V51YG IY15si/9nEJKcoVMRVxCsff/TBI/HZmIFPcQRX/oYKL2dfwCa7Xs64TqIhFk/A9d9M5O 8APA== 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=eVGF+QE5/yLZvPm5H14w1n0FYWpjPmERps26+Xc5qjv4eKuq6u7MaQOauepzwHIEGR hEkOx9zZBe+x3ZeNNUYOl2F3U0JUOBZ8q7MiidC6jisIv0zElvPwpKhvRSqWUmGlIMHn 1P6Z66EZpa80hms73vLyllG98Z3HWJGdjNV6NNC3LWHaZyoEkTz6ksGN5Z9Ks6ny4k3R pxyCaaBQ2a7MNh8dYIuuW8MF5hb5uSsOLiqWZhpnc9WD/gn9ku3Hgy0pF4aSRdbYXgyv SEnbC2HqQKyRnGcy2eLuFsXD+zt7P3phB4+zYSE63tOQl8S/dUzNE9YTjbfBwZP5jXTT BVRg== 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 v186si651778qkb.47.2020.03.26.00.27.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Mar 2020 00:27:35 -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]:47524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMvP-0001rr-1i for patch@linaro.org; Thu, 26 Mar 2020 03:27:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57164) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMs9-0005Oj-Ga for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHMs7-0007u1-Nt for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:13 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:47463) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHMs7-0007ta-FQ for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:11 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MFbFW-1j1QyO3TBu-00H9IG; Thu, 26 Mar 2020 08:23:59 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 4/6] linux-user/i386: Emulate x86_64 vsyscalls Date: Thu, 26 Mar 2020 08:23:50 +0100 Message-Id: <20200326072352.2056553-5-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200326072352.2056553-1-laurent@vivier.eu> References: <20200326072352.2056553-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:8kglLESd+xO7sx7WNgWt/6/WUjm/2oeyBFF4FIpPn5e/BBVQCmU hrvCK4Mc3QLAT4IirjnQLpW5rKs0Ksfgt3YvulxyggNlVb0D85JVE1/EWgd+2nhCgTgvcKh znHMeq0LYoU3evLl7ZCWiZit2MbV1xKcuSzWfSsUAMG+PjBK1bhfF6C1+oUoG2TGOK5Rp7r 1kVQctb8fEKXmET3x3J+w== X-UI-Out-Filterresults: notjunk:1; V03:K0:Xak3eIMbIAE=:lmHcbR4wAdCIJKbEv6ZbWJ p+WwRKacFptBD2hlylW4tFfmGxRuLxuw2+Tu+/8DTFlaEVFHCPW39zXVBgq1JDMkgx83RSAI1 vTzmXYqsKE2PuuHH19NWKf3H67sDK/gPWoNFiDaYHr2aeWZXaET+1xJfMGq8JCdDU82n2UzDA xLu3Rf160q432YtXZ3flzvM2b418mTdf+fmjGDVOjqFpabu1XKXSeX37yAumsaSnnE1Cu6qwM ctlt9rNbqJUH/45VcGExc/Kz/ltWUZaMMm91jRdxScsMPt9Sg0+Nd4bfw5vTJae66rrhrDDyh XsnmSR+hNxDOhazg/qI1X2PDnzz0POtVoDZmozHP6isse44Ah5XNwKp6v1//3pYJVfSzr1Pt6 c//AqZ7TJjxaUh5urVDSQ45K6UcqOuUWJCJhpO8qYe6juVZSF3dHAYVTkId7eq/wjGq68tjRE RvA0HBFueRQrhQZHwztwiWrfOS2nqiT8l9P2S4CxmYK0qQ/Vs6QxO+/dhqEZ8jQKwjGg74Jg8 Y4pRvdiCEBYetNA/xDOYQK1dwELc8g6XvUbcF19uE2BH3hZbzafK0+BM/6pS4g5fCh8OcXl91 UE6KmRWJ7qaGO//AON1ggopybNDsYAMbkUZTqtupqujkv8KzLyLl13t/ActnpW/s2GPsSO2sT h9zZWcfCelJEYZWA47EtqU0cgG+Ub1gmFWIme/clk7jPt3iWuAbHTJ3f5NM8rbQ5qnOd1qFyl ZLzWeaJJj2r+nqcXPqkTseYJoL9SXt40lAV5F9oBhBhuxfRV3ko5pgQFp1ZNpwNOVxP5D5If6 E402ecTHvLHaznWAYu+VQ2vhv1i/v0R/23siC8Js0mtxuhUIeRItfnGHRfBGqSyQSceoS2W X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.131 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 Thu Mar 26 07:23:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 184839 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp1531360ile; Thu, 26 Mar 2020 00:24:23 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtqu99hskg+QqMqPFsgCGBGE73Aq8hHf8+RmuXgENG3dXUmbpmtu+xqqHX81oTPmgDanLLS X-Received: by 2002:a37:b9c7:: with SMTP id j190mr6368517qkf.21.1585207463462; Thu, 26 Mar 2020 00:24:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585207463; cv=none; d=google.com; s=arc-20160816; b=VqIB/eBx23EPhpFbzfEtrTm27mcq43SHHggXNr4ii8oelWlHMlLWj5KVcCWm2zHyv5 t6KWHLCPVfJdmky1dUBgdutGHaI2jE0NwSLB9AqP8oPQLG+ipaC6Ga+hvjpQ3dYkNK5F ZdtMk+a0yDBBfmYruhcSz2Cv7NzmP6Z7xqyX07YmhLLUZXkeGLzw/zL/2LlzwXuyuJyz Mp2tcD8dxbhEgWatqfRofU8rb3O4G7ZZVqIJG6jOa+Au1dvlty6hjjwIy4ayL2Qqdkd4 nDXbNPH/sJYioEFGADlkSS3nLif3jH5KIEzmGcrg7WQTP4gVMvgkhvocH5t/rQFXJ2fx DmxA== 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=HgZDBfgtggFTEqymM25mUl2qv1hidXrBfRG1h3Cut72yZkVH5AA05I7vsQ2E4Y6D1T L/k1q77Z/BvrrTUKF9Eh2QW3hMSO4EQxV5nhDVBRwKheSJNPe4e+R0/I+ySS6sjEGzgA gxIzbd6OsJjEo4ssXi2BgZgBYHOU1RodcnG/gyGlQgqH+1pCWJ44Zmgqyp1zi+gvRFwz EWMN6Y/oOs6VLPNv4FHM67bNvm9URbQUCRl56JtdkD9GT5CeATlqe0QdwsQHzLE4vByn 04ooUfL5y8jDv2AsSwvdxzCIPA1VdwcJT/RHzPjgbfsOj01KE52Jmm8Xl0xAuWcxYblX cqXQ== 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 c23si50847qtd.89.2020.03.26.00.24.23 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Mar 2020 00:24: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]:47480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMsJ-0005O1-18 for patch@linaro.org; Thu, 26 Mar 2020 03:24:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57146) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMs7-0005LZ-A6 for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHMs6-0007tK-9Z for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:11 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:42019) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHMs6-0007sv-1D for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:10 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MHXSD-1j4SiM1ZFB-00DYn9; Thu, 26 Mar 2020 08:23:59 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 5/6] linux-user: Add x86_64 vsyscall page to /proc/self/maps Date: Thu, 26 Mar 2020 08:23:51 +0100 Message-Id: <20200326072352.2056553-6-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200326072352.2056553-1-laurent@vivier.eu> References: <20200326072352.2056553-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:N9BloZddGoEI8aaMOWZioelpXj+OrVHQl9zigrnZcP/MsKXmp2Q bfT24knouSbYlvmSXFeyzQ4IdT2X9DEIAmFSwwAAjYSUV4N12AGO1d2yo/IxzaK4mBTwgt8 I4cMOT6+rrHZex8D6hZypm72a8zfey21qHguss0uuZVSqXu6Khc7yP2dYtpMohlt2RRrlMI +5FLf2955LFmL5mpfLLcA== X-UI-Out-Filterresults: notjunk:1; V03:K0:ZYP8560LjSM=:msR9P5Q/I1q2yMQwfo8mtW Z+DydHO9oCRc2UOW9O/G8VTjHxN4mHq7c8I86RKuP8NfdV3IwNbtY46eiwways+Vj24M7o54H WNDKzJKfRuzdxZIdvtOGCXEu1P57zLbcBhsaEtZUOWnxTYpirEAlHT1BLxHC7/W6yrcdlOOIw F+4+KM4k1CTfVXB6Wkud11fdcewTrWc2qBo7I/CJTIYqHbkXKa70FHMqbZs0LrXDNzeC3fH4x eWi4A5P8L3hGgiOtfvTIJUvwzduxtNqQZOjZ6Vpy1VFqxe4udBTzhNonHaRPVgDQPGjY0hXfI 4AodIDG0N4u0j85Vy8+V0vHN3UkMWdTfZt1tPf5ceHoMoA2Tp6Zk7VvDT1846hPhQFnHo9839 oCgKEAFTua+RlULRH4iUey9EqPPTcc7spFLiCxsM2M3JRLeUjvYlrtLU/YLW3PB8aJ8iZIvHb yDAfmD0TRSJtAwa20/rxkOnsj/WOq+9sEwO+QEJC4xMYTjYOVqlEMNJYnXO+wYVWV7z+1R5kx ws6uDQk3ZVGcsjxmeQ/EaJievGBptens6B7c+qx9pyE2gFKEyb/E+2h0WKoNJLg2WOmgiPzJY dYb2QYgFWDpANeWEq4GRaQoG+BREia+FikLHDaYfVT/lTUAAhlrEX4VzHTKwF1fu19vJhLEzk QfOj/BLs0MdHU7nsYvvXiKyFEdK2YhsEi0Lh0tYYhNonVbxWKIeotW+gr8zmbYf1QUzS9AaJy ygEXiOicbUTdAVf4z4VcnYqjFNAjx+oODq3o58L42VpZPF1aIOoJIQkIIYfNnMb3NOFDIEufN C3pPUZNJDdf0jhzsMaW/UL070+0FnFlI70P9hn00DJuwZPbHg+cbftEV3TzCVYK826JBvCy X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.133 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 Thu Mar 26 07:23:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 184841 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp1532305ile; Thu, 26 Mar 2020 00:25:47 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvleAoVp0+Z8BSozrkzZtxjDqV94x8b2qE3f5FP8azk9jaNkfUZhfc2EHOh2pvdeWt2TwSZ X-Received: by 2002:a37:b285:: with SMTP id b127mr6613614qkf.413.1585207547029; Thu, 26 Mar 2020 00:25:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585207547; cv=none; d=google.com; s=arc-20160816; b=FK7+rPWAEixwapF84mekngnGbnqTJzM5bmttc8JJEV5T/xAIptheVmMTxWFKC5tXU5 mRmovxqXzj7eIlKvyVTIC5eE/att9tOn3mkn0hkYwCHraVfj8iJQjvyu0GNRcKz3lBTb ciI4xE19ctbrJT4FOWhh6woeJg8bxAJfhipyVbiM3pmGrFp/sh8tT1KiUQmCX/cpsMSL uai8fmzuCEtqq9EndKkcCK9sLz5ka7MF6r0LZneuRJZcAS4KWiVfGjyw/eUnpdO8cEBq 30sbIo33bvux1gEsApSe1IGUEaOazKzjgElyPlGvdJKMb+Hbr09mq2XiAmUcAjKJIH65 rBUw== 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=JbCoMnS15YyWTDAfYJHz3Tzv2eQY1bfJmbpo5wAElYc6R9fSC1LSG+uDz9pBwDQoUb dEHkHqvhaLL4E5fyV1MEH4dWXOqTAEI4i6U4L0aPTj7Bpr5/YUa0oMWZ6gkD4KnPwGw9 7q1hOP+pnWBM9EVg0KbUQvccTurb796etE/oPh0Du9NzqDH4k2ouuTsK9DF9s2zbrFT6 DUD+dQulvbTc5yQd8GqqsJYi22/ZUNdQ/L+XTa2oHCfU7fSz2CC/VTi6/Gmtu3lOV9vb sD6g5D0UIhqYVRx9qR9nDXVZTOv8CynES3lMbkrH3mTnwWhFYhk1HmqslmM0UHaPZ4n5 oziQ== 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 m1si776568qtc.342.2020.03.26.00.25.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Mar 2020 00:25:47 -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]:47494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMte-0007Vh-GU for patch@linaro.org; Thu, 26 Mar 2020 03:25:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57148) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHMs7-0005Lt-HZ for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHMs6-0007tS-Fu for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:11 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:36039) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHMs6-0007t8-75 for qemu-devel@nongnu.org; Thu, 26 Mar 2020 03:24:10 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MLzSD-1izybm4957-00HuPH; Thu, 26 Mar 2020 08:24:00 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 6/6] linux-user: Flush out implementation of gettimeofday Date: Thu, 26 Mar 2020 08:23:52 +0100 Message-Id: <20200326072352.2056553-7-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200326072352.2056553-1-laurent@vivier.eu> References: <20200326072352.2056553-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:AyMp/m+qTp+pVhOJ5OilOky2MM/a0E7P1fmBAFPFBNqJUzH/eqf z6fa9u7kayN6my2rQDVSxgacYH9x4Hb9y4jQsFE48Mg6clu12yJqpMzp4wCXC6CN7y4749A AqVkYQ0gfEvskjMouQovGbdNF459vI3JkGDDaR5B6Qm0dIL2H1GwMzntz8rzYetNanGVMWC dw8735EZa2a+erF5N8Lkg== X-UI-Out-Filterresults: notjunk:1; V03:K0:HZRrY2G2UEM=:LhOmrJb75zcWC2H7jLNcHX nEvfvu6K/8TN+cKpRbx93xe5VyrxXQQrVBOebGrggvhnsluz5o+RC5VbfUKvB9ybOnW4PdzCJ 3iOaVjbxenF/BJKUP49Cq8dDU87hm7G9tWRXRVXliB9P/KB5SDotfi0YIZWwW8XIrH1kKHh4p PM7wCL6C04m0z08S87+JMJl7zLBqoZcRn2JyD8cJak99N6SGiDJo9iP4bhDBszGM7huTCvYxe RhoGiX9ed7rzXR0CU9kfDyHakqhQFia4ct0QEPMzGPZF3kRcFRnkdmuIHeoeeLHYNkYmuZsem klpY+ZQG3UYy2HxorEKbR7iNTSn5cxVFXSkdev7O6TkeQR0EHbVU0iZUM+zZtG9jKPU0X9JDk 7Gs7HjLVgmwP5VBC4+ivmU3QNeMFtwsyOvCBj/M33lPwz4mc1EQDkBeLe6VoEzeJmIg9lzH26 2adeTkiqZigL8i0xMuiY4mkgI0AAmXFSDKjBrR4ySqnTcTJEVnGqAS+S6h8CjcYbYzyzVrPaC mFTK99o8ulMAHU7XAsw3FxoTVU8mUlYqyXtf2KNMYrd/Np5IuT3/Zh5Q+TFzZGNWOixuMqdRG xNw2FtQva4fIK/5eLgkDFPRKEycTdlRxxq8K19/prk2rpnfk5juMm9sB3M6a8RiIQntXcE4u+ mfWR/hkmH4bY4CbT3jIxEOe3rbLld7v/lbf37vcc8ozOwxqOZWY72gD5YuvoAQr638XEENsIz e0agLsSS/dq18nAjQapBRSMIK2d7CUJPCmlzY5H/ieET1aPgY/TI9M+RcvIuSMML5INczJSgw QJChRHj/rYYsdBgpLNAeBavaNQybZ0I8c0/FG+ekSo+SVYsXIoXw8E5yn7HT1W7kGKnt0Jr 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?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;