From nobody Mon Feb 9 08:11:37 2026 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 1500408483985663.6724726602813; Tue, 18 Jul 2017 13:08:03 -0700 (PDT) Received: from localhost ([::1]:58365 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXYmo-0001ft-LE for importer@patchew.org; Tue, 18 Jul 2017 16:08:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXYiq-0006DL-3F for qemu-devel@nongnu.org; Tue, 18 Jul 2017 16:03:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXYip-0004co-4n for qemu-devel@nongnu.org; Tue, 18 Jul 2017 16:03:56 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:35117) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dXYip-0004cg-0P for qemu-devel@nongnu.org; Tue, 18 Jul 2017 16:03:55 -0400 Received: by mail-qt0-x241.google.com with SMTP id p25so2578149qtp.2 for ; Tue, 18 Jul 2017 13:03:54 -0700 (PDT) Received: from bigtime.com ([101.165.234.197]) by smtp.gmail.com with ESMTPSA id b201sm2339817qkg.5.2017.07.18.13.03.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 13:03:53 -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=EOf/fwCupYi3hJGNXqUmf6Lhj++H4RsLxryj1RFkQbs=; b=c9HgksSrS5XOwynVOOmLSAozS+XtOCcgRdctU9dPmmQPlkeYeIYQxd8eSvswEqoZe1 BLPRdKMREiGD8fuSuv8DjbVG71riq/boswusRl4nKEmwUe5yrA95sgFHaFR9NyuStbre GALZVRz2p5yOjU16bcREBBM5UUsRgkHQxxDjpGgYslvJxpqrlq72NHDNwOKG/gupGZLk rvndSE+Buiv1F1ENP59AciwXAGaA/70bWnqAbVjXXn+fhCrRTRtby0XUnxrnpKjOzyNQ lQlujB1BwBxrDPuUpB4A5X8SGpDSaf84qKsFe1OX5fx+aPcRKfln/Hl+efhz76T3o85E RO0A== 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=EOf/fwCupYi3hJGNXqUmf6Lhj++H4RsLxryj1RFkQbs=; b=pa2Z3mwFA4lPbAjHH6XnhXzcxlYuaN/9p7ANAvQ6ji4eSc7dUe6h3k8Pe8MPMhQyJs 7BiHTGiz4bRcfKS+77iRX2L8m1QfVsDgRJHFKrWNlQWe3FmE6ZMXVY09CfqqFn10yjTH K2orSybQqZiDFHhThSgNniIvTjqH5p2EkhrZvxSmqVVYs0ujGqidMY/EoSw6T0+1D4m7 cWDAVcxv5ht24FjJ44oSOS4kFXUlhBS78Wl2okEZX3qX/gdogZkt0MYpzQ/EM+f3qJBy uuHSPdOeWXCMVblF5bogSFgOVCSzB3xDrqSFDbLA7f5Czx+WcTuzZGclDQEWaLG5Jpv6 VYXg== X-Gm-Message-State: AIVw112AsrYbrHbZCsZPFQaC5Oo/QLuqd1KrQvWZ/0Otq3r2VsYpDYAN 51AcsgoKg9fe/opmoDo= X-Received: by 10.200.9.93 with SMTP id z29mr4280680qth.102.1500408234075; Tue, 18 Jul 2017 13:03:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 18 Jul 2017 10:02:33 -1000 Message-Id: <20170718200255.31647-9-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170718200255.31647-1-rth@twiddle.net> References: <20170718200255.31647-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH v3 08/30] 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: aurelien@aurel32.net 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. Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- linux-user/signal.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/linux-user/signal.c b/linux-user/signal.c index ddfd75c..27867a4 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -3471,6 +3471,30 @@ 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, and we haven't + completed the sequence, then reset to the entry to the region. */ + /* ??? The SH4 kernel checks for and address above 0xC0000000. + However, the page mappings in qemu linux-user aren't as restricted + and we wind up with the normal stack mapped above 0xF0000000. + That said, there is no reason why the kernel should be allowing + a gUSA region that spans 1GB. Use a tighter check here, for what + can actually be enabled by the immediate move. */ + if (regs->gregs[15] >=3D -128u && 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 for the + insn that actually initializes 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 +3558,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)) { @@ -3584,6 +3610,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