4877ee4b98
- makedumpfile-__cpu_online_mask-symbol.patch: Support symbol __cpu_online_mask (FATE#323473, bsc#1070291). - makedumpfile-vtop4_x86_64_pagetable.patch: Introduce vtop4_x86_64_pagetable (FATE#323473, bsc#1070291). - makedumpfile-fix-KASLR-for-sadump.patch: Fix a KASLR problem of sadump (FATE#323473, bsc#1070291). - makedumpfile-fix-KASLR-for-sadump-while-kdump.patch: sadump: Fix a KASLR problem of sadump while kdump is working (FATE#323473, bsc#1070291). OBS-URL: https://build.opensuse.org/request/show/562833 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/makedumpfile?expand=0&rev=113
111 lines
3.5 KiB
Diff
111 lines
3.5 KiB
Diff
From: Takao Indoh <indou.takao@jp.fujitsu.com>
|
|
Date: Thu, 26 Oct 2017 20:32:54 +0900
|
|
Subject: Introduce vtop4_x86_64_pagetable
|
|
References: FATE#323473, bsc#1070291
|
|
Upstream: merged
|
|
Git-commit: 8c89727155f4994b4e75a659e28e5eff16ff6cbc
|
|
|
|
This patch introduces new function vtop4_x86_64_pagetable
|
|
to translate virtual address to physical address. Unlike vtop4_x86_64,
|
|
vtop4_x86_64_pagetable need a pointer of top of pagetable like CR3.
|
|
|
|
Current vtop4_x86_64 implementation uses symbol value of
|
|
init_level4_pgt, therefore vtop4_x86_64 does not work for sadump
|
|
dumpfile of kaslr enabled kernel because it does not have vmcoreinfo to
|
|
correct address of init_level4_pgt. vtop4_x86_64_pagetable requires
|
|
pagetable address instead of init_level4_pgt and sadump dumpfile can
|
|
pass CR3 value which is included in dump header.
|
|
|
|
Signed-off-by: Takao Indoh <indou.takao@jp.fujitsu.com>
|
|
Signed-off-by: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
|
|
Acked-by: Petr Tesarik <ptesarik@suse.com>
|
|
|
|
---
|
|
arch/x86_64.c | 50 +++++++++++++++++++++++++++++++++-----------------
|
|
makedumpfile.h | 1 +
|
|
2 files changed, 34 insertions(+), 17 deletions(-)
|
|
|
|
--- a/arch/x86_64.c
|
|
+++ b/arch/x86_64.c
|
|
@@ -255,30 +255,15 @@ get_versiondep_info_x86_64(void)
|
|
* Translate a virtual address to a physical address by using 4 levels paging.
|
|
*/
|
|
unsigned long long
|
|
-vtop4_x86_64(unsigned long vaddr)
|
|
+__vtop4_x86_64(unsigned long vaddr, unsigned long pagetable)
|
|
{
|
|
unsigned long page_dir, pml4, pgd_paddr, pgd_pte, pmd_paddr, pmd_pte;
|
|
unsigned long pte_paddr, pte;
|
|
- unsigned long init_level4_pgt;
|
|
-
|
|
- if (SYMBOL(init_level4_pgt) != NOT_FOUND_SYMBOL)
|
|
- init_level4_pgt = SYMBOL(init_level4_pgt);
|
|
- else if (SYMBOL(init_top_pgt) != NOT_FOUND_SYMBOL)
|
|
- init_level4_pgt = SYMBOL(init_top_pgt);
|
|
- else {
|
|
- ERRMSG("Can't get the symbol of init_level4_pgt.\n");
|
|
- return NOT_PADDR;
|
|
- }
|
|
-
|
|
- if (SYMBOL(level4_kernel_pgt) != NOT_FOUND_SYMBOL) {
|
|
- ERRMSG("Kernel is built with 5-level page tables\n");
|
|
- return NOT_PADDR;
|
|
- }
|
|
|
|
/*
|
|
* Get PGD.
|
|
*/
|
|
- page_dir = init_level4_pgt - __START_KERNEL_map + info->phys_base;
|
|
+ page_dir = pagetable;
|
|
if (is_xen_memory()) {
|
|
page_dir = ptom_xen(page_dir);
|
|
if (page_dir == NOT_PADDR)
|
|
@@ -356,6 +341,37 @@ vtop4_x86_64(unsigned long vaddr)
|
|
return (pte & ENTRY_MASK) + PAGEOFFSET(vaddr);
|
|
}
|
|
|
|
+unsigned long long
|
|
+vtop4_x86_64(unsigned long vaddr)
|
|
+{
|
|
+ unsigned long pagetable;
|
|
+ unsigned long init_level4_pgt;
|
|
+
|
|
+ if (SYMBOL(init_level4_pgt) != NOT_FOUND_SYMBOL)
|
|
+ init_level4_pgt = SYMBOL(init_level4_pgt);
|
|
+ else if (SYMBOL(init_top_pgt) != NOT_FOUND_SYMBOL)
|
|
+ init_level4_pgt = SYMBOL(init_top_pgt);
|
|
+ else {
|
|
+ ERRMSG("Can't get the symbol of init_level4_pgt.\n");
|
|
+ return NOT_PADDR;
|
|
+ }
|
|
+
|
|
+ if (SYMBOL(level4_kernel_pgt) != NOT_FOUND_SYMBOL) {
|
|
+ ERRMSG("Kernel is built with 5-level page tables\n");
|
|
+ return NOT_PADDR;
|
|
+ }
|
|
+
|
|
+ pagetable = init_level4_pgt - __START_KERNEL_map + info->phys_base;
|
|
+
|
|
+ return __vtop4_x86_64(vaddr, pagetable);
|
|
+}
|
|
+
|
|
+unsigned long long
|
|
+vtop4_x86_64_pagetable(unsigned long vaddr, unsigned long pagetable)
|
|
+{
|
|
+ return __vtop4_x86_64(vaddr, pagetable);
|
|
+}
|
|
+
|
|
/*
|
|
* for Xen extraction
|
|
*/
|
|
--- a/makedumpfile.h
|
|
+++ b/makedumpfile.h
|
|
@@ -977,6 +977,7 @@ int get_phys_base_x86_64(void);
|
|
int get_machdep_info_x86_64(void);
|
|
int get_versiondep_info_x86_64(void);
|
|
unsigned long long vtop4_x86_64(unsigned long vaddr);
|
|
+unsigned long long vtop4_x86_64_pagetable(unsigned long vaddr, unsigned long pagetable);
|
|
#define find_vmemmap() find_vmemmap_x86_64()
|
|
#define get_phys_base() get_phys_base_x86_64()
|
|
#define get_machdep_info() get_machdep_info_x86_64()
|