From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8FCAC433F5 for ; Mon, 4 Oct 2021 08:05:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 499D46120D for ; Mon, 4 Oct 2021 08:05:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 499D46120D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:47836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXIyz-00068h-Bv for qemu-devel@archiver.kernel.org; Mon, 04 Oct 2021 04:05:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXIeR-0004Jr-Qn for qemu-devel@nongnu.org; Mon, 04 Oct 2021 03:44:43 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:41309) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXIeM-0004sE-PP for qemu-devel@nongnu.org; Mon, 04 Oct 2021 03:44:42 -0400 Received: from quad ([82.142.3.114]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MavF5-1n3tdg2jG7-00cTRz; Mon, 04 Oct 2021 09:44:27 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 07/26] linux-user/cris: Implement setup_sigtramp Date: Mon, 4 Oct 2021 09:44:02 +0200 Message-Id: <20211004074421.3141222-8-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:AYWD5ubbTywWVnEnEWbtAJt1YIMMn+hzNn3Ydo/W2UVOb8idEB9 ayB7BHmXbQWD70dHNpm35qft9JW2b12zmCY3fdaSq6WO7W/0RX6OcfnuvZC7BeMf7JixdiH rxPYtzW0Gr3irH4cxH/06oX3KAhXMgI0g5GQHXDpgxpZvkkJq8SnzYxgBhumaaTG7+qkZb4 DX3hb7GAfF1HOu6a8llxw== X-UI-Out-Filterresults: notjunk:1;V03:K0:SdfmUmY/5fs=:Ww+QdfCfSRkwIHVoo3BXxG 8bRnbhBGg+pA1SQ9235wRIHafgrtToj82uL/bTPJHsrGfOzSikl12zyBbJCmZ6O9kWeEmgbED HDSV9mmoeaUJSA5IB+nvk1HphQkyYMwPcdGFLe8QeTBh5t+0YdjF6rVsP30lB+f22G0R/JU6W gMcHSed2lhzivuPFcjIWHTwfltzyAak/gZEldOjA9bV0wUYv8JXPymWC1obHOLNeaul+7fhdn dIuMq2WN94jwsA1bBU/VyrGpsJVC5WPktgZ1JKl5jaJstAPkS8fi2DVtc2Ldrr9Lj8sNf7rcS gf4hy7aaZsUSBJQAb3qyrdMnfdt3dK1G8si3PYXHwFkaA8XJkGXbi/p4Le5q9qjupybmFTUL8 9ErtXjxJXTYRRHNlJjZLD62i75zAi/epwVDdW50nKPxDPWvHKf0Vk/43IHOTgKUEULywUY/E4 g8k4+AsybKBW6dxChHqFX3POJCPZj3Iqs3pr7DiYg5TUOfwpMUihidPaAkYH+EiHumY4LjfvF aAp3T3gLqdVPVMHRXRlL0KvG86TdXG42inQNMy7M094xWE7iIKHcfVK9FTwnt4DuLzBdORcn+ WCGQZWFeNSAQUA0Alr92Vuwjntr86d97jGJIMuPRvBibefJrQSKSF3NHHtOTjyX+oyoK+Qntn YFxx2vNGDccoPUmyf0qLmZ0BkmWCnOxe2L/NPN9G/ZPZaBp3IhE+4Szoe8XuNWRppiOjIPENb zrfTA2sghjAZB7yinFyvZ2b3q1MQ2dVu6DD03Q== Received-SPF: none client-ip=212.227.126.131; 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_H2=-0.001, 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: "Edgar E . Iglesias" , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Split out setup_sigreturn so that we can continue to initialize the words on the stack, as documented. However, use the off-stack trampoline. Cc: Edgar E. Iglesias Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Message-Id: <20210929130553.121567-8-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/cris/signal.c | 29 +++++++++++++++++++++-------- linux-user/cris/target_signal.h | 2 ++ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/linux-user/cris/signal.c b/linux-user/cris/signal.c index 2c39bdf7277f..7f6aca934e10 100644 --- a/linux-user/cris/signal.c +++ b/linux-user/cris/signal.c @@ -97,6 +97,14 @@ static abi_ulong get_sigframe(CPUCRISState *env, int framesize) return sp - framesize; } +static void setup_sigreturn(uint16_t *retcode) +{ + /* This is movu.w __NR_sigreturn, r9; break 13; */ + __put_user(0x9c5f, retcode + 0); + __put_user(TARGET_NR_sigreturn, retcode + 1); + __put_user(0xe93d, retcode + 2); +} + void setup_frame(int sig, struct target_sigaction *ka, target_sigset_t *set, CPUCRISState *env) { @@ -112,14 +120,8 @@ void setup_frame(int sig, struct target_sigaction *ka, /* * The CRIS signal return trampoline. A real linux/CRIS kernel doesn't * use this trampoline anymore but it sets it up for GDB. - * In QEMU, using the trampoline simplifies things a bit so we use it. - * - * This is movu.w __NR_sigreturn, r9; break 13; */ - __put_user(0x9c5f, frame->retcode+0); - __put_user(TARGET_NR_sigreturn, - frame->retcode + 1); - __put_user(0xe93d, frame->retcode + 2); + setup_sigreturn(frame->retcode); /* Save the mask. */ __put_user(set->sig[0], &frame->sc.oldmask); @@ -135,7 +137,7 @@ void setup_frame(int sig, struct target_sigaction *ka, env->regs[10] = sig; env->pc = (unsigned long) ka->_sa_handler; /* Link SRP so the guest returns through the trampoline. */ - env->pregs[PR_SRP] = frame_addr + offsetof(typeof(*frame), retcode); + env->pregs[PR_SRP] = default_sigreturn; unlock_user_struct(frame, frame_addr, 1); return; @@ -187,3 +189,14 @@ long do_rt_sigreturn(CPUCRISState *env) qemu_log_mask(LOG_UNIMP, "do_rt_sigreturn: not implemented\n"); return -TARGET_ENOSYS; } + +void setup_sigtramp(abi_ulong sigtramp_page) +{ + uint16_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 6, 0); + assert(tramp != NULL); + + default_sigreturn = sigtramp_page; + setup_sigreturn(tramp); + + unlock_user(tramp, sigtramp_page, 6); +} diff --git a/linux-user/cris/target_signal.h b/linux-user/cris/target_signal.h index 495a14289681..83a515550745 100644 --- a/linux-user/cris/target_signal.h +++ b/linux-user/cris/target_signal.h @@ -22,4 +22,6 @@ typedef struct target_sigaltstack { #include "../generic/signal.h" #define TARGET_ARCH_HAS_SETUP_FRAME +#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1 + #endif /* CRIS_TARGET_SIGNAL_H */ -- 2.31.1