From patchwork Mon Dec 20 21:05:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 526082 Delivered-To: patch@linaro.org Received: by 2002:a05:6e04:2287:0:0:0:0 with SMTP id bl7csp4455561imb; Mon, 20 Dec 2021 13:14:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJy2NrL8li5fE1Cfespxc2tRf4n+CrJd/JFvtcM5877fvw8WlZ86EzLyxElis7NUmXG3GnKp X-Received: by 2002:a05:6902:72c:: with SMTP id l12mr36782ybt.89.1640034890739; Mon, 20 Dec 2021 13:14:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640034890; cv=none; d=google.com; s=arc-20160816; b=dNZa17Bxltl4sTDlsXrmeoQxiz/9MTJhJLYHtTjLwR78IhYqJAHHD5xUULPuB8ev41 qDxnjWnkcC3KkItG1jtaK/wuDshg8Slsfin+vScAlAH7mXeo36GJzeAMULGgkU3kz7WK Lk+lfftAzvQLPIjbYDEJMIOb1eDqXBzGsPNkT1kX/F9SHHSurGS9TFNt5V0wy1942zzm drMwiZLBplyZhvUl8oq4pWBDKcrlGpVH3x+8EkcD7YECG1qSN4kgni7tLdE3f6UlKwKu 7pcrUoi/Iab5Nc+z3yCvDQeqWEaa68wNiyl9EAffBas5BKynbFwT778IiTGFNGqua5KV xQcA== 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=S7hFUuTV+iuv3hB5Dhl40hs7IVetUAEz1cQVzVCpn+mb1bMjcNX1SOau6YwskWyPNc 0orWHeEQdd4zfZPtIkRf6PX1pBkOhhn/MbQtAkwXIed2VnovxbDhVSQwe8qypR4X3NsO psw+/Wm5jOx1pbKa5cUf0nN8CVjYrKh3EuKyV6shfPpRe4I56UBWwsKyTRsRUH6h/8dm lBnPNxwtT3P45I49Q8VMP4WHTVhqyY4gESSiQXUX8jjEXZZGrTId+Dol+aQllQCgU/tC We1Q3Yze6TEs7yTir/3hItnO/m4RcdiZxXEfPlNxthTA8FCITy5FjVCubUzlvZXGUNiR +0KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nP5Z9l9V; 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 d10si17852825ybf.595.2021.12.20.13.14.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Dec 2021 13:14:50 -0800 (PST) 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=nP5Z9l9V; 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]:50718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzPze-00014o-5n for patch@linaro.org; Mon, 20 Dec 2021 16:14:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzPqn-0000Pk-I8 for qemu-devel@nongnu.org; Mon, 20 Dec 2021 16:05:41 -0500 Received: from [2607:f8b0:4864:20::436] (port=40715 helo=mail-pf1-x436.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzPql-0005uO-UB for qemu-devel@nongnu.org; Mon, 20 Dec 2021 16:05:41 -0500 Received: by mail-pf1-x436.google.com with SMTP id z6so9792091pfe.7 for ; Mon, 20 Dec 2021 13:05:39 -0800 (PST) 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=nP5Z9l9VHulFIBNRYSElE9KBVIGj+lJk4C+aZNcPfrw+B8VRYoFZodYOgNog0bC3PP yxyvMyeo/502IDZY+BTzvSnfJCD0OJK5WUqWfBLsMDGraa+lh8VStgD/5VJa70VyqFvg s/LP0crL67waByxk8uoUzmnUzPnfxzIGv0bZMfsULMeJHZzsOI3gC9k6m/ThbcTUgood lquriqqcbXDpWYiuq5TGwdAIhNf6LcJqKedc+A45FOg5AgJX52VQTrE+FTDuVMAt1djN SSc9UxiJL5x/jUKwvEpgVmiBjw3G8gFKERpjAUTYw+E1Vda6fHNlSIdKezxH5wwVWfN7 dHOQ== 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=DJxYcCAMknpvPH3NgtpyFgUYvKyfc+LoT4d5o283awKjwazYQBp3Lm/VQu8W4RGbmr aiV/LDtTRj7hfE1xWVjrJbPI3eHGGugD2PgGbew9X8AMp5ITG5NDOQq8LscJpHKu9ub3 nvEdccd6rp78JhFTIwSh4nMeoyvb0FcG46luGgjX8Re3u0IgBYv/MlEnKun2RcSM7EWO TBZrgoSnvKbT0yhVMpOrig909RZrTQpZnOK+z6d8hHtPExFqHtx7KfVrLyQ8QgOsgw8A yc9zLg/01IAemUqaYTdQE0lCQP2UwKfW6+7A4L13/HqkjZ9fNpux5FrvwXd3fvmQzucl 6akQ== X-Gm-Message-State: AOAM531ABSHprhnjxOy4LjyXFmSF06JYIcXXhXbe6xe41gaUj6XYVULw pcRb8dpO1eSeCwlkOuQNLXliohikNYyqGw== X-Received: by 2002:a05:6a00:10cf:b0:4a3:124d:bb81 with SMTP id d15-20020a056a0010cf00b004a3124dbb81mr18145444pfu.75.1640034338654; Mon, 20 Dec 2021 13:05:38 -0800 (PST) Received: from localhost.localdomain ([156.19.246.20]) by smtp.gmail.com with ESMTPSA id d13sm20091021pfu.213.2021.12.20.13.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Dec 2021 13:05:38 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 10/24] linux-user/i386: Use force_sig, force_sig_fault Date: Mon, 20 Dec 2021 13:05:14 -0800 Message-Id: <20211220210529.150423-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211220210529.150423-1-richard.henderson@linaro.org> References: <20211220210529.150423-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::436 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x436.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 , 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(-) 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);