From patchwork Fri Sep 24 16:59:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 514603 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1689432jao; Fri, 24 Sep 2021 10:16:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzu3AORuIBJM2dD9jGgn3k2HMFF9emj4eqsKibjSLesCVTU3ot3JIq0kVp+Vg1TUZOeTny1 X-Received: by 2002:a37:634c:: with SMTP id x73mr11250061qkb.120.1632503787830; Fri, 24 Sep 2021 10:16:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632503787; cv=none; d=google.com; s=arc-20160816; b=CLe6oO2VTiXWysfr+Yu0xQU1TZm4qYDX61cRtdd++8DyViAKlW/1/3kIx0IN3LZlfJ 8TZgPem00EgnOHFNrpyWQHVXv0YaDMOIIYjjtkPHSHMo+5C2LrmE3oR/oPDOjgwtDHD8 jufg/VMDvgK3eMF5Euz1f8B2z+BMGpyMqBa5TUct5T4qAXUIJv5+xU1r68Mf738fJk+m fAkpiKHala8O0og25SADcgTVVb77v+dlptnVcbibFobI4WxZzJbH278XmiOzU+yHzJY6 f+czmW7J5tJlz1v6JaA4GqiAcBrz506z90gxl0vH0jpTXCa2eH6ilFk5a2G9Gt0Lmlng hwBQ== 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=+2oTGkDFDH981BJQF84oTMrfB4/Msl13jtU0KS59bkI=; b=ihuxDtylU32BeOUjAG7RfsCXJ+dC28GSVN8ABYNzu6Y2dpGQi3Z2c3sUikJ+U4dSFI 8ncbJYNKc3ytnh1HObu8Nl4lemMBUo8xjGPPaWC1UA6exbWviEKvKEcz1yGPVsu3w/T1 IlyyCqyjJPFizk6owrYC60AjsMtOE78HRkn06UrF8aYk1qN5VFW4TbUqxTBl2ZqPBVuU FGvFv8ElHwLGfJLWnFC56qWLDND+ehIOKShLa7wWbMpOACDLoP7CM1GakXt4hWc+nHFr sywFUIwz4ktLvSHi9D9B+EvLhOScpWOPWoBEtNIHgXrfE58GvORUGHrwRRwX1EiityZ3 r2ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZSoWJQ6i; 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 bi19si159914qkb.358.2021.09.24.10.16.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Sep 2021 10:16:27 -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=ZSoWJQ6i; 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]:41688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTooF-0006mi-Bi for patch@linaro.org; Fri, 24 Sep 2021 13:16:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mToY6-0002hT-8K for qemu-devel@nongnu.org; Fri, 24 Sep 2021 12:59:46 -0400 Received: from mail-qt1-x829.google.com ([2607:f8b0:4864:20::829]:34376) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mToY1-00071A-RZ for qemu-devel@nongnu.org; Fri, 24 Sep 2021 12:59:44 -0400 Received: by mail-qt1-x829.google.com with SMTP id 2so10095821qtw.1 for ; Fri, 24 Sep 2021 09:59:39 -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=+2oTGkDFDH981BJQF84oTMrfB4/Msl13jtU0KS59bkI=; b=ZSoWJQ6iTMEkoSktMtaIQuTX41EcJ9GIq6ilGSxW5bucuCGbYejCOmEdCdxb/VzQSy pGO+OAMkFhZPTa5/S3EC/zjsLVi4+QWp7dFhkGXfa4CdTcfn5wRKcgviKQcpfFr/JBcx weOisHw04m1KU4GjgrpNN9dYnSgYtuZHUqtHLsYfXJgPQkPenEwve/Jfek3CL/qtJ1uB hJAt3Fq+O9mZufP6M/egdTdUGWtjyUd98tfayzeMGG7gdXFX82mOzAByd/7xjqgY4ROp SXs48lilT+YcG3L734Lkjd3cf5vBqyumPsZ9Z1vk+TCJRthsLB3GKe1jSHZFkf62ocNm Xs0g== 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=+2oTGkDFDH981BJQF84oTMrfB4/Msl13jtU0KS59bkI=; b=nEIYUDTxzMtmy9WHJNGDoBGDlQ3evlWff3GGIqP1yahBDVakMrB2KrM+dkPTYKFWAB HTLTHURiH7IWda+sbjzn5WBcWoSoRyNVwF4bishmo6Pl2R0yOE+1lyI9m3+yBy8LyUu+ V6YiKpJ4YUdFNU1MVo5VYQF8TTSOOwhBtleyWmBD0/RjG55USMnBVkCHnfE0EkdN7xh6 pE67+J3if9IgIGJ32SqrQ72+TNV5cbGdkkVnwRb6rPrfd9vb6+CQtO4CZKE9A2HlP/4f SPe3Wlylc971gw8kaLP/R7iarMKPuK51j1uP7pZmHw5szBOMuNq3nsjJ2jiUYWENwo6j xICg== X-Gm-Message-State: AOAM533fR3lzqzlIR44NCIFOq3y5Gc7WFsqaJNYx47m8FrK7YdEd0Uv/ cGK67Zo9Am2Rs1ckxBfCskSW3t5ilQaAlA== X-Received: by 2002:ac8:71d1:: with SMTP id i17mr5231103qtp.210.1632502779205; Fri, 24 Sep 2021 09:59:39 -0700 (PDT) Received: from localhost.localdomain (cpe-24-74-129-96.carolina.res.rr.com. [24.74.129.96]) by smtp.gmail.com with ESMTPSA id r13sm7141104qkk.73.2021.09.24.09.59.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 09:59:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 15/27] linux-user/mips: Implement setup_sigtramp Date: Fri, 24 Sep 2021 12:59:14 -0400 Message-Id: <20210924165926.752809-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210924165926.752809-1-richard.henderson@linaro.org> References: <20210924165926.752809-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::829; envelope-from=richard.henderson@linaro.org; helo=mail-qt1-x829.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, laurent@vivier.eu, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Create and record the two signal trampolines. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- linux-user/mips/target_signal.h | 1 + linux-user/mips64/target_signal.h | 2 ++ linux-user/mips/signal.c | 34 ++++++++++++++++++++++--------- 3 files changed, 27 insertions(+), 10 deletions(-) -- 2.25.1 diff --git a/linux-user/mips/target_signal.h b/linux-user/mips/target_signal.h index d521765f6b..780a4ddf29 100644 --- a/linux-user/mips/target_signal.h +++ b/linux-user/mips/target_signal.h @@ -73,6 +73,7 @@ typedef struct target_sigaltstack { /* compare linux/arch/mips/kernel/signal.c:setup_frame() */ #define TARGET_ARCH_HAS_SETUP_FRAME #endif +#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1 /* bit-flags */ #define TARGET_SS_AUTODISARM (1U << 31) /* disable sas during sighandling */ diff --git a/linux-user/mips64/target_signal.h b/linux-user/mips64/target_signal.h index d857c55e4c..275e9b7f9a 100644 --- a/linux-user/mips64/target_signal.h +++ b/linux-user/mips64/target_signal.h @@ -76,4 +76,6 @@ typedef struct target_sigaltstack { /* compare linux/arch/mips/kernel/signal.c:setup_frame() */ #define TARGET_ARCH_HAS_SETUP_FRAME #endif +#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1 + #endif /* MIPS64_TARGET_SIGNAL_H */ diff --git a/linux-user/mips/signal.c b/linux-user/mips/signal.c index 64072779b9..8f79e405ec 100644 --- a/linux-user/mips/signal.c +++ b/linux-user/mips/signal.c @@ -209,8 +209,6 @@ void setup_frame(int sig, struct target_sigaction * ka, goto give_sigsegv; } - install_sigtramp(frame->sf_code, TARGET_NR_sigreturn); - setup_sigcontext(regs, &frame->sf_sc); for(i = 0; i < TARGET_NSIG_WORDS; i++) { @@ -231,7 +229,7 @@ void setup_frame(int sig, struct target_sigaction * ka, regs->active_tc.gpr[ 5] = 0; regs->active_tc.gpr[ 6] = frame_addr + offsetof(struct sigframe, sf_sc); regs->active_tc.gpr[29] = frame_addr; - regs->active_tc.gpr[31] = frame_addr + offsetof(struct sigframe, sf_code); + regs->active_tc.gpr[31] = default_sigreturn; /* The original kernel code sets CP0_EPC to the handler * since it returns to userland using eret * we cannot do this here, and we must set PC directly */ @@ -305,8 +303,6 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, goto give_sigsegv; } - install_sigtramp(frame->rs_code, TARGET_NR_rt_sigreturn); - tswap_siginfo(&frame->rs_info, info); __put_user(0, &frame->rs_uc.tuc_flags); @@ -335,11 +331,13 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, env->active_tc.gpr[ 6] = frame_addr + offsetof(struct target_rt_sigframe, rs_uc); env->active_tc.gpr[29] = frame_addr; - env->active_tc.gpr[31] = frame_addr - + offsetof(struct target_rt_sigframe, rs_code); - /* The original kernel code sets CP0_EPC to the handler - * since it returns to userland using eret - * we cannot do this here, and we must set PC directly */ + env->active_tc.gpr[31] = default_rt_sigreturn; + + /* + * The original kernel code sets CP0_EPC to the handler + * since it returns to userland using eret + * we cannot do this here, and we must set PC directly + */ env->active_tc.PC = env->active_tc.gpr[25] = ka->_sa_handler; mips_set_hflags_isa_mode_from_pc(env); unlock_user_struct(frame, frame_addr, 1); @@ -379,3 +377,19 @@ badframe: force_sig(TARGET_SIGSEGV); return -TARGET_QEMU_ESIGRETURN; } + +void setup_sigtramp(abi_ulong sigtramp_page) +{ + uint32_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 2 * 8, 0); + assert(tramp != NULL); + +#ifdef TARGET_ARCH_HAS_SETUP_FRAME + default_sigreturn = sigtramp_page; + install_sigtramp(tramp, TARGET_NR_sigreturn); +#endif + + default_rt_sigreturn = sigtramp_page + 8; + install_sigtramp(tramp + 2, TARGET_NR_rt_sigreturn); + + unlock_user(tramp, sigtramp_page, 2 * 8); +}