|
 |
1d9674 |
From 8c89727155f4994b4e75a659e28e5eff16ff6cbc Mon Sep 17 00:00:00 2001
|
|
|
1d9674 |
From: Takao Indoh <indou.takao@jp.fujitsu.com>
|
|
|
1d9674 |
Date: Thu, 26 Oct 2017 20:32:54 +0900
|
|
|
1d9674 |
Subject: [PATCH 2/4] [PATCH v3 2/4] Introduce vtop4_x86_64_pagetable
|
|
|
1d9674 |
|
|
|
1d9674 |
This patch introduces new function vtop4_x86_64_pagetable
|
|
|
1d9674 |
to translate virtual address to physical address. Unlike vtop4_x86_64,
|
|
|
1d9674 |
vtop4_x86_64_pagetable need a pointer of top of pagetable like CR3.
|
|
|
1d9674 |
|
|
|
1d9674 |
Current vtop4_x86_64 implementation uses symbol value of
|
|
|
1d9674 |
init_level4_pgt, therefore vtop4_x86_64 does not work for sadump
|
|
|
1d9674 |
dumpfile of kaslr enabled kernel because it does not have vmcoreinfo to
|
|
|
1d9674 |
correct address of init_level4_pgt. vtop4_x86_64_pagetable requires
|
|
|
1d9674 |
pagetable address instead of init_level4_pgt and sadump dumpfile can
|
|
|
1d9674 |
pass CR3 value which is included in dump header.
|
|
|
1d9674 |
|
|
|
1d9674 |
Signed-off-by: Takao Indoh <indou.takao@jp.fujitsu.com>
|
|
|
1d9674 |
Signed-off-by: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
|
|
|
1d9674 |
---
|
|
|
1d9674 |
arch/x86_64.c | 30 +++++++++++++++++++++++-------
|
|
|
1d9674 |
makedumpfile.h | 1 +
|
|
|
1d9674 |
2 files changed, 24 insertions(+), 7 deletions(-)
|
|
|
1d9674 |
|
|
|
1d9674 |
diff --git a/arch/x86_64.c b/arch/x86_64.c
|
|
|
1d9674 |
index 08dd6b208bce..33621f1f259c 100644
|
|
|
1d9674 |
--- a/makedumpfile-1.6.2/arch/x86_64.c
|
|
|
1d9674 |
+++ b/makedumpfile-1.6.2/arch/x86_64.c
|
|
|
1d9674 |
@@ -255,20 +255,15 @@ get_versiondep_info_x86_64(void)
|
|
|
1d9674 |
* Translate a virtual address to a physical address by using 4 levels paging.
|
|
|
1d9674 |
*/
|
|
|
1d9674 |
unsigned long long
|
|
|
1d9674 |
-vtop4_x86_64(unsigned long vaddr)
|
|
|
1d9674 |
+__vtop4_x86_64(unsigned long vaddr, unsigned long pagetable)
|
|
|
1d9674 |
{
|
|
|
1d9674 |
unsigned long page_dir, pml4, pgd_paddr, pgd_pte, pmd_paddr, pmd_pte;
|
|
|
1d9674 |
unsigned long pte_paddr, pte;
|
|
|
1d9674 |
|
|
|
1d9674 |
- if (SYMBOL(init_level4_pgt) == NOT_FOUND_SYMBOL) {
|
|
|
1d9674 |
- ERRMSG("Can't get the symbol of init_level4_pgt.\n");
|
|
|
1d9674 |
- return NOT_PADDR;
|
|
|
1d9674 |
- }
|
|
|
1d9674 |
-
|
|
|
1d9674 |
/*
|
|
|
1d9674 |
* Get PGD.
|
|
|
1d9674 |
*/
|
|
|
1d9674 |
- page_dir = SYMBOL(init_level4_pgt) - __START_KERNEL_map + info->phys_base;
|
|
|
1d9674 |
+ page_dir = pagetable;
|
|
|
1d9674 |
if (is_xen_memory()) {
|
|
|
1d9674 |
page_dir = ptom_xen(page_dir);
|
|
|
1d9674 |
if (page_dir == NOT_PADDR)
|
|
|
1d9674 |
@@ -346,6 +341,27 @@ vtop4_x86_64(unsigned long vaddr)
|
|
|
1d9674 |
return (pte & ENTRY_MASK) + PAGEOFFSET(vaddr);
|
|
|
1d9674 |
}
|
|
|
1d9674 |
|
|
|
1d9674 |
+unsigned long long
|
|
|
1d9674 |
+vtop4_x86_64(unsigned long vaddr)
|
|
|
1d9674 |
+{
|
|
|
1d9674 |
+ unsigned long pagetable;
|
|
|
1d9674 |
+
|
|
|
1d9674 |
+ if (SYMBOL(init_level4_pgt) == NOT_FOUND_SYMBOL) {
|
|
|
1d9674 |
+ ERRMSG("Can't get the symbol of init_level4_pgt.\n");
|
|
|
1d9674 |
+ return NOT_PADDR;
|
|
|
1d9674 |
+ }
|
|
|
1d9674 |
+
|
|
|
1d9674 |
+ pagetable = SYMBOL(init_level4_pgt) - __START_KERNEL_map + info->phys_base;
|
|
|
1d9674 |
+
|
|
|
1d9674 |
+ return __vtop4_x86_64(vaddr, pagetable);
|
|
|
1d9674 |
+}
|
|
|
1d9674 |
+
|
|
|
1d9674 |
+unsigned long long
|
|
|
1d9674 |
+vtop4_x86_64_pagetable(unsigned long vaddr, unsigned long pagetable)
|
|
|
1d9674 |
+{
|
|
|
1d9674 |
+ return __vtop4_x86_64(vaddr, pagetable);
|
|
|
1d9674 |
+}
|
|
|
1d9674 |
+
|
|
|
1d9674 |
/*
|
|
|
1d9674 |
* for Xen extraction
|
|
|
1d9674 |
*/
|
|
|
1d9674 |
diff --git a/makedumpfile.h b/makedumpfile.h
|
|
|
1d9674 |
index 704a6bc2f8f4..f48dc0b82d4a 100644
|
|
|
1d9674 |
--- a/makedumpfile-1.6.2/makedumpfile.h
|
|
|
1d9674 |
+++ b/makedumpfile-1.6.2/makedumpfile.h
|
|
|
1d9674 |
@@ -978,6 +978,7 @@ int get_phys_base_x86_64(void);
|
|
|
1d9674 |
int get_machdep_info_x86_64(void);
|
|
|
1d9674 |
int get_versiondep_info_x86_64(void);
|
|
|
1d9674 |
unsigned long long vtop4_x86_64(unsigned long vaddr);
|
|
|
1d9674 |
+unsigned long long vtop4_x86_64_pagetable(unsigned long vaddr, unsigned long pagetable);
|
|
|
1d9674 |
#define find_vmemmap() find_vmemmap_x86_64()
|
|
|
1d9674 |
#define get_phys_base() get_phys_base_x86_64()
|
|
|
1d9674 |
#define get_machdep_info() get_machdep_info_x86_64()
|
|
|
1d9674 |
--
|
|
|
1d9674 |
2.5.5
|
|
|
1d9674 |
|