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>,
"Raf
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: [PATCH v2 08/27] x86/CPU: Adapt assembly for PIE support
Date: Tue, 13 Mar 2018 13:59:26 -0700 [thread overview]
Message-ID: <20180313205945.245105-9-thgarnie@google.com> (raw)
In-Reply-To: <20180313205945.245105-1-thgarnie@google.com>
Change the assembly code to use only relative references of symbols for the
kernel to be PIE compatible. Use the new _ASM_MOVABS macro instead of
the 'mov $symbol, %dst' construct.
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/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 b0ccd4847a58..1b9488b1018a 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -50,7 +50,7 @@ static inline void *current_text_addr(void)
{
void *pc;
- asm volatile("mov $1f, %0; 1:":"=r" (pc));
+ asm volatile(_ASM_MOVABS " $1f, %0; 1:":"=r" (pc));
return pc;
}
@@ -710,6 +710,7 @@ static inline void sync_core(void)
: ASM_CALL_CONSTRAINT : : "memory");
#else
unsigned int tmp;
+ unsigned long tmp2;
asm volatile (
UNWIND_HINT_SAVE
@@ -720,11 +721,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
}
--
2.16.2.660.g709887971b-goog
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
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 via Virtualization
2018-03-13 20:59 ` [PATCH v2 01/27] x86/crypto: Adapt assembly for PIE support Thomas Garnier via Virtualization
2018-03-13 20:59 ` [PATCH v2 02/27] x86: Use symbol name on bug table " Thomas Garnier via Virtualization
2018-03-13 20:59 ` [PATCH v2 03/27] x86: Use symbol name in jump " Thomas Garnier via Virtualization
2018-03-13 20:59 ` [PATCH v2 04/27] x86: Add macro to get symbol address " Thomas Garnier via Virtualization
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 via Virtualization
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 ` Thomas Garnier [this message]
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-9-thgarnie@google.com \
--to=thgarnie@google.com \
--cc=acme@redhat.com \
--cc=arnd@arndb.de \
--cc=aryabinin@virtuozzo.com \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=hpa@zytor.com \
--cc=jpoimboe@redhat.com \
--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=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=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=mka@chromium.org \
--cc=peterz@infradead.org \
--cc=pombredanne@nexb.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/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