From patchwork Wed Oct 4 21:19:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9985571 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 4573B60586 for ; Wed, 4 Oct 2017 21:23:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3681E28C2C for ; Wed, 4 Oct 2017 21:23:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2ADC028C2F; Wed, 4 Oct 2017 21:23:39 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_MED, 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 A13DF28C2C for ; Wed, 4 Oct 2017 21:23:38 +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 1dzr6R-0002zq-Oi; Wed, 04 Oct 2017 21:21:15 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzr6Q-0002xw-BC for xen-devel@lists.xenproject.org; Wed, 04 Oct 2017 21:21:14 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id 9E/6A-17770-9C055D95; Wed, 04 Oct 2017 21:21:13 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCIsWRWlGSWpSXmKPExsXiVRtsoLs34Gq kwZ5ePYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNWPByQnMBWe4K65MqWhgvMHZxcjFISQwnVFi ccs5ZhCHReAVi8TR452sII6EQD+rxJ4de4AcTiAnS6JryhMoO02i795dZgi7SmLrwvNsILaQg JLE1g1LmSHG/mWUOH5tPiNIgk1AS2JPw3wmkISIwCwRiVuve9hAHGaBM0wSx/tOgo0VFrCXaO +8BNbBIqAqsefIAxYQm1fAQqLp6zl2iHUmEg+PXAOr5xSwlDhy4g0zxGoLidYz95kmMAouYGR YxahRnFpUllqka2ykl1SUmZ5RkpuYmaNraGCml5taXJyYnpqTmFSsl5yfu4kRGHYMQLCD8fS6 wEOMkhxMSqK8m3yvRgrxJeWnVGYkFmfEF5XmpBYfYpTh4FCS4OUEhrGQYFFqempFWmYOMAJg0 hIcPEoivJP9gdK8xQWJucWZ6RCpU4zGHPv23PrDxNFx8+4fJiGWvPy8VClx3s0gpQIgpRmleX CDYJF5iVFWSpiXEeg0IZ6C1KLczBJU+VeM4hyMSsK8D0Cm8GTmlcDtewV0ChPQKXOaroCcUpK IkJJqYAz6uVw7T8FzwsTpzpfF973u+L6QuyCuYdMcy/6KT3dz1F888HmY5Xb73VQnCRaT9CXf LP2cHv5jkHvy5P6k2td5IZ51X43eKGbsfzr58AEfifiSrSWrHr16xVVsEJNkKKA+1aX7Q5DCb o6GuIlPl0TFce1d1fFJVi/30+rn02X838U/XMZ19LQSS3FGoqEWc1FxIgD86DKoxwIAAA== X-Env-Sender: thgarnie@google.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1507152060!76370791!1 X-Originating-IP: [74.125.83.48] 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 63029 invoked from network); 4 Oct 2017 21:21:01 -0000 Received: from mail-pg0-f48.google.com (HELO mail-pg0-f48.google.com) (74.125.83.48) by server-12.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 4 Oct 2017 21:21:01 -0000 Received: by mail-pg0-f48.google.com with SMTP id v13so7173601pgq.6 for ; Wed, 04 Oct 2017 14:21:01 -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=PCJKT4rjVH4EM4bq/0M1IWsxOAMYjKIEbfsGvIKF65M=; b=jlUNHGoM94FS6l6Y48w89nxNQg2adrhZU9qc3oE5+vWT+ZHFAknI4JpzpIVJ4MqpdA SBLcIfyN3M6pBoH3wdVyQ9xbbrfKsrmOJQFgjjnP1kyvCiQ+2iGfGh30SiNcQjC3gnQy dhdBMZM4S05Z3tHwcYyMc1VEG3iiq87Tjju3H6hl+lZXt0rMAVwniZh6dvCDCmOX9rdD KqG2wT3vW/i3h6WuOYNfxrSoWlTDU17CdoJEL85uY0JXLVilbWftHhyXvFggg8UMIcEB SBoLmXvFuUnjkNqXvHfgKAVLDoE8vLTkOFj7BBR9MaW44s2GjX7cvJPd9OQa7qt0Hl2z aANA== 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=PCJKT4rjVH4EM4bq/0M1IWsxOAMYjKIEbfsGvIKF65M=; b=kO/AQ0L+Ebt9EpYSAEiytFLlIK4kwwo7fVUA6/gfA41dXbDUkHgtnqD6ooc8RcQCqv pxocf2uB3yCdz0LL3m4AGso0BAGPfmavUsFvl3traU1fgfqXLVuAFLUigBmYR48GW63R L4x0KkrcEAoyHQa3cdOZpBmsaKWnb7WWj4MdEVqNEEhN8Q0OJ5BoeVGFCzdpiFlUwG4H gUfC8L9luLEWr4HSf7W96KaoqJDOJEBqfanttCUihvg7+lvt2vMxaU2Euiidk2D1Ti0k bNjpTajY+pksjWFEbLhkUUFrJsjoHqjsUklfgfJroHzx5+1afk8nR5vy36vbGIkAvEGr W/kw== X-Gm-Message-State: AHPjjUjAMpRlQUA6SD4fcRrpmZPpZ1tv3F//HNZppE01ciPeBfCoMjj4 T7+5vDXm7fGec5sXnnIVbfb9UQ== X-Google-Smtp-Source: AOwi7QAJAjcfTPDKhKVF7kIRCcl7mMqH0oPakFtaP4kyHPsJIMmhRJ2E7ApNNmQJtub8F4uv5Rrx+g== X-Received: by 10.98.112.68 with SMTP id l65mr21366539pfc.292.1507152059556; Wed, 04 Oct 2017 14:20:59 -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.20.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Oct 2017 14:20:58 -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:44 -0700 Message-Id: <20171004212003.28296-9-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 08/27] x86/CPU: 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. Use the new _ASM_GET_PTR macro instead of the 'mov $symbol, %dst' construct to not have an absolute reference. 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/include/asm/processor.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index b446c5a082ad..b09bd50b06c7 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -49,7 +49,7 @@ static inline void *current_text_addr(void) { void *pc; - asm volatile("mov $1f, %0; 1:":"=r" (pc)); + asm volatile(_ASM_GET_PTR(1f, %0) "; 1:":"=r" (pc)); return pc; } @@ -695,6 +695,7 @@ static inline void sync_core(void) : ASM_CALL_CONSTRAINT : : "memory"); #else unsigned int tmp; + unsigned long tmp2; asm volatile ( UNWIND_HINT_SAVE @@ -705,11 +706,13 @@ static inline void sync_core(void) "pushfq\n\t" "mov %%cs, %0\n\t" "pushq %q0\n\t" - "pushq $1f\n\t" + "leaq 1f(%%rip), %1\n\t" + "pushq %1\n\t" "iretq\n\t" UNWIND_HINT_RESTORE "1:" - : "=&r" (tmp), ASM_CALL_CONSTRAINT : : "cc", "memory"); + : "=&r" (tmp), "=&r" (tmp2), ASM_CALL_CONSTRAINT + : : "cc", "memory"); #endif }