From patchwork Tue Jul 6 23:49: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: 470616 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5552579ejx; Tue, 6 Jul 2021 17:04:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfWrqVnCR0DvesUL9nMuNHiNmF8p1yln9ebcoeyBFRzJJLeuH3rGRZLTgbfIqyU+YwJOUb X-Received: by 2002:a17:906:25cb:: with SMTP id n11mr21192589ejb.539.1625616243311; Tue, 06 Jul 2021 17:04:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625616243; cv=none; d=google.com; s=arc-20160816; b=kmcgpeG66StJoxg5JLgK1bshxmjYBtTf31cIk0qcILbmfCMJBj6Pc3JUwQf9tsHcHS wFAmlgyhPJbNhkOJ6w/7QlKlnziehBl4WivF4M07ofp/RnjAKAUpTDqQVTk5zTh3n3E5 PejSI6arVf5BN1jrrG260u0aH0Jl1gU4Vny39FZ4Gxzrz4wiOExZW5qMK3D+Z/3gKmDI VEYKkRUyaP/wZ/gl14d+0hYpd66rmf/0odNZNCm9JWK7V76PqQhAk1nm+8g/aJeKBilc GpuOOED3GB4y3Fu9eoEpVhkOcPnLbviGkyQgXzM6T5kMwMQF/R0+yuI0PVWoNQX+A7AT mEag== 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=4mopW7s5yqP9F0ovgsMWsgQoRxKhvaHRwRrnWnVsrug=; b=qNtRljBbZ13tqOK9go5Ysl56DCwG1XXzq7naz0dcpCJe/GOK1liJUnnxrsT2N1zff/ KQp9BF7rRVtCEVYUYYB8m6GcE1iIG4aCM2q5XYociF0nPGeyvz6F7dyxeImes3Zz0e83 BFMz7F1IpzeTsm8ljjzezFFV7jtSwfHh2r2dXrwHC88wdtVU09ZVXDajsc24HuTipRgD D1hf4HLloayV3FYp9NMePKNQOW7rvpY7qJqL/ZgNTiNfbpBRkGKft7bze04Z8LozGsZR F8pwnTlJFgjRrEsRdDBtzk+YGJO+oDuprr9nUDk4fkPrOpj7FbSdId/G1HZCgj6Khix7 AL2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="Q4/R5H+l"; 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 m19si8913217edr.133.2021.07.06.17.04.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 17:04:03 -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="Q4/R5H+l"; 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]:57354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0v2o-0000DM-DQ for patch@linaro.org; Tue, 06 Jul 2021 20:04:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0up7-0001PC-TK for qemu-devel@nongnu.org; Tue, 06 Jul 2021 19:49:53 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]:38849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0up0-0006eU-VQ for qemu-devel@nongnu.org; Tue, 06 Jul 2021 19:49:53 -0400 Received: by mail-pj1-x1035.google.com with SMTP id cs1-20020a17090af501b0290170856e1a8aso2555247pjb.3 for ; Tue, 06 Jul 2021 16:49:46 -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=4mopW7s5yqP9F0ovgsMWsgQoRxKhvaHRwRrnWnVsrug=; b=Q4/R5H+lIAuM3R/QCkcbyAlk5IfnkGPqDs1oewXFzsIOfO9z1X1BjTvkmnndZQ4i+h iGUffW43V8b3Y+0b8euSp5AeFr13DjPW5N7kSZHxbWB4ZbvmI5yClcExED8eBV18n8I8 t+A+bfUCNlbeFdua+e/F5oRug/V0o0cnNEs/ti/lhJEJCiq+XU4EV8NhJ2UHDTmejDfH 59YcwnG+8BqadruKx9z8ztRFlXBeH7wEeIsAX3LZEX34sWZsf+TQZRdaQWbEJ6180cZe I3oSVJ3TjOGOSLGNejMtyaO11prrcm3wY5bWfzacQacsFjm9owji697blmxBT0chnEgW CorA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4mopW7s5yqP9F0ovgsMWsgQoRxKhvaHRwRrnWnVsrug=; b=JdKtK/z/OcK9VODlfPXWbZ1B4LGgZ6i1+br838aktR0DvUjDRV5sJ/mJ4xtfMvldIQ oWJBoLdlNuBvbg2MlyULaLDiBvXKRFBoBIbzd2+JgyH19cTS3Fd733fdakAKVeboo1ED a79/y6fkvLKEdvKa1AgtbS2TQA3NAnNgDTWoZzgo7QkMNxZUSrNIJ925/xkn6CvoUX2r dKUsTwTwqSJFpqR3cj0DKnEJ60b1671SbDSI8ogfYDHPTEq593jDRW/r8HCSHaAj46R4 gmYaLNNOMEKJpRrKNPJrTvkjE4LM1bQ/J/3WYGL4KzHCJ8xJqyiaxu/3pnyHic+FPKrH mTsA== X-Gm-Message-State: AOAM532Vo3ip58tCjxY/2og88e1Rop94Xj7gqPfe4GzbFg2kX1Jegynt gWnUQkx5f9Aj/D1vFMbf+YUN9aI622xY1Q== X-Received: by 2002:a17:902:e84b:b029:129:3120:153b with SMTP id t11-20020a170902e84bb02901293120153bmr18870159plg.47.1625615385401; Tue, 06 Jul 2021 16:49:45 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id b3sm18058114pfi.179.2021.07.06.16.49.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 16:49:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 18/36] linux-user/cris: Implement setup_sigtramp Date: Tue, 6 Jul 2021 16:49:14 -0700 Message-Id: <20210706234932.356913-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210706234932.356913-1-richard.henderson@linaro.org> References: <20210706234932.356913-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1035.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: "Edgar E . Iglesias" , alex.bennee@linaro.org, laurent@vivier.eu, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- linux-user/cris/target_signal.h | 2 ++ linux-user/cris/signal.c | 29 +++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) -- 2.25.1 diff --git a/linux-user/cris/target_signal.h b/linux-user/cris/target_signal.h index 495a142896..83a5155507 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 */ diff --git a/linux-user/cris/signal.c b/linux-user/cris/signal.c index 1e02194377..9dad50f31f 100644 --- a/linux-user/cris/signal.c +++ b/linux-user/cris/signal.c @@ -96,6 +96,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) { @@ -111,14 +119,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); @@ -134,7 +136,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; @@ -186,3 +188,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); +}