From patchwork Mon Oct 4 07:44:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 515167 Delivered-To: patch@linaro.org Received: by 2002:ac0:890a:0:0:0:0:0 with SMTP id 10csp1153028imy; Mon, 4 Oct 2021 01:03:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFZqPldvkgpte8FtFsIfceg+Mm1EAlbiQhp2QibkNZ1eirGpQC36eNTLmHsd1RGasBZCtZ X-Received: by 2002:ac8:411d:: with SMTP id q29mr11967281qtl.349.1633334609928; Mon, 04 Oct 2021 01:03:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633334609; cv=none; d=google.com; s=arc-20160816; b=vyhHtcBd2eq977fBb4wBmkvkmmcHE4yseZL03z965IlC2MDclzdzOINNhxSdjWcIWq C2X9WSkBbEvhmVER1D0jRyehle+QyO3UAZNRueQercNR+nNdjEzctUuvs2DdrhupST0I zuF8AiVyUMCDNynwqn8BZomKqWsT0ToQSsfk1lVSw6L7CcmunFuEPZ1c5bKjkhFUSzHZ ja2T8apVqoYd78EsYyC+XwWZE9RxQFSUig54O01eomCmOxepIvxc5J/VXzEwZCSM5gWc 6eD06f2I3tO23apffTOaQX8f5mjdiL1RHGMgUYjJjUKetx6akzk77X3yu40o5YOFLbY7 7Zjg== 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=HzXKqUkF5zYf0xagYL05XwtZae9vhr/pQem7CC2NDrs=; b=l4GV99x7NNqp5sKvSyZ3lUxjGDUxmrfnjJP4T0KTYtxGbP4YnWd1VOd7u3ecvAstD5 MoHCDna6Gu+O0P4NlqSyIJXKHln9HuP4daG3mfTHg/gpkoeFgH2kkXcixcXJvGK8N/IS THv9xB0qI82aeMNJ4AgJFzS/7m36033+8zn6wSvSSji4nBXBdOEtkliP6Io+WsCi736w bMy6XC93AloD+auhieYpBSGmP3p/z3DiNFLipA4idY7DJgtOSPyseBRZ+Vtxkd8EmD6l al5tkBKxZQB6d9qGLseJ1sFFlX5PQWCY7O8/3gMVtsGG4fl3OXQfX/yE/HRgjTpNEc4C ucXA== 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 l21si7735356qtn.373.2021.10.04.01.03.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Oct 2021 01:03:29 -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]:42748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXIwb-0002hk-Bt for patch@linaro.org; Mon, 04 Oct 2021 04:03:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXIeO-0004D0-2y for qemu-devel@nongnu.org; Mon, 04 Oct 2021 03:44:40 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:46337) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXIeK-0004po-LP for qemu-devel@nongnu.org; Mon, 04 Oct 2021 03:44:39 -0400 Received: from quad ([82.142.3.114]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MkW10-1nDUQb3uKE-00m4Ew; Mon, 04 Oct 2021 09:44:32 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 15/26] linux-user/mips: Implement setup_sigtramp Date: Mon, 4 Oct 2021 09:44:10 +0200 Message-Id: <20211004074421.3141222-16-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004074421.3141222-1-laurent@vivier.eu> References: <20211004074421.3141222-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:xvvdkEmr98B5CPc7SE/Er3pcIEah+YIIYdmvPXFXP/b2CE7FMsW YwjgEwjUp1Y3LZNJNuyzXvL5Xz6S9SQVhaXxTE/CCMY4w6JqW64SMsc+JCpTZUlK0KdhF/u C2PoCke7CWpS0uOeiEBuFFL3GRZjeqTxYjlGziUeZi81zn2KX+S6gGzxRldcr3CZF2UpLv+ 2CS41U8Cg+jD/XvQVNZNg== X-UI-Out-Filterresults: notjunk:1; V03:K0:OVEiW1ipNe4=:JsTg7sjQtGGIsHiJrUAAj0 xhX1MJgbBcLy4Rrv+N5gRKvAKf/oNT27gRwvq1hXlQzN965Gnu4dH6eyLFgOIZwKntoi08I9c bb+Y0kFq7x4uKvat6gZFhVJEPVPIGoHZB3R0Ajs+OjhPp3UShj/doloHnkiHWaHcKvjlIHdkD cIknS6WRXOYD9MYsYLi0kxFJMh0f+3tC3oyHIBtnhKUDrnmkNa110B+U/mTglJQ+Ad6uApV5g ImHky8H/1VsjmOkqaujey7WgvaeiqeiB94kNxEXvYtuV1kDjUqIT7zXH55hEiyLfHwCXp7F8t T41IZZO8OeW5+Vt2QXJ8J2Ahr5ljWEfUqELRypJ/bWE69qNaRK/F9NDTD7JCn1HyM61KyLdVH vxU/s5avE/xYdNBxeYytVDaivKjtZ9xTGNQt9+CJGPFo/vII6tzdAKv14tTvdhEvF2u1KNyaO 7KeyIdNvhwVqVent38dMXYZRTfXex34OyEKxkrPEetFgmr58ORTsJMrJrqamET+/ixKDrMU1t 8Bpo/Lx+vH6PB/s3XQWZFL5pIeZHRToddgdTdlJ/5I6ZFa97fubnRhfYBlC1Ph0xLVpXFbWcf w6jgN8ysOofwZOq2L0URiPHhlG8IMTT4HgOqSdlga86y6XLSzernjN8bG9A6IEs7Sj3icxtJb XYqNOJctN5O8JWYog3202Ji1OhYlt76cY8wu18X21j+DOs7Z/sj3kaMCfml6QroURfCyN0DWq eSrkuouRcwsEXtl9agRnNX891okY/TXbLbTA4g== Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_NONE=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: Richard Henderson , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Create and record the two signal trampolines. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Message-Id: <20210929130553.121567-16-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/mips/signal.c | 34 ++++++++++++++++++++++--------- linux-user/mips/target_signal.h | 1 + linux-user/mips64/target_signal.h | 2 ++ 3 files changed, 27 insertions(+), 10 deletions(-) -- 2.31.1 diff --git a/linux-user/mips/signal.c b/linux-user/mips/signal.c index 64072779b94a..8f79e405ecb7 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); +} diff --git a/linux-user/mips/target_signal.h b/linux-user/mips/target_signal.h index d521765f6b2c..780a4ddf29de 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 d857c55e4c6c..275e9b7f9a2a 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 */