From nobody Tue Feb 10 00:24:59 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; 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 1520965928945901.5622092733889; Tue, 13 Mar 2018 11:32:08 -0700 (PDT) Received: from localhost ([::1]:41926 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evoiS-0000LW-4n for importer@patchew.org; Tue, 13 Mar 2018 14:32:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnog-000067-Cm for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnof-0007xy-En for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:26 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:40407) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnof-0007wI-2b for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:25 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MdH3n-1fEIAT2Xml-00IVj9; Tue, 13 Mar 2018 18:34:10 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:54 +0100 Message-Id: <20180313173355.4468-18-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:hUCy0isYeDj/qL8uQWJYcY2SsQhdyIZjLnqsAXXWJrOswlDje7I eymfToWmGYgWkoSvfiu/Gc37APBEG/i+8Sj2VnmBezd7A8PEy2enMdv2Q+0W0XD2R0dtkOp lEMJK6RW6kmECiuEknPPHsdEeoTeJKCOTpmGwbVVEdP3IejWMHh0o+DuaxjZc19p3NVAYmj aF/PrWZO3zsI8sO1py0Og== X-UI-Out-Filterresults: notjunk:1;V01:K0:4rKv/V32W5Q=:3hzU8u6oobbuqi9piG3O1k yvu3Tj4d72tCbBoYDNF3hOHISiqfAY+OiMvVfhcjHcZHHOkSbwHNEEcV8pdrazpRUmsAXDlHH N8lGCEerfmvxhF08Sa9NW3KKDIWBgeSO1HvOdYZFRoZZc272gLQMRCS0D2yEodmbXBeH9i7SG fEyCnRjGYPnLLh0e+tipTDj8rsTISQzOjrxH1XazUzbUZ4NxAJ4nvBSJ4RDRXTyg1BdLOCiF2 gB5t6cCSL7L9Kayk5sYvXG6vf2qQz44Pjp6ie57224xgjsP0TqhI+LVE3+Lxgf+cF527RMjtS CwOSX5C8OKfhYBIG7tcQsCI8mocyt2DAgvEfopsItF61fsgGepYlL19LUpM4KOGHcPTrWqpl8 pSbcmxC5oQ54jYN7BDQJ7BrU4yVBslW1Wlzvxj1HlSm6RZdmBNHNBA/xAQpZeGRcweu7tVLqA ddPbsO73LI3i5eNj72/Cr8enwi57/TNJQeHla17IjUSU5+9j2eF3DV5gI0pnZ0RmAZUT4glmG eGvgFQe3bpfrUaAmBYQt72wXfjNuryBpr0dibONmyLMOpbjaRw4bXbf/Ey+atCayD47PPWQeN xMBZXpeANk8UvpffNhQ+W12aW7yRd5dKBl2ibsDn2Bd7CA4jQuXm/siAqcZGpV+64z/QTQP7X 8Xy2mzVEI5yn+MrTE/QOyEmskgNkZ3pDE4cACuyNGz4FVizOlIOotf4JJL+7qkMK4r+GQpowT J/2q0taKwZnPjwLo20aFqC5CIZJ+hcnHFnd9IQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PULL 17/18] linux-user: init_guest_space: Don't try to align if we'll reject it 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: Luke Shumaker , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Luke Shumaker If the ensure-alignment code gets triggered, then the "if (host_start && real_start !=3D current_start)" check will always trigge= r, so save 2 syscalls and put that check first. Note that we can't just switch to using MAP_FIXED for that check, because then we couldn't differentiate between a failure because "there isn't enough space" and "there isn't enough space *here*". Signed-off-by: Luke Shumaker Message-Id: <20171228180814.9749-9-lukeshu@lukeshu.com> Reviewed-by: Peter Maydell Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index c6491a8d35..5c64299961 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1845,6 +1845,11 @@ unsigned long init_guest_space(unsigned long host_st= art, return (unsigned long)-1; } =20 + /* Check to see if the address is valid. */ + if (host_start && real_start !=3D current_start) { + goto try_again; + } + /* Ensure the address is properly aligned. */ if (real_start & ~qemu_host_page_mask) { /* Ideally, we adjust like @@ -1879,11 +1884,6 @@ unsigned long init_guest_space(unsigned long host_st= art, aligned_start =3D real_start; } =20 - /* Check to see if the address is valid. */ - if (host_start && aligned_start !=3D current_start) { - goto try_again; - } - #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) /* On 32-bit ARM, we need to also be able to map the commpage. */ int valid =3D init_guest_commpage(aligned_start - guest_start, --=20 2.14.3