Skip to contentSkip to conversation

kdump, vmcoreinfo: report memory sections virtual addresses

PATCH Applied Thomas Garnier 4 participants 8 messages Aug 18, 2016 – Sep 8, 2016

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kdump, vmcoreinfo: report memory sections virtual addresses

KASLR memory randomization can randomize the base of the physical memory mapping (PAGE_OFFSET), vmalloc (VMALLOC_START) and vmemmap (VMEMMAP_START). Adding these variables on VMCOREINFO so tools can easily identify the base of each memory section.

---
Based on next-20160817

---
 arch/x86/kernel/machine_kexec_64.c | 3 +++
 include/linux/kexec.h              | 6 ++++++
 2 files changed, 9 insertions(+)
arch/x86/kernel/machine_kexec_64.c +3 -0
index fc3389f..b1f15a2 100644
@@ -338,6 +338,9 @@ void arch_crash_save_vmcoreinfo(void)
 	vmcoreinfo_append_str("KERNELOFFSET=%lx\n",
 			      kaslr_offset());
 	VMCOREINFO_PHYS_BASE(phys_base);
+	VMCOREINFO_PAGE_OFFSET(PAGE_OFFSET);
+	VMCOREINFO_VMALLOC_START(VMALLOC_START);
+	VMCOREINFO_VMEMMAP_START(VMEMMAP_START);
 }
 
 /* arch-dependent functionality related to kexec file-based syscall */
