From patchwork Wed Oct 11 20:30:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 10000577 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 E39F36037F for ; Wed, 11 Oct 2017 20:33:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D89A828B66 for ; Wed, 11 Oct 2017 20:33:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC82E28B6D; Wed, 11 Oct 2017 20:33:42 +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 7DE9C28B66 for ; Wed, 11 Oct 2017 20:33:42 +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 1e2Nf4-0000Ut-Hj; Wed, 11 Oct 2017 20:31:26 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2Nf2-0000SG-TU for xen-devel@lists.xenproject.org; Wed, 11 Oct 2017 20:31:25 +0000 Received: from [85.158.143.35] by server-6.bemta-6.messagelabs.com id 7E/21-08608-C9F7ED95; Wed, 11 Oct 2017 20:31:24 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrFIsWRWlGSWpSXmKPExsVyMfTANt3Z9fc iDSZvFbP4vmUykwOjx+EPV1gCGKNYM/OS8isSWDM2NCxjKnjPUbHt1CaWBsbz7F2MnBxCAtMZ JR7tMeli5OJgEXjFIjFnwwFWEEdCoJ9V4mv7NRaQKgmBLImn61uZIOw0iWn/rkPZVRKbd/axQ kxSkti6YSkzSLOQwD9Gid6nT8Ga2QS0JPY0zGcCSYgInBCW2PThNyOIwyxwhknieN9JsHZhAT eJ83smg9ksAqoSM0+eYASxeQUsJT7NPcgOsc5C4tixw2BTOYHi3zceYoZYbSGxctZ51gmMggs YGVYxahSnFpWlFukaG+klFWWmZ5TkJmbm6BoamOnlphYXJ6an5iQmFesl5+duYgSGHQMQ7GA8 vS7wEKMkB5OSKO/DmHuRQnxJ+SmVGYnFGfFFpTmpxYcYZTg4lCR4p9cB5QSLUtNTK9Iyc4ARA JOW4OBREuFtAknzFhck5hZnpkOkTjFacly4c+kPE8eBPbeAZMfNu3+YhFjy8vNSpcR5S0EaBE AaMkrz4MbBovQSo6yUMC8j0IFCPAWpRbmZJajyrxjFORiVhHmDQKbwZOaVwG19BXQQE9BBoml 3QA4qSURISTUwbvuZueXjJ4YDpyR+LEk97i8SEpFkevoG2y/nR/YpVVxbpKaecWi333D+T9FH hq/NKuxyb+3Cavq79G6l5/c9neNps+XDiXsSwhqL2y+KFji/n8wadWjO1HJdPqlrzVUTehgep LEtdlZ0LeQsU97F/E/SRpMl4Om+F3u2Mh64qprhcFhW82SjEktxRqKhFnNRcSIA1FASzM0CAA A= X-Env-Sender: thgarnie@google.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1507753882!76621274!1 X-Originating-IP: [209.85.192.182] 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 6082 invoked from network); 11 Oct 2017 20:31:23 -0000 Received: from mail-pf0-f182.google.com (HELO mail-pf0-f182.google.com) (209.85.192.182) by server-9.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 11 Oct 2017 20:31:23 -0000 Received: by mail-pf0-f182.google.com with SMTP id x7so1962798pfa.1 for ; Wed, 11 Oct 2017 13:31:23 -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=Bo3aNDBgnk04z3nV6e5Ky0HEgkmxnF72cRiokGUfGBI=; b=WDGwex2r866nw6HBND8UFE28IQ4wtfBfoR7QnC0Z2xeSHJAZvkzR9DXiYycx4JcPgk h8cdpeDSajRHQBjAtaUQRXBifVN5HbJJQrTA44ygztsPZMhHSBFbVWYRV8vw8Qo8CBvP PQZFJnM0PHuvmmExL+MhHZh/PbVh1qQDuixZJk4i9TxbgoIHsPMtZHbvkr9o3oRjbPFY K8h/lrAY3YnyZTkZInofL1pmCXNGd/y6/SEvzChOC5QVSPL+CwqWgoPBAR9fZ9tBZV4e uqsqqY9e+y1A7n8zf8+YFYwdzfiga/k2k62d8i88aWfzb+YdakNu3isKulUz86g+oBaK zo1g== 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=Bo3aNDBgnk04z3nV6e5Ky0HEgkmxnF72cRiokGUfGBI=; b=kUOgeqyEInba+vSbzhBE/fxK8N8Z6sQBUWwxxYBptiIhuIhnD5koGnC/r1vf9QEia1 wEqnvYg4lIsXU/mZHRdBT/OFYssXuexPJxqZRl0Cvf2NzhaUxGFT18O8c5Dq4oI/eUqP KbNsVP44k/zNAaLCeD3EuHSeHeCz0VAgmqbA0QrUl6AhaLwFca3Xvxp6xdHDG1ZpVbC+ cWmk6egYz6LE6WZ5Umjh9KhEocSSDZVzCJ4MWILupuiSek7X+fs3r2bUyrJ8o5kyMg/I 14dLyN1b5Lkgj0mHVprEZlGUt2kwkTVLltTZu5nx0LaxQnuIxLOO5YugKtXpyazJAPQ9 InnQ== X-Gm-Message-State: AMCzsaV64wUB2ogFqCVT15sIopAlKKFzElA0DmJrrdzsNgbBgOlI8DwV qxD1xgnPEKKCy4QDEoskyLvEHw== X-Google-Smtp-Source: AOwi7QDVCIU64We+UPWOOvxyzy2EOPN/YrPANjeh3uUrQm47bu1QZFtp3eC0YUVmdZeV000IFdwirg== X-Received: by 10.159.234.10 with SMTP id be10mr184280plb.386.1507753881073; Wed, 11 Oct 2017 13:31:21 -0700 (PDT) Received: from skynet.sea.corp.google.com ([172.31.92.33]) by smtp.gmail.com with ESMTPSA id n12sm20691913pfb.149.2017.10.11.13.31.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Oct 2017 13:31:20 -0700 (PDT) From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Arnd Bergmann , Thomas Garnier , Kees Cook , Andrey Ryabinin , 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 , Paul Gortmaker , Andrew Morton , Alexey Dobriyan , "Paul E . McKenney" , Nicolas Pitre , Borislav Petkov , "Luis R . Rodriguez" , Greg Kroah-Hartman , Christopher Li , Steven Rostedt , Jason Baron , Mika Westerberg , Dou Liyang , "Rafael J . Wysocki" , 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 , Jonathan Corbet , Michal Hocko , Peter Foley , Paul Bolle , Jiri Kosina , "H . J . Lu" , Rob Landley , Baoquan He , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= , Daniel Micay Date: Wed, 11 Oct 2017 13:30:11 -0700 Message-Id: <20171011203027.11248-12-thgarnie@google.com> X-Mailer: git-send-email 2.15.0.rc0.271.g36b669edcc-goog In-Reply-To: <20171011203027.11248-1-thgarnie@google.com> References: <20171011203027.11248-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] [PATCH v1 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