From nobody Wed Nov 5 10:30:43 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499394523547768.3067335261459; Thu, 6 Jul 2017 19:28:43 -0700 (PDT) Received: from localhost ([::1]:54132 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTJ0c-0006Tm-8V for importer@patchew.org; Thu, 06 Jul 2017 22:28:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTIv3-0001gO-H1 for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:22:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTIv0-0008T2-DL for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:22:57 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:33074) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dTIv0-0008SD-5A for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:22:54 -0400 Received: by mail-qk0-x241.google.com with SMTP id p21so2756332qke.0 for ; Thu, 06 Jul 2017 19:22:54 -0700 (PDT) Received: from bigtime.twiddle.net.com (rrcs-66-91-136-156.west.biz.rr.com. [66.91.136.156]) by smtp.gmail.com with ESMTPSA id i85sm1407176qke.66.2017.07.06.19.22.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jul 2017 19:22:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=W8AO4FKMz63jZMPCP8pC3NmjVRpxCNhIg5NoICWJaNI=; b=bYn7GlJ/cjx/HTZ9vNER3M5WzjK/gnZKuMTXwcOxDZpkvgckV95ozZuJXV4hJlyIpM Au/eowHNk92uFEolpJqZHix+3AKPrP24wf9ksvqQY5A7Aja9QMDMEdiTOjAOt6ovhwv9 XHuZAy/4reJ2cHN/IWgJMnArr002iCGNb3BCjKRwZDhh4HbU/Q4ApO7zibT9QFnH3BXp 2W0hg72UhlsLgbXExNMkW8yZsr0yirE3exyzIbCmvFxdnXBx0/rG/JvcFmgrqTd/l6ED s+AJUF1OzpKu9aPcqn0pn0JBzIkzmYTcSt91wT7eRSPUKTIi8zKy8LEhXZd8j+hpxHrl VdFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=W8AO4FKMz63jZMPCP8pC3NmjVRpxCNhIg5NoICWJaNI=; b=chuVhL+ATy8okF/hVkp03eRw/7YmnyguVGzJW9t/0TUNmvcd4BjzZQVxPuJWObQxiH jESG+vToZ781RyK71kJmLPXcQKsV7JAcRAYedZXdCODrC6t9F+uxdazkAgDeqf6AZ+BS dKzdB8W+zQnxgwHNVIU4qimflYmUQnN/IW96zt1HAMgFyravfgE1CrGhMUxwd0azHlrn qC2dRbQilokPwzYmZ69q9QvyO4leu7Ae7vH+1Da15Sspt484beyBMtxG2nB/Xqtg8wiN FF74ieKkEbHjVyQNAgk9FiRYfZNodF2JUpY3dMoW8fMI8Sa9bflx+6YyrKiyV1xsmQTq MIhw== X-Gm-Message-State: AKS2vOw6Q5my/7tiaRpu0tpTuQwEve7SJXE/+UlGtSVBVvFKcS4Wr7cn vgxDbYdaAr7HqHnEKN4= X-Received: by 10.55.79.131 with SMTP id d125mr61601007qkb.169.1499394173397; Thu, 06 Jul 2017 19:22:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 6 Jul 2017 16:20:52 -1000 Message-Id: <20170707022111.21836-9-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170707022111.21836-1-rth@twiddle.net> References: <20170707022111.21836-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v2 08/27] linux-user/sh4: Notice gUSA regions during signal delivery X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bruno@clisp.org, laurent@vivier.eu, aurelien@aurel32.net, glaubitz@debian.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We translate gUSA regions atomically in a parallel context. But in a serial context a gUSA region may be interrupted. In that case, restart the region as the kernel would. Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- linux-user/signal.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/linux-user/signal.c b/linux-user/signal.c index 3d18d1b..a537778 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -3471,6 +3471,25 @@ static abi_ulong get_sigframe(struct target_sigactio= n *ka, return (sp - frame_size) & -8ul; } =20 +/* Notice when we're in the middle of a gUSA region and reset. + Note that this will only occur for !parallel_cpus, as we will + translate such sequences differently in a parallel context. */ +static void unwind_gusa(CPUSH4State *regs) +{ + /* If the stack pointer is sufficiently negative ... */ + if ((regs->gregs[15] & 0xc0000000u) =3D=3D 0xc0000000u + /* ... and we haven't completed the sequence ... */ + && regs->pc < regs->gregs[0]) { + /* Reset the PC to before the gUSA region, as computed from + R0 =3D region end, SP =3D -(region size), plus one more insn + that actually sets SP to the region size. */ + regs->pc =3D regs->gregs[0] + regs->gregs[15] - 2; + + /* Reset the SP to the saved version in R1. */ + regs->gregs[15] =3D regs->gregs[1]; + } +} + static void setup_sigcontext(struct target_sigcontext *sc, CPUSH4State *regs, unsigned long mask) { @@ -3534,6 +3553,8 @@ static void setup_frame(int sig, struct target_sigact= ion *ka, abi_ulong frame_addr; int i; =20 + unwind_gusa(regs); + frame_addr =3D get_sigframe(ka, regs->gregs[15], sizeof(*frame)); trace_user_setup_frame(regs, frame_addr); if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) { @@ -3583,6 +3604,8 @@ static void setup_rt_frame(int sig, struct target_sig= action *ka, abi_ulong frame_addr; int i; =20 + unwind_gusa(regs); + frame_addr =3D get_sigframe(ka, regs->gregs[15], sizeof(*frame)); trace_user_setup_rt_frame(regs, frame_addr); if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) { --=20 2.9.4