From patchwork Wed Oct 4 21:19:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9985567 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2CBD460586 for ; Wed, 4 Oct 2017 21:23:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1DD7928C2C for ; Wed, 4 Oct 2017 21:23:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 117B228C2F; Wed, 4 Oct 2017 21:23:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A942328C2C for ; Wed, 4 Oct 2017 21:23:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzr6L-0002rS-LF; Wed, 04 Oct 2017 21:21:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzr6K-0002qY-Tn for xen-devel@lists.xenproject.org; Wed, 04 Oct 2017 21:21:09 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 5E/12-02223-4C055D95; Wed, 04 Oct 2017 21:21:08 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIIsWRWlGSWpSXmKPExsXiVRtsrHs44Gq kwcOTPBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8brG81MBa85Khr/vGVsYDzN3sXIySEkMJ1R Yvs/kS5GLg4WgVcsEuenTmYBcSQE+lklXv7ewQRSJSGQJXHu4RFWCDtN4vLf+ewQdpXEnj0P2 SAmKUls3bCUGcL+yyjReKwQxGYT0JLY0zCfCWSoiMAsEYlbr3vYQBxmgTNMEsf7ToJNFRZwkT g6axLYVBYBVYmmc+eBijg4eAUsJfZM14ZYZiLx8Mg1sHJOoPCRE2+glllItJ65zzSBUXABI8M qRvXi1KKy1CJdQ72kosz0jJLcxMwcXUMDU73c1OLixPTUnMSkYr3k/NxNjMCAq2dgYNzB2NTr fIhRkoNJSZR3k+/VSCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvBH+QDnBotT01Iq0zBxg6MOkJ Th4lER4J4OkeYsLEnOLM9MhUqcYjTn27bn1h4mj4+bdP0xCLHn5ealS4rybQUoFQEozSvPgBs Fi8hKjrJQwLyMDA4MQT0FqUW5mCar8K0ZxDkYlYd48kCk8mXklcPteAZ3CBHTKnKYrIKeUJCK kpBoY4ytM16Z0vj74Xu/BBaNqgclr9/Z5OTDyia3YxOi8TcS9dt9s3rwHC36V/uxfMZ1X0ivO 8LpgjdeGoJmh3/kXynNfCy7cbpP1dc3GnbXO91m8BSW6fdx+PFx9a8qVORvfqElrf507rc3uX /Eqoa0lHYYrfe90Jb6eUrjT7GPDDJuT1RyX30+6o8RSnJFoqMVcVJwIAC+2hm/EAgAA X-Env-Sender: thgarnie@google.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1507152066!94009433!1 X-Originating-IP: [74.125.83.51] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59998 invoked from network); 4 Oct 2017 21:21:07 -0000 Received: from mail-pg0-f51.google.com (HELO mail-pg0-f51.google.com) (74.125.83.51) by server-2.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 4 Oct 2017 21:21:07 -0000 Received: by mail-pg0-f51.google.com with SMTP id r25so4783017pgn.4 for ; Wed, 04 Oct 2017 14:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KBZP7LTWcU8ejWHR5l3w5i+YVxGEs1JlrpLsHdxiGuM=; b=kJ6t5D+YogragdLpPtigGhYGpA1izYO3Fw09y8f76Jfu2o8uPhiXIAJ4rMv+f/ifHU 0JoCa8xllMGUsR7O4zY3B2z6nr7Th9j0lwUPcRhSCfFVR8cW5UGYTbRxN9knBuxJWYhc YtZvF1Eeu2EJ0ywYTKCH0QcJhFGT1jmoJ+OYzEwjHGfxIU0d4aiHdcfnUYwvq+NQXX57 31nqRCp+eunr2jGU2f9qHSAF8FV5biQS8JLQWlKj6q17cExfXR3TMu8d5ckPtcv4VT97 +ss9GsBcNeOt19wtTitb2fRWGWXCqc+/3OAD/ZPG/OIoDRmEmuuQb8dpkplaW+udSykp gB3Q== 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; bh=KBZP7LTWcU8ejWHR5l3w5i+YVxGEs1JlrpLsHdxiGuM=; b=VuToIbT5514QtPyLLL8vJurRXs2iuMNTC/ZrBU+6Tu21WXGkLNNDUp6kmQeZ18fzgt Hx38vA/8A0JuQFT2dSpIpdRNGTianN0wnbFIz0HyjqhB5YNWGJ6S9sXsoUuNf1JUq59m 7qN0QMKDx//IP86vP4TueRGo/fv59XdBOG/yuRgJ4NaK8mAA8rIxQtHg1zvVdGpEaOiO ZWcRila7p3C4ypuf9hSl1sraVUYxjACfD18GB++BiYEmN5WEiM+4cN2kq2uh6Lwc0yqg AvThlfDfxubxRWl9hglYfaUqTmCPpmDtR6lBuyY+wLkQ2uDlm1AyMwEMvxKfRC6Pa40I /4TA== X-Gm-Message-State: AHPjjUiJap30LFqraVjrmJHfvpXENvSF/cDWbvaqMPaBIfH6rklUVzAK 5N93CXbH7eaeYXD2usNNvNfIZQ== X-Google-Smtp-Source: AOwi7QAa81pekSpsub2Y4HSFpcusSa6p/CcIEbX5vl0ziottP7rH534PjA2XzBUYa0hWefQtYNDmBw== X-Received: by 10.159.198.73 with SMTP id y9mr21292843plt.370.1507152065125; Wed, 04 Oct 2017 14:21:05 -0700 (PDT) Received: from skynet.sea.corp.google.com ([172.31.92.33]) by smtp.gmail.com with ESMTPSA id s68sm30204019pfd.72.2017.10.04.14.21.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Oct 2017 14:21:04 -0700 (PDT) From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Thomas Garnier , Arnd Bergmann , Kees Cook , Matthias Kaehlcke , Tom Lendacky , Andy Lutomirski , "Kirill A . Shutemov" , Borislav Petkov , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Juergen Gross , Chris Wright , Alok Kataria , Rusty Russell , Tejun Heo , Christoph Lameter , Boris Ostrovsky , Alexey Dobriyan , Andrew Morton , Paul Gortmaker , Chris Metcalf , "Paul E . McKenney" , Nicolas Pitre , Borislav Petkov , "Luis R . Rodriguez" , Greg Kroah-Hartman , Christopher Li , Steven Rostedt , Jason Baron , Dou Liyang , "Rafael J . Wysocki" , Mika Westerberg , Lukas Wunner , Masahiro Yamada , Alexei Starovoitov , Daniel Borkmann , Markus Trippelsdorf , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Joerg Roedel , Rik van Riel , David Howells , Ard Biesheuvel , Waiman Long , Kyle Huey , Andrey Ryabinin , Jonathan Corbet , Matthew Wilcox , Michal Hocko , Peter Foley , Paul Bolle , Jiri Kosina , Rob Landley , "H . J . Lu" , Baoquan He , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= , Daniel Micay Date: Wed, 4 Oct 2017 14:19:47 -0700 Message-Id: <20171004212003.28296-12-thgarnie@google.com> X-Mailer: git-send-email 2.14.2.920.gcf0c67979c-goog In-Reply-To: <20171004212003.28296-1-thgarnie@google.com> References: <20171004212003.28296-1-thgarnie@google.com> Cc: linux-arch@vger.kernel.org, kvm@vger.kernel.org, linux-pm@vger.kernel.org, x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-sparse@vger.kernel.org, linux-crypto@vger.kernel.org, kernel-hardening@lists.openwall.com, xen-devel@lists.xenproject.org Subject: [Xen-devel] [RFC v3 11/27] x86/power/64: Adapt assembly for PIE support X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Change the assembly code to use only relative references of symbols for the kernel to be PIE compatible. Position Independent Executable (PIE) support will allow to extended the KASLR randomization range below the -2G memory limit. Signed-off-by: Thomas Garnier --- arch/x86/power/hibernate_asm_64.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/power/hibernate_asm_64.S b/arch/x86/power/hibernate_asm_64.S index ce8da3a0412c..6fdd7bbc3c33 100644 --- a/arch/x86/power/hibernate_asm_64.S +++ b/arch/x86/power/hibernate_asm_64.S @@ -24,7 +24,7 @@ #include ENTRY(swsusp_arch_suspend) - movq $saved_context, %rax + leaq saved_context(%rip), %rax movq %rsp, pt_regs_sp(%rax) movq %rbp, pt_regs_bp(%rax) movq %rsi, pt_regs_si(%rax) @@ -115,7 +115,7 @@ ENTRY(restore_registers) movq %rax, %cr4; # turn PGE back on /* We don't restore %rax, it must be 0 anyway */ - movq $saved_context, %rax + leaq saved_context(%rip), %rax movq pt_regs_sp(%rax), %rsp movq pt_regs_bp(%rax), %rbp movq pt_regs_si(%rax), %rsi