From patchwork Mon Oct 4 07:44:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 515175 Delivered-To: patch@linaro.org Received: by 2002:ac0:890a:0:0:0:0:0 with SMTP id 10csp1158898imy; Mon, 4 Oct 2021 01:16:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+vo4oO0EjQqmsDgZ5ge6ejAtTMJgFFOmg1dOAx/qCdXoNUrcvwt7yli+Shl6s36CHo/+C X-Received: by 2002:a25:217:: with SMTP id 23mr13672932ybc.205.1633335380903; Mon, 04 Oct 2021 01:16:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633335380; cv=none; d=google.com; s=arc-20160816; b=ELfoJwLh9jMGpitM6GRfUCR9hIG2DaXdB1dOZBx03Lx2OWR4fclEwV9qacgiMolAKP GJCXDtICCqsrz4h0UFJqBlPHAB7owqwszgFT+J6tbFt5zvPwzqI9aTROnA25hJG0FFbT O9mnwb13elipgObc5eOokPbYVN0x7iTi6CaFPrSIr8CyI7Md8lkEg9ha0PNoquSiq+bi tGRkcqYvkHDbtyDBixLGq53W5WgrN1rIJJUV3vuQrG3vU3useGivsPVxB16wCoFoXJJ3 f1bNEgNmZO7d2V5CeGfQoZeBkifK+q3Ipcj2XOOPRh5Z8X3Rl9cMR2t+MHJ4M1jdwKGi fCQQ== 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=ujc23ehFOz5Du76/MtCrIDHselDdfCEZKTOvbauL9Rc=; b=OFgPoDqK1EHiV5zTrUngG26jcg+9GkKK8bnvzCoJnRg+o/yAo8ZlEYlpdKypT1j9c1 6RWKDSUfGSOq+docEm9JycZMfE3ja9+0jLUap7PBhsztGj9wL43F17nrJ3eXI/K4zOv5 h+95qeb3QMJX2t6MEqvlBa62mNbKG/UJ3UoczrG9/0J7DCsWNbEqP4L9LdzZ67oxC8Ts j80inNIzANHF2PndKgRga7y8LUH7YlOFo0bP0ZWQBnGN1tA3pgZxwu4LFePky0KjZMCc YLuARw2aK5HUnzZd0nJ4ntvO2oB1rB9hCSo7Q86uRVQ5uO2/3n7KOXtob0XxCkhixpIh xOtA== 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 g2si17880651ybj.197.2021.10.04.01.16.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Oct 2021 01:16:20 -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]:40712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXJ92-0003ov-Cb for patch@linaro.org; Mon, 04 Oct 2021 04:16:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXIeZ-0004Pr-A4 for qemu-devel@nongnu.org; Mon, 04 Oct 2021 03:44:52 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:42841) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXIeR-0004wf-J5 for qemu-devel@nongnu.org; Mon, 04 Oct 2021 03:44:49 -0400 Received: from quad ([82.142.3.114]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1McGtA-1n5GxO1LLg-00cgQY; Mon, 04 Oct 2021 09:44:38 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 24/26] linux-user/xtensa: Implement setup_sigtramp Date: Mon, 4 Oct 2021 09:44:19 +0200 Message-Id: <20211004074421.3141222-25-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:yOh9WAT3bb04r9IEmSGWPhDeaPOBZwJRmLGiIoAqiKMoK8onVzq VJmwPPh6lkBuTJOtjoeo5rb4zclA3EWx8uD2mY+keNR9we170TmUibU4hLYgE+eV4vpgwg5 eamVwkupqzNeEPr5lIPxcfKnOsjjejwhwhFNLfoas7nVINlgFPQYnHiZAuXQ0NTQzT0UEJJ 43I3gatgi36OFMnqzVFrQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:/RCtgT+yquE=:LVd1hJxhWUWMLe5lvFAcIm Hc3DYAR4/YY5ETL+VptKGMHKc3EoLf/LGwP3TjqKOoGwW4nQkQ3JUftnDOCAhST8Cu0YNFHXz Wt7pQIhc+CyLvJNNfuZYjwcu2EOoPn3y4YYWVkDj0OUJer2h+F062UCVQxzUaEtUbucTsmpPl Bg0jR5XJGNaCoL8BtnNRMvm5n8uZRff3dz+JVIWOM0jpSiNpqUDhalRVu/1roqnXzALT9bWaf M3OIJz8t9fXFf27K2uCtZN3wr+/FqpjgZ/lxMMwsG9A49oDXEnzIm8LpFFg5mxx/UbvYcptTX g0p9p6cY3Fd9xQ0wOc18FI3TQdlLjAj19sXyWvUy4BmAhPuescE/sONAEjbJVg4zgUufbv0R9 VmP35bTtuMXo6nEa2zrq5J+RYGSi0EMflXDIMwi+zMWp+KCQe9DQaoSWw7FQWbomoR8AYnQD3 K8Ft2j1ftDqsHr7b4+fBzyadQwAxuWnuZwXFofguhfxY+lXGWIF0ZFQBXnU08uaHY+o5TaQbY z5jG7LIxHt6UINqbUAI/kvBpE69KIrVYKhluv+b3DPpYk7CKkmny5q0Bkbrp6PeE0aFProsDG 92DoIgy1HO6+YlsDz3MEkGZprdZELedgnOzmXSyfl8ynKHsPTqO2lK2clFeEu/BZPtBtbj11D y9Oqf7d4c7h1JuF2vSHAR+63dizv12IBPUFUbXxeBQwfImy66qrQcb5W8VnBeW+ppZum1rPfo zcJpEjLj2+XVphupXk7WxL+2cGl/37rsqb1/ww== Received-SPF: none client-ip=212.227.126.135; 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_H3=-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: Max Filippov , 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. Use it when the guest does not use SA_RESTORER. Reviewed-by: Max Filippov Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Message-Id: <20210929130553.121567-25-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/xtensa/signal.c | 56 ++++++++++++++++++++----------- linux-user/xtensa/target_signal.h | 2 ++ 2 files changed, 38 insertions(+), 20 deletions(-) -- 2.31.1 diff --git a/linux-user/xtensa/signal.c b/linux-user/xtensa/signal.c index 7a3bfb92cadc..81572a5fc7b3 100644 --- a/linux-user/xtensa/signal.c +++ b/linux-user/xtensa/signal.c @@ -128,6 +128,29 @@ static int setup_sigcontext(struct target_rt_sigframe *frame, return 1; } +static void install_sigtramp(uint8_t *tramp) +{ +#ifdef TARGET_WORDS_BIGENDIAN + /* Generate instruction: MOVI a2, __NR_rt_sigreturn */ + __put_user(0x22, &tramp[0]); + __put_user(0x0a, &tramp[1]); + __put_user(TARGET_NR_rt_sigreturn, &tramp[2]); + /* Generate instruction: SYSCALL */ + __put_user(0x00, &tramp[3]); + __put_user(0x05, &tramp[4]); + __put_user(0x00, &tramp[5]); +#else + /* Generate instruction: MOVI a2, __NR_rt_sigreturn */ + __put_user(0x22, &tramp[0]); + __put_user(0xa0, &tramp[1]); + __put_user(TARGET_NR_rt_sigreturn, &tramp[2]); + /* Generate instruction: SYSCALL */ + __put_user(0x00, &tramp[3]); + __put_user(0x50, &tramp[4]); + __put_user(0x00, &tramp[5]); +#endif +} + void setup_rt_frame(int sig, struct target_sigaction *ka, target_siginfo_t *info, target_sigset_t *set, CPUXtensaState *env) @@ -164,26 +187,9 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, if (ka->sa_flags & TARGET_SA_RESTORER) { ra = ka->sa_restorer; } else { - ra = frame_addr + offsetof(struct target_rt_sigframe, retcode); -#ifdef TARGET_WORDS_BIGENDIAN - /* Generate instruction: MOVI a2, __NR_rt_sigreturn */ - __put_user(0x22, &frame->retcode[0]); - __put_user(0x0a, &frame->retcode[1]); - __put_user(TARGET_NR_rt_sigreturn, &frame->retcode[2]); - /* Generate instruction: SYSCALL */ - __put_user(0x00, &frame->retcode[3]); - __put_user(0x05, &frame->retcode[4]); - __put_user(0x00, &frame->retcode[5]); -#else - /* Generate instruction: MOVI a2, __NR_rt_sigreturn */ - __put_user(0x22, &frame->retcode[0]); - __put_user(0xa0, &frame->retcode[1]); - __put_user(TARGET_NR_rt_sigreturn, &frame->retcode[2]); - /* Generate instruction: SYSCALL */ - __put_user(0x00, &frame->retcode[3]); - __put_user(0x50, &frame->retcode[4]); - __put_user(0x00, &frame->retcode[5]); -#endif + /* Not used, but retain for ABI compatibility. */ + install_sigtramp(frame->retcode); + ra = default_rt_sigreturn; } memset(env->regs, 0, sizeof(env->regs)); env->pc = ka->_sa_handler; @@ -264,3 +270,13 @@ badframe: force_sig(TARGET_SIGSEGV); return -TARGET_QEMU_ESIGRETURN; } + +void setup_sigtramp(abi_ulong sigtramp_page) +{ + uint8_t *tramp = lock_user(VERIFY_WRITE, sigtramp_page, 6, 0); + assert(tramp != NULL); + + default_rt_sigreturn = sigtramp_page; + install_sigtramp(tramp); + unlock_user(tramp, sigtramp_page, 6); +} diff --git a/linux-user/xtensa/target_signal.h b/linux-user/xtensa/target_signal.h index c60bf656f6b6..1c7ee73154ac 100644 --- a/linux-user/xtensa/target_signal.h +++ b/linux-user/xtensa/target_signal.h @@ -20,4 +20,6 @@ typedef struct target_sigaltstack { #include "../generic/signal.h" +#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1 + #endif