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);