From patchwork Mon Oct 4 07:44:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 515173 Delivered-To: patch@linaro.org Received: by 2002:ac0:890a:0:0:0:0:0 with SMTP id 10csp1157639imy; Mon, 4 Oct 2021 01:13:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWez81KTfLxk/Z8Rcgipdd+e3JneQERq7xXFJGLXP/sIDgjJTwXyQ02w2ohOyYVHTTs2cg X-Received: by 2002:a92:ce85:: with SMTP id r5mr8511473ilo.159.1633335205340; Mon, 04 Oct 2021 01:13:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633335205; cv=none; d=google.com; s=arc-20160816; b=k0NLoPiU/wiKe8ZLgX+leFl+Znug/GQlH6zrGLf4/IMjP8WtYCxWEUNpfvRjNjQwfX 6+OK/MhFZrTAQHyFGB9k7GdvlRXvYw4Dw3ba7VqaTEyoIpZb3nxzsPj13wp6pZhAbMwj iN5h4tFZl1DeLNEizPqRSirpO5uxYll0UnPFJ9GpQpIlFLtYATGrqFS3kNS50NIwH/IU F90sOhW+tRpvNq8XuQN0DZLjHFxPi1YEoCuA/BC8A9cRhlwlBM13jDeNWqz4NMX63EqN oWUtFm9YJyThxfCV+arHVkAszNCjsMe/uPFbqYaGMuY5eJNzzblpm+wpe2KdRULrfeJ8 a38A== 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=9sTmdpRrxGHDtK1pWakExt9vhwoIzfL2Ps7v9k1tV3Q=; b=jkkj3WRomvMWIq3N7kwnyl9YgxoJ7VMcnqyLOTXAJtVjcRxgi4/85FINa8PUi9lNKg K5oW/a0z4LhjDaUIj1AjWOAV9/Dux2tv919bFMJYKBJ3PT7fV44pb1UGLzBN7qNMYfvn 7ZkKVP6jaNYywvoMdiGstoEhFRokoAm/eiZC18aQVZO03oHqIrBacOUhYzC4veCPIj+6 UmAXervVCA78wi2pRmI6iCHeNxgVh5RGiLiGRk3wJKTWOPlTh2GtxigU4BQdRYmZu4W+ wcFGJ0iOC58dwZPtRhnndAJaCLw1OJM0POM1Uztuj4HJs9Ff9vz1y8VSYgAY8dE+KREK 42aA== 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 s10si13905636ilh.107.2021.10.04.01.13.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Oct 2021 01:13:25 -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]:60560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXJ6C-0006dA-Qr for patch@linaro.org; Mon, 04 Oct 2021 04:13:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXIeT-0004LI-Pk for qemu-devel@nongnu.org; Mon, 04 Oct 2021 03:44:45 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:43651) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXIeO-0004ud-RG for qemu-devel@nongnu.org; Mon, 04 Oct 2021 03:44:44 -0400 Received: from quad ([82.142.3.114]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MaHOX-1mLUvj3iBp-00WCBR; Mon, 04 Oct 2021 09:44:31 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 13/26] linux-user/microblaze: Implement setup_sigtramp Date: Mon, 4 Oct 2021 09:44:08 +0200 Message-Id: <20211004074421.3141222-14-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:4l7eGtcRveYhX4odyEQivFKvdbJIzUWFifdlAqmvuB2neBA0v/d GVU4W/P9LZ29soWEb2EFWa1QwQXqSD9ITVIOUs1b8oQ/hY54BGTcOLqxwf838k0h7gxRaun tNF5kWbi1qzvgJ9GdngQxSLayJY5s56LqOmvR9l4TJtMOKgZ/RnXUsNWrAMrwr2DMzwO372 jRvSMb6CDWdJda9QdffWg== X-UI-Out-Filterresults: notjunk:1; V03:K0:IpcpzYlwy5Y=:6F48JdVxwBB7HPWNs5D4Ki yfcPQH6pukA7IxPTE2ZMYIiOXMDyy+EMkUWgtOlik6bGfbOJdTw2oErCY9qsMRVR1WJ3r8odd fG1+GBF82xkJmYYfaXRBELHIAJy/FX3M6VhF96XRWyVOjnYzoZMRikckmmqbJX1N4OSmjQCEu BQEsnowl1SMU7/MfiWeEOkaUGSOFxincBRFD48zjqvpOA5OFNNCoc71bGbWF3YX3y7ir/UYi3 cZjfOiH/HZ8yGEH/bFdGByYUP4v6h8ZYANZoOkEZ9t6RZiS7gPdcuPW9kuuZut7PLL0Oiodnz Df02qi4NcE8gprF5CPUV2693R4zy+mttBtN6RzPnDXsZokGSV2YIlIxblsLXHTA5weZIE2bbW sC4befQc4WgtA8l695RskwB5uewzlrxLNHSttMp/U2Lzm48kihdfup0ogEeAaMqd7wTSFtfNQ 6OJ6lGwp7PPyqpyalhNd2aJKUUNF9jP9DRePg4dsU5oXl6d2ufJ8buMYXSrT0aLezfkL+fcL/ 7TC3WGGBRaVoli/ieUSdTAbdAgR5C1SxP8ISp2pa4FT5a/Iq3nQ/vsWuXhakFrxo4+GPbMwmP 73EzAnMJqOuB6qCZNqZ/Jx8c0mSjt92Ce1qnFiT37r+9/y1qN2TubOhRculsyYe6ElOERX3fh Fhc3MzbwT/lvIoqLfGDiXyVAAelPKZ1BejR5TwC3cLw+mdEWDXUSijdYS5+IwbMzf/yFckoG7 iEQYsQF24NpHSN7NuiCD9SORZ9dw+meXX80a9A== 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_Mathieu-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 rt signal trampoline. Cc: Edgar E. Iglesias Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Message-Id: <20210929130553.121567-14-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/microblaze/signal.c | 24 +++++++++++++++++------- linux-user/microblaze/target_signal.h | 2 ++ 2 files changed, 19 insertions(+), 7 deletions(-) -- 2.31.1 diff --git a/linux-user/microblaze/signal.c b/linux-user/microblaze/signal.c index b822679d1805..8ebb6a1b7dfe 100644 --- a/linux-user/microblaze/signal.c +++ b/linux-user/microblaze/signal.c @@ -161,17 +161,11 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, /* Kernel does not use SA_RESTORER. */ - /* addi r12, r0, __NR_sigreturn */ - __put_user(0x31800000U | TARGET_NR_rt_sigreturn, frame->tramp + 0); - /* brki r14, 0x8 */ - __put_user(0xb9cc0008U, frame->tramp + 1); - /* * Return from sighandler will jump to the tramp. * Negative 8 offset because return is rtsd r15, 8 */ - env->regs[15] = - frame_addr + offsetof(struct target_rt_sigframe, tramp) - 8; + env->regs[15] = default_rt_sigreturn - 8; /* Set up registers for signal handler */ env->regs[1] = frame_addr; @@ -220,3 +214,19 @@ long do_rt_sigreturn(CPUMBState *env) force_sig(TARGET_SIGSEGV); return -TARGET_QEMU_ESIGRETURN; } + +void setup_sigtramp(abi_ulong sigtramp_page) +{ + uint32_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 8, 0); + assert(tramp != NULL); + + /* + * addi r12, r0, __NR_rt_sigreturn + * brki r14, 0x8 + */ + __put_user(0x31800000U | TARGET_NR_rt_sigreturn, tramp); + __put_user(0xb9cc0008U, tramp + 1); + + default_rt_sigreturn = sigtramp_page; + unlock_user(tramp, sigtramp_page, 8); +} diff --git a/linux-user/microblaze/target_signal.h b/linux-user/microblaze/target_signal.h index 1c326296de42..e8b510f6b182 100644 --- a/linux-user/microblaze/target_signal.h +++ b/linux-user/microblaze/target_signal.h @@ -21,4 +21,6 @@ typedef struct target_sigaltstack { #include "../generic/signal.h" +#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1 + #endif /* MICROBLAZE_TARGET_SIGNAL_H */