diff options
| author | Donald Buczek <buczek@molgen.mpg.de> | 2019-08-30 11:12:58 +0200 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2019-09-03 16:40:46 +0200 |
| commit | 23b67f048ddef88e59ffe40f6392aeef92af9066 (patch) | |
| tree | 2d2948ca642e131d8fed21a0990e21f342179a83 | |
| parent | 77c88244516fa11a6ab6ab1804b92102fddce754 (diff) | |
| download | kexec-tools-23b67f048ddef88e59ffe40f6392aeef92af9066.tar.gz | |
x86: Fix PAGE_OFFSET for kernels since 4.20
Linux kernel commit d52888aa2753 ("x86/mm: Move LDT remap out of KASLR
region on 5-level paging") changed the base of the direct mapping
from 0xffff880000000000 to 0xffff888000000000. This was merged
into v4.20-rc2.
Update to new address accordingly.
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/i386/crashdump-x86.c | 2 | ||||
| -rw-r--r-- | kexec/arch/i386/crashdump-x86.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/kexec/arch/i386/crashdump-x86.c b/kexec/arch/i386/crashdump-x86.c index a2aea31f..c79791f2 100644 --- a/kexec/arch/i386/crashdump-x86.c +++ b/kexec/arch/i386/crashdump-x86.c @@ -61,6 +61,8 @@ static int get_kernel_page_offset(struct kexec_info *UNUSED(info), if (kv < KERNEL_VERSION(2, 6, 27)) elf_info->page_offset = X86_64_PAGE_OFFSET_PRE_2_6_27; + else if (kv < KERNEL_VERSION(4, 20, 0)) + elf_info->page_offset = X86_64_PAGE_OFFSET_PRE_4_20_0; else elf_info->page_offset = X86_64_PAGE_OFFSET; } diff --git a/kexec/arch/i386/crashdump-x86.h b/kexec/arch/i386/crashdump-x86.h index ddee19fc..e4fdc824 100644 --- a/kexec/arch/i386/crashdump-x86.h +++ b/kexec/arch/i386/crashdump-x86.h @@ -13,7 +13,8 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline, #define X86_64__START_KERNEL_map 0xffffffff80000000ULL #define X86_64_PAGE_OFFSET_PRE_2_6_27 0xffff810000000000ULL -#define X86_64_PAGE_OFFSET 0xffff880000000000ULL +#define X86_64_PAGE_OFFSET_PRE_4_20_0 0xffff880000000000ULL +#define X86_64_PAGE_OFFSET 0xffff888000000000ULL #define X86_64_MAXMEM 0x3fffffffffffUL |