From: Thomas Garnier <thgarnie@google.com>
To: "Herbert Xu" <herbert@gondor.apana.org.au>,
"David S . Miller" <davem@davemloft.net>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"H . Peter Anvin" <hpa@zytor.com>,
"Peter Zijlstra" <peterz@infradead.org>,
"Josh Poimboeuf" <jpoimboe@redhat.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Kate Stewart" <kstewart@linuxfoundation.org>,
"Thomas Garnier" <thgarnie@google.com>,
"Arnd Bergmann" <arnd@arndb.de>,
"Philippe Ombredanne" <pombredanne@nexb.com>,
"Arnaldo Carvalho de Melo" <acme@redhat.com>,
"Andrey Ryabinin" <aryabinin@virtuozzo.com>,
"Matthias Kaehlcke" <mka@chromium.org>,
"Kees Cook" <keescook@chromium.org>,
"Tom Lendacky" <thomas.lendacky@amd.com>,
"Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>,
"Andy Lutomirski" <luto@kernel.org>,
"Dominik Brodowski" <linux@dominikbrodowski.net>,
"Borislav Petkov" <bp@alien8.de>, "Borislav Petkov" <bp@suse.de>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
"Len Brown" <len.brown@intel.com>, "Pavel Machek" <pavel@ucw.cz>,
"Juergen Gross" <jgross@suse.com>,
"Alok Kataria" <akataria@vmware.com>,
"Steven Rostedt" <rostedt@goodmis.org>,
"Tejun Heo" <tj@kernel.org>, "Christoph Lameter" <cl@linux.com>,
"Dennis Zhou" <dennisszhou@gmail.com>,
"Boris Ostrovsky" <boris.ostrovsky@oracle.com>,
"David Woodhouse" <dwmw@amazon.co.uk>,
"Alexey Dobriyan" <adobriyan@gmail.com>,
"Paul E . McKenney" <paulmck@linux.vnet.ibm.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Nicolas Pitre" <nicolas.pitre@linaro.org>,
"Randy Dunlap" <rdunlap@infradead.org>,
"Luis R . Rodriguez" <mcgrof@kernel.org>,
"Christopher Li" <sparse@chrisli.org>,
"Jason Baron" <jbaron@akamai.com>,
"Ashish Kalra" <ashish@bluestacks.com>,
"Kyle McMartin" <kyle@redhat.com>,
"Dou Liyang" <douly.fnst@cn.fujitsu.com>,
"Lukas Wunner" <lukas@wunner.de>,
"Petr Mladek" <pmladek@suse.com>,
"Sergey Senozhatsky" <sergey.senozhatsky.work@gmail.com>,
"Masahiro Yamada" <yamada.masahiro@socionext.com>,
"Ingo Molnar" <mingo@kernel.org>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Cao jin" <caoj.fnst@cn.fujitsu.com>,
"H . J . Lu" <hjl.tools@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Joerg Roedel" <joro@8bytes.org>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
"Rik van Riel" <riel@redhat.com>,
"Jia Zhang" <qianyue.zj@alibaba-inc.com>,
"Jiri Slaby" <jslaby@suse.cz>, "Kyle Huey" <me@kylehuey.com>,
"Jonathan Corbet" <corbet@lwn.net>,
"Matthew Wilcox" <mawilcox@microsoft.com>,
"Michal Hocko" <mhocko@suse.com>, "Rob Landley" <rob@landley.net>,
"Baoquan He" <bhe@redhat.com>,
"Daniel Micay" <danielmicay@gmail.com>,
"Jan H . Schönherr" <jschoenh@amazon.de>
Cc: x86@kernel.org, linux-crypto@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
virtualization@lists.linux-foundation.org,
xen-devel@lists.xenproject.org, linux-arch@vger.kernel.org,
linux-sparse@vger.kernel.org, kvm@vger.kernel.org,
linux-doc@vger.kernel.org, kernel-hardening@lists.openwall.com
Subject: [PATCH v2 03/27] x86: Use symbol name in jump table for PIE support
Date: Tue, 13 Mar 2018 13:59:21 -0700 [thread overview]
Message-ID: <20180313205945.245105-4-thgarnie@google.com> (raw)
In-Reply-To: <20180313205945.245105-1-thgarnie@google.com>
Replace the %c constraint with %P. The %c is incompatible with PIE
because it implies an immediate value whereas %P reference a symbol.
Position Independent Executable (PIE) support will allow to extended the
KASLR randomization range below the -2G memory limit.
Signed-off-by: Thomas Garnier <thgarnie@google.com>
---
arch/x86/include/asm/jump_label.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h
index 8c0de4282659..dfdcdc39604a 100644
--- a/arch/x86/include/asm/jump_label.h
+++ b/arch/x86/include/asm/jump_label.h
@@ -37,9 +37,9 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran
".byte " __stringify(STATIC_KEY_INIT_NOP) "\n\t"
".pushsection __jump_table, \"aw\" \n\t"
_ASM_ALIGN "\n\t"
- _ASM_PTR "1b, %l[l_yes], %c0 + %c1 \n\t"
+ _ASM_PTR "1b, %l[l_yes], %P0 \n\t"
".popsection \n\t"
- : : "i" (key), "i" (branch) : : l_yes);
+ : : "X" (&((char *)key)[branch]) : : l_yes);
return false;
l_yes:
@@ -53,9 +53,9 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool
"2:\n\t"
".pushsection __jump_table, \"aw\" \n\t"
_ASM_ALIGN "\n\t"
- _ASM_PTR "1b, %l[l_yes], %c0 + %c1 \n\t"
+ _ASM_PTR "1b, %l[l_yes], %P0 \n\t"
".popsection \n\t"
- : : "i" (key), "i" (branch) : : l_yes);
+ : : "X" (&((char *)key)[branch]) : : l_yes);
return false;
l_yes:
--
2.16.2.660.g709887971b-goog
next prev parent reply other threads:[~2018-03-13 20:59 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-13 20:59 [PATCH v2 00/27] x86: PIE support and option to extend KASLR randomization Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 01/27] x86/crypto: Adapt assembly for PIE support Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 02/27] x86: Use symbol name on bug table " Thomas Garnier
2018-03-13 20:59 ` Thomas Garnier [this message]
2018-03-13 20:59 ` [PATCH v2 04/27] x86: Add macro to get symbol address " Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 05/27] x86: relocate_kernel - Adapt assembly " Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 06/27] x86/entry/64: " Thomas Garnier
2018-03-14 10:29 ` Peter Zijlstra
2018-03-14 15:54 ` Christopher Lameter
2018-03-14 17:09 ` Thomas Garnier
2018-03-15 10:18 ` Paolo Bonzini
2018-03-13 20:59 ` [PATCH v2 07/27] x86: pm-trace - " Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 08/27] x86/CPU: " Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 09/27] x86/acpi: " Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 10/27] x86/boot/64: " Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 11/27] x86/power/64: " Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 12/27] x86/paravirt: " Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 13/27] x86/boot/64: Build head64.c as mcmodel large when PIE is enabled Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 14/27] x86/percpu: Adapt percpu for PIE support Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 15/27] compiler: Option to default to hidden symbols Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 16/27] compiler: Option to add PROVIDE_HIDDEN replacement for weak symbols Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 17/27] x86/relocs: Handle PIE relocations Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 18/27] xen: Adapt assembly for PIE support Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 19/27] kvm: " Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 20/27] x86: Support global stack cookie Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 21/27] x86/ftrace: Adapt function tracing for PIE support Thomas Garnier
2018-03-14 10:35 ` Peter Zijlstra
2018-03-13 20:59 ` [PATCH v2 22/27] x86/modules: Add option to start module section after kernel Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 23/27] x86/modules: Adapt module loading for PIE support Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 24/27] x86/mm: Make the x86 GOT read-only Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 25/27] x86/pie: Add option to build the kernel as PIE Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 26/27] x86/relocs: Add option to generate 64-bit relocations Thomas Garnier
2018-03-13 20:59 ` [PATCH v2 27/27] x86/kaslr: Add option to extend KASLR range from 1GB to 3GB Thomas Garnier
2018-03-15 8:48 ` [PATCH v2 00/27] x86: PIE support and option to extend KASLR randomization Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180313205945.245105-4-thgarnie@google.com \
--to=thgarnie@google.com \
--cc=acme@redhat.com \
--cc=adobriyan@gmail.com \
--cc=akataria@vmware.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=aryabinin@virtuozzo.com \
--cc=ashish@bluestacks.com \
--cc=bhe@redhat.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=caoj.fnst@cn.fujitsu.com \
--cc=cl@linux.com \
--cc=corbet@lwn.net \
--cc=danielmicay@gmail.com \
--cc=dave.hansen@linux.intel.com \
--cc=davem@davemloft.net \
--cc=dennisszhou@gmail.com \
--cc=douly.fnst@cn.fujitsu.com \
--cc=dwmw@amazon.co.uk \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=hjl.tools@gmail.com \
--cc=hpa@zytor.com \
--cc=jbaron@akamai.com \
--cc=jgross@suse.com \
--cc=joro@8bytes.org \
--cc=jpoimboe@redhat.com \
--cc=jschoenh@amazon.de \
--cc=jslaby@suse.cz \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=kstewart@linuxfoundation.org \
--cc=kvm@vger.kernel.org \
--cc=kyle@redhat.com \
--cc=len.brown@intel.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-sparse@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
--cc=lukas@wunner.de \
--cc=luto@kernel.org \
--cc=mawilcox@microsoft.com \
--cc=mcgrof@kernel.org \
--cc=me@kylehuey.com \
--cc=mhocko@suse.com \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=mka@chromium.org \
--cc=nicolas.pitre@linaro.org \
--cc=npiggin@gmail.com \
--cc=paulmck@linux.vnet.ibm.com \
--cc=pavel@ucw.cz \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=pombredanne@nexb.com \
--cc=qianyue.zj@alibaba-inc.com \
--cc=rdunlap@infradead.org \
--cc=riel@redhat.com \
--cc=rjw@rjwysocki.net \
--cc=rkrcmar@redhat.com \
--cc=rob@landley.net \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky.work@gmail.com \
--cc=sparse@chrisli.org \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=tj@kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).