From patchwork Wed Nov 3 14:08:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 516747 Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp702646iml; Wed, 3 Nov 2021 07:15:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEJHn5PMbaLHZNsQ/eRtld7bTbkzjRuAUpfGWDZDSV3OtMZLFzuphXxreg2OJzIQjQar0b X-Received: by 2002:a9d:774c:: with SMTP id t12mr26159838otl.282.1635948952664; Wed, 03 Nov 2021 07:15:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635948952; cv=none; d=google.com; s=arc-20160816; b=ZD3Y9kI1zxdggYPB+jOgu2loAc6m32Enn6p8fcJJRdoqtFNh4pT1SixFCI1tZlup3g BbquDS4omjU2JQVcHSOIJln2HMb++nW/PZEya3sKvSSfcCiBHMPV2MDteWr/lbyz6ThG EIE6W02Y6oMfDoL01dbjPgJnmHYVndYccWtEcqJImSOnkYWNuLX0yk8Wqicchnjg8Kkv XrWkyXoCXLpZciho3Hu1y3NYF8Uuk4vI0GBs6Ht0fV0Et0pXtGBqiJB4sO++B6HL/SzA q0FFFFwDm2ufheBAGgu0pxqViSP7buZi3hM7YUlI2atdMZ9LTGHSaa7eEtI49yV2je3w eWwg== 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 :dkim-signature; bh=oryq+LuMrMDBeDTMJmIY7vqQWuye0TU114y1grFNoXo=; b=ZwwneC4dthhD9dReJLMtnkkmQkNwYKYPc3BBPk0GvfUq38B1RQVcLEn6tQzBONtGC5 XqkELVu8YFRWFRrhCGEGzEN2aCBRpfvZEcZwnoVMDsAbhyA1kRuz/At4BNpvQRtd/KeL rf4pkG5iUJagSvrkm5kRfNuwUWu7GzyH3NvTc2ubgmelpOE7W7hhmfAoA8ZhHw1hgk8R LAU2Iy3qFdlEkdsyGcBnqbnzz2d1xg7eDP1G4JvFlI5vNwyfv080yDIYmi97svSXmVbB HrdONfY5np6LPgQMsJt3bWKHHGKFwBjoPnHY4vu3s9wjh8CQynk7kPg/KXvlFGiuGVw7 7Y4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ungcFu6d; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l18si5226182otu.312.2021.11.03.07.15.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Nov 2021 07:15:52 -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; dkim=fail header.i=@linaro.org header.s=google header.b=ungcFu6d; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miH3P-0005Gh-SR for patch@linaro.org; Wed, 03 Nov 2021 10:15:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miGwj-0002EF-Hz for qemu-devel@nongnu.org; Wed, 03 Nov 2021 10:08:57 -0400 Received: from mail-qk1-x72a.google.com ([2607:f8b0:4864:20::72a]:38744) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miGwh-00052J-HM for qemu-devel@nongnu.org; Wed, 03 Nov 2021 10:08:57 -0400 Received: by mail-qk1-x72a.google.com with SMTP id bi29so2378272qkb.5 for ; Wed, 03 Nov 2021 07:08:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oryq+LuMrMDBeDTMJmIY7vqQWuye0TU114y1grFNoXo=; b=ungcFu6dQhfohOTevkP7C98yW1WFl7MWaBtyB7uoVL8/tha02x9JJqIPU1xaXTiK6z dMn6TXV45AFwl0DdDRvmxc6fA60LrqzrtyPJHdgtSGHyIhUeq6x0rs8a6RBkdZ1fi2xi GjyZdiXlHJ6yA7pnb9rMmV7S58VPueP6alnYoW/dTpRc+KgsDW5pvdrhoI7Yd8WtBaFE PLIQ4hAICQtAufsEzX+seIjCZg69vCkrTsTw5CccXM22P9/cxfpYjMbYz3oZ8epGSs1I /w06ovvYP5SIcBMtOGJV8qx3boHy/waoUh6OhG+Rfw3k4/JXCWB8OSjv9VhqekmF1iNE YLVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oryq+LuMrMDBeDTMJmIY7vqQWuye0TU114y1grFNoXo=; b=6uvQUu3QM5YV9LuVUV4CKVkDzDGuemDA7uIr5z2AeD3sRAzukbwkN1KVAEh8tev9Rt L4CRkLqUWz99eyROc6cuPyITHn2fKUqjqMbHPY3VcX0KyFXgmNAwcEgMox/pzd1lXUJa qLlAIF++LNtns9pr6vTexRa2+6Sri6umghSBSDcNuQkVSbmrJYxky4zKL5DYXPkutM6u W5GEaCyFxxcMlPc9iW5AlUZppHOISRekgKZeeXwyLvd5IPphaxiNpaD8PaHBsOnU29n9 J1ZlQmtVsfwhEThud5+A1rXFkj51Gb/Dn1bczQvqdj/RfQopfTdBoeymNaIj9i2vbvna jYnA== X-Gm-Message-State: AOAM530aX6t9OckK0cx6MZmQQ1S+lBFZImoElvu5KRooG/3OwsY4ozwr mZAvFjc4GioUKLIwfZjeTtC8jB29zNTh7Q== X-Received: by 2002:a37:b0c6:: with SMTP id z189mr35320453qke.344.1635948534751; Wed, 03 Nov 2021 07:08:54 -0700 (PDT) Received: from localhost.localdomain (rrcs-172-254-253-57.nyc.biz.rr.com. [172.254.253.57]) by smtp.gmail.com with ESMTPSA id z5sm1669377qtw.71.2021.11.03.07.08.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 07:08:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 09/23] linux-user/i386: Use force_sig, force_sig_fault Date: Wed, 3 Nov 2021 10:08:33 -0400 Message-Id: <20211103140847.454070-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211103140847.454070-1-richard.henderson@linaro.org> References: <20211103140847.454070-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::72a; envelope-from=richard.henderson@linaro.org; helo=mail-qk1-x72a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Replace the local gen_signal with the generic functions that match how the kernel raises signals. Fill in the missing PC for SIGTRAP. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/i386/cpu_loop.c | 47 +++++++++++++++----------------------- 1 file changed, 18 insertions(+), 29 deletions(-) -- 2.25.1 diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c index a372cfe1b2..879d44b490 100644 --- a/linux-user/i386/cpu_loop.c +++ b/linux-user/i386/cpu_loop.c @@ -84,17 +84,6 @@ 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); -} - #ifdef TARGET_X86_64 static bool write_ok_or_segv(CPUX86State *env, abi_ptr addr, size_t len) { @@ -107,7 +96,7 @@ static bool write_ok_or_segv(CPUX86State *env, abi_ptr addr, size_t len) } env->error_code = PG_ERROR_W_MASK | PG_ERROR_U_MASK; - gen_signal(env, TARGET_SIGSEGV, TARGET_SEGV_MAPERR, addr); + force_sig_fault(TARGET_SIGSEGV, TARGET_SEGV_MAPERR, addr); return false; } @@ -193,8 +182,7 @@ static void emulate_vsyscall(CPUX86State *env) return; sigsegv: - /* Like force_sig(SIGSEGV). */ - gen_signal(env, TARGET_SIGSEGV, TARGET_SI_KERNEL, 0); + force_sig(TARGET_SIGSEGV); } #endif @@ -266,53 +254,54 @@ void cpu_loop(CPUX86State *env) #endif case EXCP0B_NOSEG: case EXCP0C_STACK: - gen_signal(env, TARGET_SIGBUS, TARGET_SI_KERNEL, 0); + force_sig(TARGET_SIGBUS); break; case EXCP0D_GPF: /* XXX: potential problem if ABI32 */ if (maybe_handle_vm86_trap(env, trapnr)) { break; } - gen_signal(env, TARGET_SIGSEGV, TARGET_SI_KERNEL, 0); + force_sig(TARGET_SIGSEGV); break; case EXCP0E_PAGE: - gen_signal(env, TARGET_SIGSEGV, - (env->error_code & 1 ? - TARGET_SEGV_ACCERR : TARGET_SEGV_MAPERR), - env->cr[2]); + force_sig_fault(TARGET_SIGSEGV, + (env->error_code & PG_ERROR_P_MASK ? + TARGET_SEGV_ACCERR : TARGET_SEGV_MAPERR), + env->cr[2]); break; case EXCP00_DIVZ: if (maybe_handle_vm86_trap(env, trapnr)) { break; } - gen_signal(env, TARGET_SIGFPE, TARGET_FPE_INTDIV, env->eip); + force_sig_fault(TARGET_SIGFPE, TARGET_FPE_INTDIV, env->eip); break; case EXCP01_DB: + if (maybe_handle_vm86_trap(env, trapnr)) { + break; + } + force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->eip); + break; case EXCP03_INT3: if (maybe_handle_vm86_trap(env, trapnr)) { break; } - if (trapnr == EXCP01_DB) { - gen_signal(env, TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->eip); - } else { - gen_signal(env, TARGET_SIGTRAP, TARGET_SI_KERNEL, 0); - } + force_sig(TARGET_SIGTRAP); break; case EXCP04_INTO: case EXCP05_BOUND: if (maybe_handle_vm86_trap(env, trapnr)) { break; } - gen_signal(env, TARGET_SIGSEGV, TARGET_SI_KERNEL, 0); + force_sig(TARGET_SIGSEGV); break; case EXCP06_ILLOP: - gen_signal(env, TARGET_SIGILL, TARGET_ILL_ILLOPN, env->eip); + force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPN, env->eip); break; case EXCP_INTERRUPT: /* just indicate that signals should be handled asap */ break; case EXCP_DEBUG: - gen_signal(env, TARGET_SIGTRAP, TARGET_TRAP_BRKPT, 0); + force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->eip); break; case EXCP_ATOMIC: cpu_exec_step_atomic(cs);