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 22/27] x86/modules: Add option to start module section after kernel
Date: Tue, 13 Mar 2018 13:59:40 -0700 [thread overview]
Message-ID: <20180313205945.245105-23-thgarnie@google.com> (raw)
In-Reply-To: <20180313205945.245105-1-thgarnie@google.com>
Add an option so the module section is just after the mapped kernel. It
will ensure position independent modules are always at the right
distance from the kernel and do not require mcmodule=large. It also
optimize the available size for modules by getting rid of the empty
space on kernel randomization range.
Signed-off-by: Thomas Garnier <thgarnie@google.com>
---
Documentation/x86/x86_64/mm.txt | 3 +++
arch/x86/Kconfig | 4 ++++
arch/x86/include/asm/pgtable_64_types.h | 6 ++++++
arch/x86/kernel/head64.c | 5 ++++-
arch/x86/mm/dump_pagetables.c | 3 ++-
5 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/Documentation/x86/x86_64/mm.txt b/Documentation/x86/x86_64/mm.txt
index ea91cb61a602..ec1dfe4c3cfe 100644
--- a/Documentation/x86/x86_64/mm.txt
+++ b/Documentation/x86/x86_64/mm.txt
@@ -77,3 +77,6 @@ Their order is preserved but their base will be offset early at boot time.
Be very careful vs. KASLR when changing anything here. The KASLR address
range must not overlap with anything except the KASAN shadow area, which is
correct as KASAN disables KASLR.
+
+If CONFIG_DYNAMIC_MODULE_BASE is enabled, the module section follows the end of
+the mapped kernel.
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0cb1ae187c3e..df4134fd3247 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2236,6 +2236,10 @@ config RANDOMIZE_MEMORY_PHYSICAL_PADDING
If unsure, leave at the default value.
+# Module section starts just after the end of the kernel module
+config DYNAMIC_MODULE_BASE
+ bool
+
config X86_GLOBAL_STACKPROTECTOR
bool "Stack cookie using a global variable"
depends on CC_STACKPROTECTOR_AUTO
diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
index d5c21a382475..d4d3b21d5b3d 100644
--- a/arch/x86/include/asm/pgtable_64_types.h
+++ b/arch/x86/include/asm/pgtable_64_types.h
@@ -7,6 +7,7 @@
#ifndef __ASSEMBLY__
#include <linux/types.h>
#include <asm/kaslr.h>
+#include <asm/sections.h>
/*
* These are used to make use of C type-checking..
@@ -126,7 +127,12 @@ extern unsigned int ptrs_per_p4d;
#define VMALLOC_END (VMALLOC_START + (VMALLOC_SIZE_TB << 40) - 1)
+#ifdef CONFIG_DYNAMIC_MODULE_BASE
+#define MODULES_VADDR ALIGN(((unsigned long)_end + PAGE_SIZE), PMD_SIZE)
+#else
#define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
+#endif
+
/* The module sections ends with the start of the fixmap */
#define MODULES_END _AC(0xffffffffff000000, UL)
#define MODULES_LEN (MODULES_END - MODULES_VADDR)
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 2fe60e661227..ea4c498369d8 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -384,12 +384,15 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
* Build-time sanity checks on the kernel image and module
* area mappings. (these are purely build-time and produce no code)
*/
+#ifndef CONFIG_DYNAMIC_MODULE_BASE
BUILD_BUG_ON(MODULES_VADDR < __START_KERNEL_map);
BUILD_BUG_ON(MODULES_VADDR - __START_KERNEL_map < KERNEL_IMAGE_SIZE);
- BUILD_BUG_ON(MODULES_LEN + KERNEL_IMAGE_SIZE > 2*PUD_SIZE);
+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_RANDOMIZE_BASE_LARGE) &&
+ MODULES_LEN + KERNEL_IMAGE_SIZE > 2*PUD_SIZE);
BUILD_BUG_ON((__START_KERNEL_map & ~PMD_MASK) != 0);
BUILD_BUG_ON((MODULES_VADDR & ~PMD_MASK) != 0);
BUILD_BUG_ON(!(MODULES_VADDR > __START_KERNEL));
+#endif
MAYBE_BUILD_BUG_ON(!(((MODULES_END - 1) & PGDIR_MASK) ==
(__START_KERNEL & PGDIR_MASK)));
BUILD_BUG_ON(__fix_to_virt(__end_of_fixed_addresses) <= MODULES_END);
diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c
index 62a7e9f65dec..6f0b1fa2a71a 100644
--- a/arch/x86/mm/dump_pagetables.c
+++ b/arch/x86/mm/dump_pagetables.c
@@ -104,7 +104,7 @@ static struct addr_marker address_markers[] = {
[EFI_END_NR] = { EFI_VA_END, "EFI Runtime Services" },
#endif
[HIGH_KERNEL_NR] = { __START_KERNEL_map, "High Kernel Mapping" },
- [MODULES_VADDR_NR] = { MODULES_VADDR, "Modules" },
+ [MODULES_VADDR_NR] = { 0/*MODULES_VADDR*/, "Modules" },
[MODULES_END_NR] = { MODULES_END, "End Modules" },
[FIXADDR_START_NR] = { FIXADDR_START, "Fixmap Area" },
[END_OF_SPACE_NR] = { -1, NULL }
@@ -599,6 +599,7 @@ static int __init pt_dump_init(void)
address_markers[KASAN_SHADOW_START_NR].start_address = KASAN_SHADOW_START;
address_markers[KASAN_SHADOW_END_NR].start_address = KASAN_SHADOW_END;
#endif
+ address_markers[MODULES_VADDR_NR].start_address = MODULES_VADDR;
#endif
#ifdef CONFIG_X86_32
address_markers[VMALLOC_START_NR].start_address = VMALLOC_START;
--
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 ` [PATCH v2 03/27] x86: Use symbol name in jump " Thomas Garnier
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 ` Thomas Garnier [this message]
2018-03-13 20:59 ` [PATCH v2 23/27] x86/modules: Adapt module loading " 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-23-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).