diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2018-03-19 13:57:46 -0700 |
|---|---|---|
| committer | Chanwoo Choi <cw00.choi@samsung.com> | 2022-07-01 16:57:20 +0900 |
| commit | 1cfe06402e6f1d064612aface835a936c86c6006 (patch) | |
| tree | 0257556ceaf1eb5a8aea403f02c369b5475cbc56 | |
| parent | 4383fa8331123b22b1930585f1d8e32a5cc5afab (diff) | |
| download | emulator-kernel-1cfe06402e6f1d064612aface835a936c86c6006.tar.gz emulator-kernel-1cfe06402e6f1d064612aface835a936c86c6006.tar.bz2 emulator-kernel-1cfe06402e6f1d064612aface835a936c86c6006.zip | |
x86/build/64: Force the linker to use 2MB page sizetizen_7.0_m2_releasesubmit/tizen/20220701.081848accepted/tizen/unified/20220701.145940accepted/tizen/7.0/unified/hotfix/20221116.112205accepted/tizen/7.0/unified/20221110.061118tizen_7.0_hotfixtizen_7.0accepted/tizen_7.0_unified_hotfixaccepted/tizen_7.0_unified
commit e3d03598e8ae7d195af5d3d049596dec336f569f upstream.
Binutils 2.31 will enable -z separate-code by default for x86 to avoid
mixing code pages with data to improve cache performance as well as
security. To reduce x86-64 executable and shared object sizes, the
maximum page size is reduced from 2MB to 4KB. But x86-64 kernel must
be aligned to 2MB. Pass -z max-page-size=0x200000 to linker to force
2MB page size regardless of the default page size used by linker.
Tested with Linux kernel 4.15.6 on x86-64.
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/CAMe9rOp4_%3D_8twdpTyAP2DhONOCeaTOsniJLoppzhoNptL8xzA@mail.gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: Id19a848f2d2979861bb022099a1378fdafa9c59f
[cw00.choi: Cherry-pick it from linux-stable (4.4.y branch)]
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
| -rw-r--r-- | arch/x86/Makefile | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 4086abca0b32..3ef184dbd113 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -179,6 +179,15 @@ KBUILD_CFLAGS += $(cfi) $(cfi-sigframe) $(cfi-sections) $(asinstr) $(avx_instr) LDFLAGS := -m elf_$(UTS_MACHINE) +# +# The 64-bit kernel must be aligned to 2MB. Pass -z max-page-size=0x200000 to +# the linker to force 2MB page size regardless of the default page size used +# by the linker. +# +ifdef CONFIG_X86_64 +LDFLAGS += $(call ld-option, -z max-page-size=0x200000) +endif + # Speed up the build KBUILD_CFLAGS += -pipe # Workaround for a gcc prelease that unfortunately was shipped in a suse release |