From patchwork Wed Jun 16 01:12:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 461326 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp104323jae; Tue, 15 Jun 2021 18:28:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrhznY6lLXi37mmtu8djN9teONr8rQfKEaHU9MdRUBJwEd5bIM06Q8BrD3R5rK8yb1SmZf X-Received: by 2002:a05:6214:f0d:: with SMTP id gw13mr8503733qvb.34.1623806893895; Tue, 15 Jun 2021 18:28:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623806893; cv=none; d=google.com; s=arc-20160816; b=HnCQDZrsuhSFvmfxBHM7DvUs4lTtM/GP+37ZXbSjSTnRQD5WE8CqUzScKtgO4vx4dp onSL2ckL/pqsIVaIJk5J+voIEIVcYYzX0De2cD4P9A/YJfvfsqF8CvEPLxFVEjtohEWa 498zS0rHweuAWVUBdPCFUmqqgMkxws3TDw6am7zcNcEqY3Gt8OJTBGcGbvM4YJAlKsl7 k60Oi7g5eJTcYykXBWZu4mKqN9XpTyBrxhrozQzv2x4CPHHr9wuH8b75wBnXNoyugtc/ kJ3bYDA0IGLA35AyZleoMWb83q+l30l/Uhlq+ya7uONvC6y/JfN3SLdgvyFBWOxQHJKX umhQ== 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=Zh9h+PmWbwWPB35P4oSzNT2+LT+dobQgpXEUdOMWBj8=; b=Y/TwReUets9Bj4kZxr1hd9nfU9O+j1XWywW/1fQYcypywqjelU2a9cTVfmCaynq1au s0RR7JX7P45o7SnRcCLihH7bAmDtE1QhKQJjWzCEA7AbYwt7zCQGZIZefDSADhVni3JB VFTtbSU5Ms1hUge5efl8EvmLAhEZjqECE8BkJKITCUMLeE+SpOzXdcomDfY5JZ1dnDpN /Ndp5YbUUPrEJm9ZcLsVf2qQkVPpzjBnBwJNMh40Arf+HTAeXUPgCrVtPUuIO7e6qDvG XVS9wWq3+N/k/WRJ+cv1D+TqBy4Yj1gNW+tVhGqZvA6Qt6Rz0pWhNTelZ/nd9/wN7H+/ bJNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eYBq9tca; 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 e19si627097qtm.337.2021.06.15.18.28.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Jun 2021 18:28:13 -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=eYBq9tca; 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]:52908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltKLl-00048B-A5 for patch@linaro.org; Tue, 15 Jun 2021 21:28:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltK6V-0005cW-PK for qemu-devel@nongnu.org; Tue, 15 Jun 2021 21:12:28 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]:37708) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ltK6P-0008St-L7 for qemu-devel@nongnu.org; Tue, 15 Jun 2021 21:12:27 -0400 Received: by mail-pf1-x42c.google.com with SMTP id y15so842094pfl.4 for ; Tue, 15 Jun 2021 18:12:21 -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=Zh9h+PmWbwWPB35P4oSzNT2+LT+dobQgpXEUdOMWBj8=; b=eYBq9tcap6+l+m0tmt9Bm3C2Y/mI+KJpi6p8YQaiDNu2xct70XEHwBU6ZFYf3cRxC/ DC4T+g/Gm3g5mebzeH8W/REhgxvSomXpV6U8MJ8268mbKR4Q/FWorsX5lU1BGkb+RVxF clmtGctLgu9AloO0xjDxUu3b5tWDw2BmUtnMnZN6N1DFU7R+lEyjBHzdUz9r0nX53wrp yTereT4wNKNOv5H+TM3YbIEFCp3XLbL74uh17yusw43sR2mVGIJ8LAG3DLCIoWoB3XwU 8eBxCxiGmDhCby+9ZvW7Sld8kIxsxoYn7mcWmv7KV1upxKBuGdIBjeOeuSsFdvtABCAX YQKg== 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=Zh9h+PmWbwWPB35P4oSzNT2+LT+dobQgpXEUdOMWBj8=; b=HEUajRwBBcWbODU/cTvyAN4nzM9Lf+XaVO+kRiFbIghdBdoLGXjdCz/VSxMiJhNcka KH0xfwLWFCFMc0MXEQAgqAcw3TrwMcGC3q/xNzvIQFm7NoE1kDCvPXpg+F6aVaf0wnMa pLb4P3Cfz497cFzwSEEKIB/k3tBpMraYFVPqlw+LZtaD4tSgyx8Ge1EK2i5tglMtnVgo Y0+Ri79wAUqFGrxE9rpD70L1ceUzXbFKDvBctg6PzahiboYgXaODcoco7aRRS/QlCBHy rGvjOb6ue8oH7xtTD+cstetowbBQvFoXbN3bppGQSRvMPiUZUFcPsW3xgDFXSlZiiyQs Q7iw== X-Gm-Message-State: AOAM530wEqqedqqBfkbI6Vpx/MQHtrXnyicI8cTDKoZG6dBnGg8Kqpt/ ggJlU2fQcVM8pmL3QMtJsDhPtA+nf0GfSg== X-Received: by 2002:a63:1324:: with SMTP id i36mr2384226pgl.44.1623805940255; Tue, 15 Jun 2021 18:12:20 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id y18sm305297pgk.53.2021.06.15.18.12.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 18:12:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 15/21] linux-user/ppc: Implement setup_sigtramp Date: Tue, 15 Jun 2021 18:12:03 -0700 Message-Id: <20210616011209.1446045-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210616011209.1446045-1-richard.henderson@linaro.org> References: <20210616011209.1446045-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.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: qemu-ppc@nongnu.org, alex.bennee@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Create and record the two signal trampolines. Cc: qemu-ppc@nongnu.org Signed-off-by: Richard Henderson --- linux-user/ppc/target_signal.h | 2 ++ linux-user/ppc/signal.c | 34 ++++++++++++++++++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) -- 2.25.1 diff --git a/linux-user/ppc/target_signal.h b/linux-user/ppc/target_signal.h index 72fcdd9bfa..82184ab8f2 100644 --- a/linux-user/ppc/target_signal.h +++ b/linux-user/ppc/target_signal.h @@ -24,4 +24,6 @@ typedef struct target_sigaltstack { #if !defined(TARGET_PPC64) #define TARGET_ARCH_HAS_SETUP_FRAME #endif +#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1 + #endif /* PPC_TARGET_SIGNAL_H */ diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c index edfad28a37..4ae35aaf6d 100644 --- a/linux-user/ppc/signal.c +++ b/linux-user/ppc/signal.c @@ -202,9 +202,6 @@ struct target_func_ptr { #endif -/* We use the mc_pad field for the signal return trampoline. */ -#define tramp mc_pad - /* See arch/powerpc/kernel/signal.c. */ static target_ulong get_sigframe(struct target_sigaction *ka, CPUPPCState *env, @@ -437,12 +434,7 @@ void setup_frame(int sig, struct target_sigaction *ka, /* Save user regs. */ save_user_regs(env, &frame->mctx); - /* Construct the trampoline code on the stack. */ - encode_trampoline(TARGET_NR_sigreturn, (uint32_t *)&frame->mctx.tramp); - - /* The kernel checks for the presence of a VDSO here. We don't - emulate a vdso, so use a sigreturn system call. */ - env->lr = (target_ulong) h2g(frame->mctx.tramp); + env->lr = default_sigreturn; /* Turn off all fp exceptions. */ env->fpscr = 0; @@ -478,7 +470,6 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, target_sigset_t *set, CPUPPCState *env) { struct target_rt_sigframe *rt_sf; - uint32_t *trampptr = 0; struct target_mcontext *mctx = 0; target_ulong rt_sf_addr, newsp = 0; int i, err = 0; @@ -508,22 +499,17 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, #if defined(TARGET_PPC64) mctx = &rt_sf->uc.tuc_sigcontext.mcontext; - trampptr = &rt_sf->trampoline[0]; sc = &rt_sf->uc.tuc_sigcontext; __put_user(h2g(mctx), &sc->regs); __put_user(sig, &sc->signal); #else mctx = &rt_sf->uc.tuc_mcontext; - trampptr = (uint32_t *)&rt_sf->uc.tuc_mcontext.tramp; #endif save_user_regs(env, mctx); - encode_trampoline(TARGET_NR_rt_sigreturn, trampptr); - /* The kernel checks for the presence of a VDSO here. We don't - emulate a vdso, so use a sigreturn system call. */ - env->lr = (target_ulong) h2g(trampptr); + env->lr = default_rt_sigreturn; /* Turn off all fp exceptions. */ env->fpscr = 0; @@ -721,3 +707,19 @@ abi_long do_swapcontext(CPUArchState *env, abi_ulong uold_ctx, return 0; } + +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; + encode_trampoline(TARGET_NR_sigreturn, tramp + 0); +#endif + + default_rt_sigreturn = sigtramp_page + 8; + encode_trampoline(TARGET_NR_rt_sigreturn, tramp + 2); + + unlock_user(tramp, sigtramp_page, 2 * 8); +}