include/linux/kexec.h +6 -0
index d3ae429..cd3874c 100644
@@ -261,6 +261,12 @@ phys_addr_t paddr_vmcoreinfo_note(void);
 	vmcoreinfo_append_str("CONFIG_%s=y\n", #name)
 #define VMCOREINFO_PHYS_BASE(value) \
 	vmcoreinfo_append_str("PHYS_BASE=%lx\n", (unsigned long)value)
+#define VMCOREINFO_PAGE_OFFSET(value) \
+	vmcoreinfo_append_str("PAGE_OFFSET=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMALLOC_START(value) \
+	vmcoreinfo_append_str("VMALLOC_START=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMEMMAP_START(value) \
+	vmcoreinfo_append_str("VMEMMAP_START=%lx\n", (unsigned long)value)
 
 extern struct kimage *kexec_image;
 extern struct kimage *kexec_crash_image;
Signature · 1 line
2.8.0.rc3.226.g39d4020
Acked-by on v1 1/1
#1 lore raw

This makes sense. Makedumpfile need this to parse memory sections.

Ack.

Quoted 32 lines · Thomas Garnier

KASLR memory randomization can randomize the base of the physical memory mapping (PAGE_OFFSET), vmalloc (VMALLOC_START) and vmemmap (VMEMMAP_START). Adding these variables on VMCOREINFO so tools can easily identify the base of each memory section.

---
Based on next-20160817

---
 arch/x86/kernel/machine_kexec_64.c | 3 +++
 include/linux/kexec.h              | 6 ++++++
 2 files changed, 9 insertions(+)
arch/x86/kernel/machine_kexec_64.c +3 -0
index fc3389f..b1f15a2 100644
@@ -338,6 +338,9 @@ void arch_crash_save_vmcoreinfo(void)
 	vmcoreinfo_append_str("KERNELOFFSET=%lx\n",
 			      kaslr_offset());
 	VMCOREINFO_PHYS_BASE(phys_base);
+	VMCOREINFO_PAGE_OFFSET(PAGE_OFFSET);
+	VMCOREINFO_VMALLOC_START(VMALLOC_START);
+	VMCOREINFO_VMEMMAP_START(VMEMMAP_START);
 }
 
 /* arch-dependent functionality related to kexec file-based syscall */
include/linux/kexec.h +0 -0
index d3ae429..cd3874c 100644

include/linux/kexec.h phys_addr_t paddr_vmcoreinfo_note(void); · line 263

Quoted 3 lines
include/linux/kexec.h +0 -0
@@ -261,6 +261,12 @@ phys_addr_t paddr_vmcoreinfo_note(void);
 	vmcoreinfo_append_str("CONFIG_%s=y\n", #name)
 #define VMCOREINFO_PHYS_BASE(value) \
 	vmcoreinfo_append_str("PHYS_BASE=%lx\n", (unsigned long)value)

Could it be better to define only one MACRO like VMCOREINFO_

Quoted 17 lines
include/linux/kexec.h +6 -0
+#define VMCOREINFO_PAGE_OFFSET(value) \
+	vmcoreinfo_append_str("PAGE_OFFSET=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMALLOC_START(value) \
+	vmcoreinfo_append_str("VMALLOC_START=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMEMMAP_START(value) \
+	vmcoreinfo_append_str("VMEMMAP_START=%lx\n", (unsigned long)value)
 
 extern struct kimage *kexec_image;
 extern struct kimage *kexec_crash_image;
Signature · 7 lines
2.8.0.rc3.226.g39d4020


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Acked-by
#2 lore raw
Quoted 2 lines · Baoquan He

This makes sense. Makedumpfile need this to parse memory sections.

Yup, good addition.

-Kees

Quoted 60 lines

Ack.

Quoted 32 lines · Thomas Garnier

KASLR memory randomization can randomize the base of the physical memory mapping (PAGE_OFFSET), vmalloc (VMALLOC_START) and vmemmap (VMEMMAP_START). Adding these variables on VMCOREINFO so tools can easily identify the base of each memory section.

---
Based on next-20160817

---
 arch/x86/kernel/machine_kexec_64.c | 3 +++
 include/linux/kexec.h              | 6 ++++++
 2 files changed, 9 insertions(+)
arch/x86/kernel/machine_kexec_64.c +3 -0
index fc3389f..b1f15a2 100644
@@ -338,6 +338,9 @@ void arch_crash_save_vmcoreinfo(void)
      vmcoreinfo_append_str("KERNELOFFSET=%lx\n",
                            kaslr_offset());
      VMCOREINFO_PHYS_BASE(phys_base);
+     VMCOREINFO_PAGE_OFFSET(PAGE_OFFSET);
+     VMCOREINFO_VMALLOC_START(VMALLOC_START);
+     VMCOREINFO_VMEMMAP_START(VMEMMAP_START);
 }
 
 /* arch-dependent functionality related to kexec file-based syscall */
include/linux/kexec.h +0 -0
index d3ae429..cd3874c 100644

include/linux/kexec.h phys_addr_t paddr_vmcoreinfo_note(void); · line 263

Quoted 3 lines
include/linux/kexec.h +0 -0
@@ -261,6 +261,12 @@ phys_addr_t paddr_vmcoreinfo_note(void);
      vmcoreinfo_append_str("CONFIG_%s=y\n", #name)
 #define VMCOREINFO_PHYS_BASE(value) \
      vmcoreinfo_append_str("PHYS_BASE=%lx\n", (unsigned long)value)

Could it be better to define only one MACRO like VMCOREINFO_

Quoted 17 lines
include/linux/kexec.h +6 -1
+#define VMCOREINFO_PAGE_OFFSET(value) \
+     vmcoreinfo_append_str("PAGE_OFFSET=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMALLOC_START(value) \
+     vmcoreinfo_append_str("VMALLOC_START=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMEMMAP_START(value) \
+     vmcoreinfo_append_str("VMEMMAP_START=%lx\n", (unsigned long)value)
 
 extern struct kimage *kexec_image;
 extern struct kimage *kexec_crash_image;
--

2.8.0.rc3.226.g39d4020

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

Signature · 2 lines
Kees Cook
Nexus Security
#3 lore raw
In reply to Thomas Garnier

Hi Thomas,

I used below code and it works. Since using VMCOREINFO_NUMBER can reuse the existing struct number_table to import the data. It makes change easier. But the place could be next to KERNEL_IMAGE_SIZE, or as your patch did, both is fine.

---
 kernel/kexec_core.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/kexec_core.c +3 -0
index 5616755..81bde86 100644
@@ -1469,6 +1469,9 @@ static int __init crash_save_vmcoreinfo_init(void)
 	VMCOREINFO_NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE);
 #ifdef CONFIG_X86
 	VMCOREINFO_NUMBER(KERNEL_IMAGE_SIZE);
+	VMCOREINFO_NUMBER(PAGE_OFFSET);
+	VMCOREINFO_NUMBER(VMALLOC_START);
+	VMCOREINFO_NUMBER(VMEMMAP_START);
 #endif
 #ifdef CONFIG_HUGETLB_PAGE
 	VMCOREINFO_NUMBER(HUGETLB_PAGE_DTOR);
Signature · 1 line
2.5.5
Quoted 52 lines · Thomas Garnier

KASLR memory randomization can randomize the base of the physical memory mapping (PAGE_OFFSET), vmalloc (VMALLOC_START) and vmemmap (VMEMMAP_START). Adding these variables on VMCOREINFO so tools can easily identify the base of each memory section.

---
Based on next-20160817

---
 arch/x86/kernel/machine_kexec_64.c | 3 +++
 include/linux/kexec.h              | 6 ++++++
 2 files changed, 9 insertions(+)
arch/x86/kernel/machine_kexec_64.c +3 -0
index fc3389f..b1f15a2 100644
@@ -338,6 +338,9 @@ void arch_crash_save_vmcoreinfo(void)
 	vmcoreinfo_append_str("KERNELOFFSET=%lx\n",
 			      kaslr_offset());
 	VMCOREINFO_PHYS_BASE(phys_base);
+	VMCOREINFO_PAGE_OFFSET(PAGE_OFFSET);
+	VMCOREINFO_VMALLOC_START(VMALLOC_START);
+	VMCOREINFO_VMEMMAP_START(VMEMMAP_START);
 }
 
 /* arch-dependent functionality related to kexec file-based syscall */
include/linux/kexec.h +6 -0
index d3ae429..cd3874c 100644
@@ -261,6 +261,12 @@ phys_addr_t paddr_vmcoreinfo_note(void);
 	vmcoreinfo_append_str("CONFIG_%s=y\n", #name)
 #define VMCOREINFO_PHYS_BASE(value) \
 	vmcoreinfo_append_str("PHYS_BASE=%lx\n", (unsigned long)value)
+#define VMCOREINFO_PAGE_OFFSET(value) \
+	vmcoreinfo_append_str("PAGE_OFFSET=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMALLOC_START(value) \
+	vmcoreinfo_append_str("VMALLOC_START=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMEMMAP_START(value) \
+	vmcoreinfo_append_str("VMEMMAP_START=%lx\n", (unsigned long)value)
 
 extern struct kimage *kexec_image;
 extern struct kimage *kexec_crash_image;
Signature · 7 lines
2.8.0.rc3.226.g39d4020


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#4 lore raw

Great, thanks Baoquan.

Quoted 81 lines · Baoquan He

Hi Thomas,

I used below code and it works. Since using VMCOREINFO_NUMBER can reuse the existing struct number_table to import the data. It makes change easier. But the place could be next to KERNEL_IMAGE_SIZE, or as your patch did, both is fine.

---
 kernel/kexec_core.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/kexec_core.c +3 -1
index 5616755..81bde86 100644
@@ -1469,6 +1469,9 @@ static int __init crash_save_vmcoreinfo_init(void)
        VMCOREINFO_NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE);
 #ifdef CONFIG_X86
        VMCOREINFO_NUMBER(KERNEL_IMAGE_SIZE);
+       VMCOREINFO_NUMBER(PAGE_OFFSET);
+       VMCOREINFO_NUMBER(VMALLOC_START);
+       VMCOREINFO_NUMBER(VMEMMAP_START);
 #endif
 #ifdef CONFIG_HUGETLB_PAGE
        VMCOREINFO_NUMBER(HUGETLB_PAGE_DTOR);
--

2.5.5

Quoted 52 lines · Thomas Garnier

KASLR memory randomization can randomize the base of the physical memory mapping (PAGE_OFFSET), vmalloc (VMALLOC_START) and vmemmap (VMEMMAP_START). Adding these variables on VMCOREINFO so tools can easily identify the base of each memory section.

---
Based on next-20160817

---
 arch/x86/kernel/machine_kexec_64.c | 3 +++
 include/linux/kexec.h              | 6 ++++++
 2 files changed, 9 insertions(+)
arch/x86/kernel/machine_kexec_64.c +3 -0
index fc3389f..b1f15a2 100644
@@ -338,6 +338,9 @@ void arch_crash_save_vmcoreinfo(void)
      vmcoreinfo_append_str("KERNELOFFSET=%lx\n",
                            kaslr_offset());
      VMCOREINFO_PHYS_BASE(phys_base);
+     VMCOREINFO_PAGE_OFFSET(PAGE_OFFSET);
+     VMCOREINFO_VMALLOC_START(VMALLOC_START);
+     VMCOREINFO_VMEMMAP_START(VMEMMAP_START);
 }
 
 /* arch-dependent functionality related to kexec file-based syscall */
include/linux/kexec.h +6 -1
index d3ae429..cd3874c 100644
@@ -261,6 +261,12 @@ phys_addr_t paddr_vmcoreinfo_note(void);
      vmcoreinfo_append_str("CONFIG_%s=y\n", #name)
 #define VMCOREINFO_PHYS_BASE(value) \
      vmcoreinfo_append_str("PHYS_BASE=%lx\n", (unsigned long)value)
+#define VMCOREINFO_PAGE_OFFSET(value) \
+     vmcoreinfo_append_str("PAGE_OFFSET=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMALLOC_START(value) \
+     vmcoreinfo_append_str("VMALLOC_START=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMEMMAP_START(value) \
+     vmcoreinfo_append_str("VMEMMAP_START=%lx\n", (unsigned long)value)
 
 extern struct kimage *kexec_image;
 extern struct kimage *kexec_crash_image;
--

2.8.0.rc3.226.g39d4020

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#5 lore raw
In reply to Baoquan He
Quoted 6 lines · Baoquan He

Hi Thomas,

I used below code and it works. Since using VMCOREINFO_NUMBER can reuse the existing struct number_table to import the data. It makes change easier. But the place could be next to KERNEL_IMAGE_SIZE, or as your patch did, both is fine.

I think we'd better avoid adding arch-specific code in generic code if possible, especially in this case, since there is a dedicated interface, arch_crash_save_vmcoreinfo().

-Takahiro AKASHI

Quoted 74 lines
---
 kernel/kexec_core.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/kexec_core.c +3 -0
index 5616755..81bde86 100644
@@ -1469,6 +1469,9 @@ static int __init crash_save_vmcoreinfo_init(void)
 	VMCOREINFO_NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE);
 #ifdef CONFIG_X86
 	VMCOREINFO_NUMBER(KERNEL_IMAGE_SIZE);
+	VMCOREINFO_NUMBER(PAGE_OFFSET);
+	VMCOREINFO_NUMBER(VMALLOC_START);
+	VMCOREINFO_NUMBER(VMEMMAP_START);
 #endif
 #ifdef CONFIG_HUGETLB_PAGE
 	VMCOREINFO_NUMBER(HUGETLB_PAGE_DTOR);
Signature · 1 line
2.5.5
Quoted 52 lines · Thomas Garnier

KASLR memory randomization can randomize the base of the physical memory mapping (PAGE_OFFSET), vmalloc (VMALLOC_START) and vmemmap (VMEMMAP_START). Adding these variables on VMCOREINFO so tools can easily identify the base of each memory section.

---
Based on next-20160817

---
 arch/x86/kernel/machine_kexec_64.c | 3 +++
 include/linux/kexec.h              | 6 ++++++
 2 files changed, 9 insertions(+)
arch/x86/kernel/machine_kexec_64.c +3 -0
index fc3389f..b1f15a2 100644
@@ -338,6 +338,9 @@ void arch_crash_save_vmcoreinfo(void)
 	vmcoreinfo_append_str("KERNELOFFSET=%lx\n",
 			      kaslr_offset());
 	VMCOREINFO_PHYS_BASE(phys_base);
+	VMCOREINFO_PAGE_OFFSET(PAGE_OFFSET);
+	VMCOREINFO_VMALLOC_START(VMALLOC_START);
+	VMCOREINFO_VMEMMAP_START(VMEMMAP_START);
 }
 
 /* arch-dependent functionality related to kexec file-based syscall */
include/linux/kexec.h +6 -0
index d3ae429..cd3874c 100644
@@ -261,6 +261,12 @@ phys_addr_t paddr_vmcoreinfo_note(void);
 	vmcoreinfo_append_str("CONFIG_%s=y\n", #name)
 #define VMCOREINFO_PHYS_BASE(value) \
 	vmcoreinfo_append_str("PHYS_BASE=%lx\n", (unsigned long)value)
+#define VMCOREINFO_PAGE_OFFSET(value) \
+	vmcoreinfo_append_str("PAGE_OFFSET=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMALLOC_START(value) \
+	vmcoreinfo_append_str("VMALLOC_START=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMEMMAP_START(value) \
+	vmcoreinfo_append_str("VMEMMAP_START=%lx\n", (unsigned long)value)
 
 extern struct kimage *kexec_image;
 extern struct kimage *kexec_crash_image;
Signature · 7 lines
2.8.0.rc3.226.g39d4020


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#6 lore raw
Quoted 11 lines · AKASHI Takahiro
Quoted 6 lines · Baoquan He

Hi Thomas,

I used below code and it works. Since using VMCOREINFO_NUMBER can reuse the existing struct number_table to import the data. It makes change easier. But the place could be next to KERNEL_IMAGE_SIZE, or as your patch did, both is fine.

I think we'd better avoid adding arch-specific code in generic code if possible, especially in this case, since there is a dedicated interface, arch_crash_save_vmcoreinfo().

Yes, agree. Previously the reason I put KERNEL_IMAGE_SIZE in crash_save_vmcoreinfo_init is kernel text randomization could be a generic method for all ARCHes. Then it can be taken out from the #ifdef scope. Now seeing it again, it's better to be put in arch_crash_save_vmcoreinfo, at least for the time being.

Hi Thomas,

By the way, will you repost with the VMCOREINFO_NUMBER format? If not, I can repost after I test all kexec/makedumpfile changes.

Thanks
Baoquan

Quoted 77 lines

-Takahiro AKASHI

Quoted 74 lines
---
 kernel/kexec_core.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/kexec_core.c +3 -0
index 5616755..81bde86 100644
@@ -1469,6 +1469,9 @@ static int __init crash_save_vmcoreinfo_init(void)
 	VMCOREINFO_NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE);
 #ifdef CONFIG_X86
 	VMCOREINFO_NUMBER(KERNEL_IMAGE_SIZE);
+	VMCOREINFO_NUMBER(PAGE_OFFSET);
+	VMCOREINFO_NUMBER(VMALLOC_START);
+	VMCOREINFO_NUMBER(VMEMMAP_START);
 #endif
 #ifdef CONFIG_HUGETLB_PAGE
 	VMCOREINFO_NUMBER(HUGETLB_PAGE_DTOR);
Signature · 1 line
2.5.5
Quoted 52 lines · Thomas Garnier

KASLR memory randomization can randomize the base of the physical memory mapping (PAGE_OFFSET), vmalloc (VMALLOC_START) and vmemmap (VMEMMAP_START). Adding these variables on VMCOREINFO so tools can easily identify the base of each memory section.

---
Based on next-20160817

---
 arch/x86/kernel/machine_kexec_64.c | 3 +++
 include/linux/kexec.h              | 6 ++++++
 2 files changed, 9 insertions(+)
arch/x86/kernel/machine_kexec_64.c +3 -0
index fc3389f..b1f15a2 100644
@@ -338,6 +338,9 @@ void arch_crash_save_vmcoreinfo(void)
 	vmcoreinfo_append_str("KERNELOFFSET=%lx\n",
 			      kaslr_offset());
 	VMCOREINFO_PHYS_BASE(phys_base);
+	VMCOREINFO_PAGE_OFFSET(PAGE_OFFSET);
+	VMCOREINFO_VMALLOC_START(VMALLOC_START);
+	VMCOREINFO_VMEMMAP_START(VMEMMAP_START);
 }
 
 /* arch-dependent functionality related to kexec file-based syscall */
include/linux/kexec.h +6 -0
index d3ae429..cd3874c 100644
@@ -261,6 +261,12 @@ phys_addr_t paddr_vmcoreinfo_note(void);
 	vmcoreinfo_append_str("CONFIG_%s=y\n", #name)
 #define VMCOREINFO_PHYS_BASE(value) \
 	vmcoreinfo_append_str("PHYS_BASE=%lx\n", (unsigned long)value)
+#define VMCOREINFO_PAGE_OFFSET(value) \
+	vmcoreinfo_append_str("PAGE_OFFSET=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMALLOC_START(value) \
+	vmcoreinfo_append_str("VMALLOC_START=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMEMMAP_START(value) \
+	vmcoreinfo_append_str("VMEMMAP_START=%lx\n", (unsigned long)value)
 
 extern struct kimage *kexec_image;
 extern struct kimage *kexec_crash_image;
Signature · 7 lines
2.8.0.rc3.226.g39d4020


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#7 lore raw
Quoted 19 lines · Baoquan He
Quoted 11 lines · AKASHI Takahiro
Quoted 6 lines · Baoquan He

Hi Thomas,

I used below code and it works. Since using VMCOREINFO_NUMBER can reuse the existing struct number_table to import the data. It makes change easier. But the place could be next to KERNEL_IMAGE_SIZE, or as your patch did, both is fine.

I think we'd better avoid adding arch-specific code in generic code if possible, especially in this case, since there is a dedicated interface, arch_crash_save_vmcoreinfo().

Yes, agree. Previously the reason I put KERNEL_IMAGE_SIZE in crash_save_vmcoreinfo_init is kernel text randomization could be a generic method for all ARCHes. Then it can be taken out from the #ifdef scope. Now seeing it again, it's better to be put in arch_crash_save_vmcoreinfo, at least for the time being.

Quoted 4 lines

Hi Thomas,

By the way, will you repost with the VMCOREINFO_NUMBER format? If not, I can repost after I test all kexec/makedumpfile changes.

I think you should repost it.

Quoted 81 lines

Thanks
Baoquan

Quoted 77 lines

-Takahiro AKASHI

Quoted 74 lines
---
 kernel/kexec_core.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/kexec_core.c +3 -1
index 5616755..81bde86 100644
@@ -1469,6 +1469,9 @@ static int __init crash_save_vmcoreinfo_init(void)
    VMCOREINFO_NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE);
 #ifdef CONFIG_X86
    VMCOREINFO_NUMBER(KERNEL_IMAGE_SIZE);
+   VMCOREINFO_NUMBER(PAGE_OFFSET);
+   VMCOREINFO_NUMBER(VMALLOC_START);
+   VMCOREINFO_NUMBER(VMEMMAP_START);
 #endif
 #ifdef CONFIG_HUGETLB_PAGE
    VMCOREINFO_NUMBER(HUGETLB_PAGE_DTOR);
--

2.5.5

Quoted 52 lines · Thomas Garnier

KASLR memory randomization can randomize the base of the physical memory mapping (PAGE_OFFSET), vmalloc (VMALLOC_START) and vmemmap (VMEMMAP_START). Adding these variables on VMCOREINFO so tools can easily identify the base of each memory section.

---
Based on next-20160817

---
 arch/x86/kernel/machine_kexec_64.c | 3 +++
 include/linux/kexec.h              | 6 ++++++
 2 files changed, 9 insertions(+)
arch/x86/kernel/machine_kexec_64.c +3 -0
index fc3389f..b1f15a2 100644
@@ -338,6 +338,9 @@ void arch_crash_save_vmcoreinfo(void)
  vmcoreinfo_append_str("KERNELOFFSET=%lx\n",
                        kaslr_offset());
  VMCOREINFO_PHYS_BASE(phys_base);
+ VMCOREINFO_PAGE_OFFSET(PAGE_OFFSET);
+ VMCOREINFO_VMALLOC_START(VMALLOC_START);
+ VMCOREINFO_VMEMMAP_START(VMEMMAP_START);
 }
 
 /* arch-dependent functionality related to kexec file-based syscall */
include/linux/kexec.h +6 -1
index d3ae429..cd3874c 100644
@@ -261,6 +261,12 @@ phys_addr_t paddr_vmcoreinfo_note(void);
  vmcoreinfo_append_str("CONFIG_%s=y\n", #name)
 #define VMCOREINFO_PHYS_BASE(value) \
  vmcoreinfo_append_str("PHYS_BASE=%lx\n", (unsigned long)value)
+#define VMCOREINFO_PAGE_OFFSET(value) \
+ vmcoreinfo_append_str("PAGE_OFFSET=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMALLOC_START(value) \
+ vmcoreinfo_append_str("VMALLOC_START=%lx\n", (unsigned long)value)
+#define VMCOREINFO_VMEMMAP_START(value) \
+ vmcoreinfo_append_str("VMEMMAP_START=%lx\n", (unsigned long)value)
 
 extern struct kimage *kexec_image;
 extern struct kimage *kexec_crash_image;
--

2.8.0.rc3.226.g39d4020

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec