From nobody Sun Sep 7 13:41:51 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1632796130416168.02942317465136; Mon, 27 Sep 2021 19:28:50 -0700 (PDT) Received: from localhost ([::1]:43334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mV2rR-0008VK-Dd for importer@patchew.org; Mon, 27 Sep 2021 22:28:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mV2Qd-0004te-1q for qemu-devel@nongnu.org; Mon, 27 Sep 2021 22:01:08 -0400 Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]:37561) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mV2QX-0005sR-Tc for qemu-devel@nongnu.org; Mon, 27 Sep 2021 22:01:06 -0400 Received: by mail-qk1-x72c.google.com with SMTP id 73so39195710qki.4 for ; Mon, 27 Sep 2021 19:01:01 -0700 (PDT) Received: from localhost.localdomain (cpe-24-31-215-130.sc.res.rr.com. [24.31.215.130]) by smtp.gmail.com with ESMTPSA id g12sm12530370qtm.59.2021.09.27.19.01.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Sep 2021 19:01:00 -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=N1pQeWtC9n4Sw0tRD9grdf+GtJJknjzU5E/8NqeYIIg=; b=ns4Fqc9aDpxuGBNXAn4B9qg3MzubPW6uoW+fyCXT7yh/QaYuLQMfJdvVcg4qDIi81q +5Ebdv6kB324kUG0CcJc7nJiACdnHWwVm3Tt7uAfV/xDK72TzvaVb4N3V92wm5y4ZJrB pJLlD17GSfcqPTGvFGTJaQycdca0EIH66zkXhGjLW2dakDV2+OxpBvl/1fFrpY8kc/6G orsn6ioSJnZ8QTbxeSsGig4IITclAPXHuj+Cj8RjqdnBMIiuQV8F4bD/Ngs/4FsviyXV i2mMMKlijIYUT9mOelBpfDztqXzCDsgbEgS25MbDDi3I29+tSkguLjgYIrMqflJ6K0+h oB8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N1pQeWtC9n4Sw0tRD9grdf+GtJJknjzU5E/8NqeYIIg=; b=4TteA6Exu+gxn8bchpc654xRYRxgCNUGJprcUoWpJji3GNOL1636lm7SqZ+b3MPBdy ipldPmImIzzMbuV8aDWo1OcmzerBig+pR5Jtl3owTMl/hGlbSO1khj+h9v+Dfk6FaWvO PoFpo+whLlf3oux9pCUp/SEHVGLnaZsmi53fw0pglstDmVBZEhl10oY4fwhfB7g5wKRK KcC4VXXcdIa51SvqqlvnYWkV3Dko6Fyv8ZWVqk7at/51cV4fqDPOuwAnVd1D1SDNFnk8 1Yx/PoOgzV9tCCKqJ2DLrNdyMxy/OI2m7UuiuL702j5+fvyVSHqd7tjVtCH8ftfTa/w7 CR1A== X-Gm-Message-State: AOAM533/bcZka0m2hb1a1PxVRGF6RezQNGIJsQdmHsqp6MkvtFMUyufF WQ/D29qzsathaFggC1ljZ7owIlDkB1YVew== X-Google-Smtp-Source: ABdhPJxjq6Pmw4habsKKIR6ODrU628nvvl/b8b2eRc/vHTZEkMk9ksDmdGbyYjfaq715NYofAN4t9w== X-Received: by 2002:a37:bc85:: with SMTP id m127mr3148276qkf.119.1632794460797; Mon, 27 Sep 2021 19:01:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 22/25] linux-user/sh4: Implement setup_sigtramp Date: Mon, 27 Sep 2021 22:00:36 -0400 Message-Id: <20210928020039.184412-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210928020039.184412-1-richard.henderson@linaro.org> References: <20210928020039.184412-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::72c; envelope-from=richard.henderson@linaro.org; helo=mail-qk1-x72c.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: peter.maydell@linaro.org, laurent@vivier.eu, Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1632796131238100005 Create and record the two signal trampolines. Use them when the guest does not use SA_RESTORER. Cc: Yoshinori Sato Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- linux-user/sh4/target_signal.h | 2 ++ linux-user/sh4/signal.c | 40 +++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/linux-user/sh4/target_signal.h b/linux-user/sh4/target_signal.h index d7309b7136..04069cba66 100644 --- a/linux-user/sh4/target_signal.h +++ b/linux-user/sh4/target_signal.h @@ -22,4 +22,6 @@ typedef struct target_sigaltstack { #include "../generic/signal.h" =20 #define TARGET_ARCH_HAS_SETUP_FRAME +#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1 + #endif /* SH4_TARGET_SIGNAL_H */ diff --git a/linux-user/sh4/signal.c b/linux-user/sh4/signal.c index d70d744bef..faa869fb19 100644 --- a/linux-user/sh4/signal.c +++ b/linux-user/sh4/signal.c @@ -52,7 +52,6 @@ struct target_sigframe { struct target_sigcontext sc; target_ulong extramask[TARGET_NSIG_WORDS-1]; - uint16_t retcode[3]; }; =20 =20 @@ -68,7 +67,6 @@ struct target_rt_sigframe { struct target_siginfo info; struct target_ucontext uc; - uint16_t retcode[3]; }; =20 =20 @@ -190,15 +188,9 @@ void setup_frame(int sig, struct target_sigaction *ka, /* Set up to return from userspace. If provided, use a stub already in userspace. */ if (ka->sa_flags & TARGET_SA_RESTORER) { - regs->pr =3D (unsigned long) ka->sa_restorer; + regs->pr =3D ka->sa_restorer; } else { - /* Generate return code (system call to sigreturn) */ - abi_ulong retcode_addr =3D frame_addr + - offsetof(struct target_sigframe, retcode); - __put_user(MOVW(2), &frame->retcode[0]); - __put_user(TRAP_NOARG, &frame->retcode[1]); - __put_user((TARGET_NR_sigreturn), &frame->retcode[2]); - regs->pr =3D (unsigned long) retcode_addr; + regs->pr =3D default_sigreturn; } =20 /* Set up registers for signal handler */ @@ -248,15 +240,9 @@ void setup_rt_frame(int sig, struct target_sigaction *= ka, /* Set up to return from userspace. If provided, use a stub already in userspace. */ if (ka->sa_flags & TARGET_SA_RESTORER) { - regs->pr =3D (unsigned long) ka->sa_restorer; + regs->pr =3D ka->sa_restorer; } else { - /* Generate return code (system call to sigreturn) */ - abi_ulong retcode_addr =3D frame_addr + - offsetof(struct target_rt_sigframe, retco= de); - __put_user(MOVW(2), &frame->retcode[0]); - __put_user(TRAP_NOARG, &frame->retcode[1]); - __put_user((TARGET_NR_rt_sigreturn), &frame->retcode[2]); - regs->pr =3D (unsigned long) retcode_addr; + regs->pr =3D default_rt_sigreturn; } =20 /* Set up registers for signal handler */ @@ -334,3 +320,21 @@ badframe: force_sig(TARGET_SIGSEGV); return -TARGET_QEMU_ESIGRETURN; } + +void setup_sigtramp(abi_ulong sigtramp_page) +{ + uint16_t *tramp =3D lock_user(VERIFY_WRITE, sigtramp_page, 2 * 6, 0); + assert(tramp !=3D NULL); + + default_sigreturn =3D sigtramp_page; + __put_user(MOVW(2), &tramp[0]); + __put_user(TRAP_NOARG, &tramp[1]); + __put_user(TARGET_NR_sigreturn, &tramp[2]); + + default_rt_sigreturn =3D sigtramp_page + 6; + __put_user(MOVW(2), &tramp[3]); + __put_user(TRAP_NOARG, &tramp[4]); + __put_user(TARGET_NR_rt_sigreturn, &tramp[5]); + + unlock_user(tramp, sigtramp_page, 2 * 6); +} --=20 2.25.1