[PATCH] handle renamed init_level4_pgt -> init_top_pgt

[PATCH] handle renamed init_level4_pgt -> init_top_pgt

[Jeff Mahoney]

Linux 4.13 renamed init_level4_pgt to init_top_pgt in preparation for
introducing 5-level page tables.  This patch follows the rename if
the lookup for init_level4_pgt fails.  It also checks to see if
5-level page tables are enabled and bails if it discovers they are.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
 arch/x86_64.c  | 24 +++++++++++++++++++++---
 makedumpfile.c |  6 ++++++
 makedumpfile.h |  2 ++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/arch/x86_64.c b/arch/x86_64.c
index 08dd6b2..9b09035 100644
--- a/arch/x86_64.c
+++ b/arch/x86_64.c
@@ -259,16 +259,26 @@ vtop4_x86_64(unsigned long vaddr)
 {
 	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) {
+	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 = SYMBOL(init_level4_pgt) - __START_KERNEL_map + info->phys_base;
+	page_dir = init_level4_pgt - __START_KERNEL_map + info->phys_base;
 	if (is_xen_memory()) {
 		page_dir = ptom_xen(page_dir);
 		if (page_dir == NOT_PADDR)
@@ -549,8 +559,16 @@ find_vmemmap_x86_64()
 	struct vmap_pfns *vmapp, *vmaphead = NULL, *cur, *tail;
 
 	init_level4_pgt = SYMBOL(init_level4_pgt);
+	if (init_level4_pgt == NOT_FOUND_SYMBOL)
+		init_level4_pgt = SYMBOL(init_top_pgt);
+
 	if (init_level4_pgt == NOT_FOUND_SYMBOL) {
-		ERRMSG("init_level4_pgt not found\n");
+		ERRMSG("init_level4_pgt/init_top_pgt not found\n");
+		return FAILED;
+	}
+
+	if (SYMBOL(level4_kernel_pgt) != NOT_FOUND_SYMBOL) {
+		ERRMSG("kernel is configured for 5-level page tables\n");
 		return FAILED;
 	}
 	pagestructsize = size_table.page;
diff --git a/makedumpfile.c b/makedumpfile.c
index f85003a..6e5ec34 100644
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -1486,6 +1486,8 @@ get_symbol_info(void)
 	SYMBOL_INIT(_stext, "_stext");
 	SYMBOL_INIT(swapper_pg_dir, "swapper_pg_dir");
 	SYMBOL_INIT(init_level4_pgt, "init_level4_pgt");
+	SYMBOL_INIT(level4_kernel_pgt, "level4_kernel_pgt");
+	SYMBOL_INIT(init_top_pgt, "init_top_pgt");
 	SYMBOL_INIT(vmlist, "vmlist");
 	SYMBOL_INIT(vmap_area_list, "vmap_area_list");
 	SYMBOL_INIT(node_online_map, "node_online_map");
@@ -2105,6 +2107,8 @@ write_vmcoreinfo_data(void)
 	WRITE_SYMBOL("_stext", _stext);
 	WRITE_SYMBOL("swapper_pg_dir", swapper_pg_dir);
 	WRITE_SYMBOL("init_level4_pgt", init_level4_pgt);
+	WRITE_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
+	WRITE_SYMBOL("init_top_pgt", init_top_pgt);
 	WRITE_SYMBOL("vmlist", vmlist);
 	WRITE_SYMBOL("vmap_area_list", vmap_area_list);
 	WRITE_SYMBOL("node_online_map", node_online_map);
@@ -2500,6 +2504,8 @@ read_vmcoreinfo(void)
 	READ_SYMBOL("_stext", _stext);
 	READ_SYMBOL("swapper_pg_dir", swapper_pg_dir);
 	READ_SYMBOL("init_level4_pgt", init_level4_pgt);
+	READ_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
+	READ_SYMBOL("init_top_pgt", init_top_pgt);
 	READ_SYMBOL("vmlist", vmlist);
 	READ_SYMBOL("vmap_area_list", vmap_area_list);
 	READ_SYMBOL("node_online_map", node_online_map);
diff --git a/makedumpfile.h b/makedumpfile.h
index 8a05794..9357e47 100644
--- a/makedumpfile.h
+++ b/makedumpfile.h
@@ -1517,6 +1517,8 @@ struct symbol_table {
 	unsigned long long	_stext;
 	unsigned long long	swapper_pg_dir;
 	unsigned long long	init_level4_pgt;
+	unsigned long long	level4_kernel_pgt;
+	unsigned long long	init_top_pgt;
 	unsigned long long	vmlist;
 	unsigned long long	vmap_area_list;
 	unsigned long long	phys_base;


-- 
Jeff Mahoney
SUSE Labs

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

RE: [PATCH] handle renamed init_level4_pgt -> init_top_pgt

[Atsushi Kumagai]

>Linux 4.13 renamed init_level4_pgt to init_top_pgt in preparation for
>introducing 5-level page tables.  This patch follows the rename if
>the lookup for init_level4_pgt fails.  It also checks to see if
>5-level page tables are enabled and bails if it discovers they are.

Thanks Jeff, but could you rebase it on the current devel branch ?
vtop4 for x86_64 was modified in the commit below:

commit 8c89727155f4994b4e75a659e28e5eff16ff6cbc
Author: Takao Indoh <indou.takao@jp.fujitsu.com>
Date:   Thu Oct 26 20:32:54 2017 +0900

    [PATCH v3 2/4] Introduce vtop4_x86_64_pagetable

Regards,
Atsushi Kumagai

>Signed-off-by: Jeff Mahoney <jeffm@suse.com>
>---
> arch/x86_64.c  | 24 +++++++++++++++++++++---
> makedumpfile.c |  6 ++++++
> makedumpfile.h |  2 ++
> 3 files changed, 29 insertions(+), 3 deletions(-)
>
>diff --git a/arch/x86_64.c b/arch/x86_64.c
>index 08dd6b2..9b09035 100644
>--- a/arch/x86_64.c
>+++ b/arch/x86_64.c
>@@ -259,16 +259,26 @@ vtop4_x86_64(unsigned long vaddr)
> {
> 	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) {
>+	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 = SYMBOL(init_level4_pgt) - __START_KERNEL_map + info->phys_base;
>+	page_dir = init_level4_pgt - __START_KERNEL_map + info->phys_base;
> 	if (is_xen_memory()) {
> 		page_dir = ptom_xen(page_dir);
> 		if (page_dir == NOT_PADDR)
>@@ -549,8 +559,16 @@ find_vmemmap_x86_64()
> 	struct vmap_pfns *vmapp, *vmaphead = NULL, *cur, *tail;
>
> 	init_level4_pgt = SYMBOL(init_level4_pgt);
>+	if (init_level4_pgt == NOT_FOUND_SYMBOL)
>+		init_level4_pgt = SYMBOL(init_top_pgt);
>+
> 	if (init_level4_pgt == NOT_FOUND_SYMBOL) {
>-		ERRMSG("init_level4_pgt not found\n");
>+		ERRMSG("init_level4_pgt/init_top_pgt not found\n");
>+		return FAILED;
>+	}
>+
>+	if (SYMBOL(level4_kernel_pgt) != NOT_FOUND_SYMBOL) {
>+		ERRMSG("kernel is configured for 5-level page tables\n");
> 		return FAILED;
> 	}
> 	pagestructsize = size_table.page;
>diff --git a/makedumpfile.c b/makedumpfile.c
>index f85003a..6e5ec34 100644
>--- a/makedumpfile.c
>+++ b/makedumpfile.c
>@@ -1486,6 +1486,8 @@ get_symbol_info(void)
> 	SYMBOL_INIT(_stext, "_stext");
> 	SYMBOL_INIT(swapper_pg_dir, "swapper_pg_dir");
> 	SYMBOL_INIT(init_level4_pgt, "init_level4_pgt");
>+	SYMBOL_INIT(level4_kernel_pgt, "level4_kernel_pgt");
>+	SYMBOL_INIT(init_top_pgt, "init_top_pgt");
> 	SYMBOL_INIT(vmlist, "vmlist");
> 	SYMBOL_INIT(vmap_area_list, "vmap_area_list");
> 	SYMBOL_INIT(node_online_map, "node_online_map");
>@@ -2105,6 +2107,8 @@ write_vmcoreinfo_data(void)
> 	WRITE_SYMBOL("_stext", _stext);
> 	WRITE_SYMBOL("swapper_pg_dir", swapper_pg_dir);
> 	WRITE_SYMBOL("init_level4_pgt", init_level4_pgt);
>+	WRITE_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
>+	WRITE_SYMBOL("init_top_pgt", init_top_pgt);
> 	WRITE_SYMBOL("vmlist", vmlist);
> 	WRITE_SYMBOL("vmap_area_list", vmap_area_list);
> 	WRITE_SYMBOL("node_online_map", node_online_map);
>@@ -2500,6 +2504,8 @@ read_vmcoreinfo(void)
> 	READ_SYMBOL("_stext", _stext);
> 	READ_SYMBOL("swapper_pg_dir", swapper_pg_dir);
> 	READ_SYMBOL("init_level4_pgt", init_level4_pgt);
>+	READ_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
>+	READ_SYMBOL("init_top_pgt", init_top_pgt);
> 	READ_SYMBOL("vmlist", vmlist);
> 	READ_SYMBOL("vmap_area_list", vmap_area_list);
> 	READ_SYMBOL("node_online_map", node_online_map);
>diff --git a/makedumpfile.h b/makedumpfile.h
>index 8a05794..9357e47 100644
>--- a/makedumpfile.h
>+++ b/makedumpfile.h
>@@ -1517,6 +1517,8 @@ struct symbol_table {
> 	unsigned long long	_stext;
> 	unsigned long long	swapper_pg_dir;
> 	unsigned long long	init_level4_pgt;
>+	unsigned long long	level4_kernel_pgt;
>+	unsigned long long	init_top_pgt;
> 	unsigned long long	vmlist;
> 	unsigned long long	vmap_area_list;
> 	unsigned long long	phys_base;
>
>
>--
>Jeff Mahoney
>SUSE Labs



_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

RE: [PATCH] handle renamed init_level4_pgt -> init_top_pgt

[Atsushi Kumagai]

>>Linux 4.13 renamed init_level4_pgt to init_top_pgt in preparation for
>>introducing 5-level page tables.  This patch follows the rename if
>>the lookup for init_level4_pgt fails.  It also checks to see if
>>5-level page tables are enabled and bails if it discovers they are.
>
>Thanks Jeff, but could you rebase it on the current devel branch ?
>vtop4 for x86_64 was modified in the commit below:
>
>commit 8c89727155f4994b4e75a659e28e5eff16ff6cbc
>Author: Takao Indoh <indou.takao@jp.fujitsu.com>
>Date:   Thu Oct 26 20:32:54 2017 +0900
>
>    [PATCH v3 2/4] Introduce vtop4_x86_64_pagetable
>
>Regards,
>Atsushi Kumagai

I rebased that and updated the devel branch:

https://sourceforge.net/p/makedumpfile/code/ci/97e156b493c46fabfc4b136ab834a6495166ac66/

I'll merge it into v1.6.3 if you have no comment.

Thanks,
Atsushi Kumagai

>>Signed-off-by: Jeff Mahoney <jeffm@suse.com>
>>---
>> arch/x86_64.c  | 24 +++++++++++++++++++++---
>> makedumpfile.c |  6 ++++++
>> makedumpfile.h |  2 ++
>> 3 files changed, 29 insertions(+), 3 deletions(-)
>>
>>diff --git a/arch/x86_64.c b/arch/x86_64.c
>>index 08dd6b2..9b09035 100644
>>--- a/arch/x86_64.c
>>+++ b/arch/x86_64.c
>>@@ -259,16 +259,26 @@ vtop4_x86_64(unsigned long vaddr)
>> {
>> 	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) {
>>+	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 = SYMBOL(init_level4_pgt) - __START_KERNEL_map + info->phys_base;
>>+	page_dir = init_level4_pgt - __START_KERNEL_map + info->phys_base;
>> 	if (is_xen_memory()) {
>> 		page_dir = ptom_xen(page_dir);
>> 		if (page_dir == NOT_PADDR)
>>@@ -549,8 +559,16 @@ find_vmemmap_x86_64()
>> 	struct vmap_pfns *vmapp, *vmaphead = NULL, *cur, *tail;
>>
>> 	init_level4_pgt = SYMBOL(init_level4_pgt);
>>+	if (init_level4_pgt == NOT_FOUND_SYMBOL)
>>+		init_level4_pgt = SYMBOL(init_top_pgt);
>>+
>> 	if (init_level4_pgt == NOT_FOUND_SYMBOL) {
>>-		ERRMSG("init_level4_pgt not found\n");
>>+		ERRMSG("init_level4_pgt/init_top_pgt not found\n");
>>+		return FAILED;
>>+	}
>>+
>>+	if (SYMBOL(level4_kernel_pgt) != NOT_FOUND_SYMBOL) {
>>+		ERRMSG("kernel is configured for 5-level page tables\n");
>> 		return FAILED;
>> 	}
>> 	pagestructsize = size_table.page;
>>diff --git a/makedumpfile.c b/makedumpfile.c
>>index f85003a..6e5ec34 100644
>>--- a/makedumpfile.c
>>+++ b/makedumpfile.c
>>@@ -1486,6 +1486,8 @@ get_symbol_info(void)
>> 	SYMBOL_INIT(_stext, "_stext");
>> 	SYMBOL_INIT(swapper_pg_dir, "swapper_pg_dir");
>> 	SYMBOL_INIT(init_level4_pgt, "init_level4_pgt");
>>+	SYMBOL_INIT(level4_kernel_pgt, "level4_kernel_pgt");
>>+	SYMBOL_INIT(init_top_pgt, "init_top_pgt");
>> 	SYMBOL_INIT(vmlist, "vmlist");
>> 	SYMBOL_INIT(vmap_area_list, "vmap_area_list");
>> 	SYMBOL_INIT(node_online_map, "node_online_map");
>>@@ -2105,6 +2107,8 @@ write_vmcoreinfo_data(void)
>> 	WRITE_SYMBOL("_stext", _stext);
>> 	WRITE_SYMBOL("swapper_pg_dir", swapper_pg_dir);
>> 	WRITE_SYMBOL("init_level4_pgt", init_level4_pgt);
>>+	WRITE_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
>>+	WRITE_SYMBOL("init_top_pgt", init_top_pgt);
>> 	WRITE_SYMBOL("vmlist", vmlist);
>> 	WRITE_SYMBOL("vmap_area_list", vmap_area_list);
>> 	WRITE_SYMBOL("node_online_map", node_online_map);
>>@@ -2500,6 +2504,8 @@ read_vmcoreinfo(void)
>> 	READ_SYMBOL("_stext", _stext);
>> 	READ_SYMBOL("swapper_pg_dir", swapper_pg_dir);
>> 	READ_SYMBOL("init_level4_pgt", init_level4_pgt);
>>+	READ_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
>>+	READ_SYMBOL("init_top_pgt", init_top_pgt);
>> 	READ_SYMBOL("vmlist", vmlist);
>> 	READ_SYMBOL("vmap_area_list", vmap_area_list);
>> 	READ_SYMBOL("node_online_map", node_online_map);
>>diff --git a/makedumpfile.h b/makedumpfile.h
>>index 8a05794..9357e47 100644
>>--- a/makedumpfile.h
>>+++ b/makedumpfile.h
>>@@ -1517,6 +1517,8 @@ struct symbol_table {
>> 	unsigned long long	_stext;
>> 	unsigned long long	swapper_pg_dir;
>> 	unsigned long long	init_level4_pgt;
>>+	unsigned long long	level4_kernel_pgt;
>>+	unsigned long long	init_top_pgt;
>> 	unsigned long long	vmlist;
>> 	unsigned long long	vmap_area_list;
>> 	unsigned long long	phys_base;
>>
>>
>>--
>>Jeff Mahoney
>>SUSE Labs
>
>
>
>_______________________________________________
>kexec mailing list
>kexec@lists.infradead.org
>http://lists.infradead.org/mailman/listinfo/kexec


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] handle renamed init_level4_pgt -> init_top_pgt

[Dave Young]

On 12/08/17 at 08:15am, Atsushi Kumagai wrote:
> >>Linux 4.13 renamed init_level4_pgt to init_top_pgt in preparation for
> >>introducing 5-level page tables.  This patch follows the rename if
> >>the lookup for init_level4_pgt fails.  It also checks to see if
> >>5-level page tables are enabled and bails if it discovers they are.
> >
> >Thanks Jeff, but could you rebase it on the current devel branch ?
> >vtop4 for x86_64 was modified in the commit below:
> >
> >commit 8c89727155f4994b4e75a659e28e5eff16ff6cbc
> >Author: Takao Indoh <indou.takao@jp.fujitsu.com>
> >Date:   Thu Oct 26 20:32:54 2017 +0900
> >
> >    [PATCH v3 2/4] Introduce vtop4_x86_64_pagetable
> >
> >Regards,
> >Atsushi Kumagai
> 
> I rebased that and updated the devel branch:
> 
> https://sourceforge.net/p/makedumpfile/code/ci/97e156b493c46fabfc4b136ab834a6495166ac66/
> 
> I'll merge it into v1.6.3 if you have no comment.

[dyoung@dhcp-*-* makedumpfile]$ sudo ./makedumpfile -l -d 31 /mnt/vmcore/vmcore /tmp/vmcore.1
The kernel version is not supported.
The makedumpfile operation may be incomplete.
Checking for memory holes                         : [100.0 %] |                  __vtop4_x86_64: Can't get a valid pte.
readmem: Can't convert a virtual address(ffff88007ebb1000) to physical address.
readmem: type_addr: 0, addr:ffff88007ebb1000, size:32768
__exclude_unnecessary_pages: Can't read the buffer of struct page.
create_2nd_bitmap: Can't exclude unnecessary pages.

makedumpfile Failed.

If you need the vmcore for debugging please let me know, my test is just
a normal test in kvm guest.

> 
> Thanks,
> Atsushi Kumagai
> 
> >>Signed-off-by: Jeff Mahoney <jeffm@suse.com>
> >>---
> >> arch/x86_64.c  | 24 +++++++++++++++++++++---
> >> makedumpfile.c |  6 ++++++
> >> makedumpfile.h |  2 ++
> >> 3 files changed, 29 insertions(+), 3 deletions(-)
> >>
> >>diff --git a/arch/x86_64.c b/arch/x86_64.c
> >>index 08dd6b2..9b09035 100644
> >>--- a/arch/x86_64.c
> >>+++ b/arch/x86_64.c
> >>@@ -259,16 +259,26 @@ vtop4_x86_64(unsigned long vaddr)
> >> {
> >> 	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) {
> >>+	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 = SYMBOL(init_level4_pgt) - __START_KERNEL_map + info->phys_base;
> >>+	page_dir = init_level4_pgt - __START_KERNEL_map + info->phys_base;
> >> 	if (is_xen_memory()) {
> >> 		page_dir = ptom_xen(page_dir);
> >> 		if (page_dir == NOT_PADDR)
> >>@@ -549,8 +559,16 @@ find_vmemmap_x86_64()
> >> 	struct vmap_pfns *vmapp, *vmaphead = NULL, *cur, *tail;
> >>
> >> 	init_level4_pgt = SYMBOL(init_level4_pgt);
> >>+	if (init_level4_pgt == NOT_FOUND_SYMBOL)
> >>+		init_level4_pgt = SYMBOL(init_top_pgt);
> >>+
> >> 	if (init_level4_pgt == NOT_FOUND_SYMBOL) {
> >>-		ERRMSG("init_level4_pgt not found\n");
> >>+		ERRMSG("init_level4_pgt/init_top_pgt not found\n");
> >>+		return FAILED;
> >>+	}
> >>+
> >>+	if (SYMBOL(level4_kernel_pgt) != NOT_FOUND_SYMBOL) {
> >>+		ERRMSG("kernel is configured for 5-level page tables\n");
> >> 		return FAILED;
> >> 	}
> >> 	pagestructsize = size_table.page;
> >>diff --git a/makedumpfile.c b/makedumpfile.c
> >>index f85003a..6e5ec34 100644
> >>--- a/makedumpfile.c
> >>+++ b/makedumpfile.c
> >>@@ -1486,6 +1486,8 @@ get_symbol_info(void)
> >> 	SYMBOL_INIT(_stext, "_stext");
> >> 	SYMBOL_INIT(swapper_pg_dir, "swapper_pg_dir");
> >> 	SYMBOL_INIT(init_level4_pgt, "init_level4_pgt");
> >>+	SYMBOL_INIT(level4_kernel_pgt, "level4_kernel_pgt");
> >>+	SYMBOL_INIT(init_top_pgt, "init_top_pgt");
> >> 	SYMBOL_INIT(vmlist, "vmlist");
> >> 	SYMBOL_INIT(vmap_area_list, "vmap_area_list");
> >> 	SYMBOL_INIT(node_online_map, "node_online_map");
> >>@@ -2105,6 +2107,8 @@ write_vmcoreinfo_data(void)
> >> 	WRITE_SYMBOL("_stext", _stext);
> >> 	WRITE_SYMBOL("swapper_pg_dir", swapper_pg_dir);
> >> 	WRITE_SYMBOL("init_level4_pgt", init_level4_pgt);
> >>+	WRITE_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
> >>+	WRITE_SYMBOL("init_top_pgt", init_top_pgt);
> >> 	WRITE_SYMBOL("vmlist", vmlist);
> >> 	WRITE_SYMBOL("vmap_area_list", vmap_area_list);
> >> 	WRITE_SYMBOL("node_online_map", node_online_map);
> >>@@ -2500,6 +2504,8 @@ read_vmcoreinfo(void)
> >> 	READ_SYMBOL("_stext", _stext);
> >> 	READ_SYMBOL("swapper_pg_dir", swapper_pg_dir);
> >> 	READ_SYMBOL("init_level4_pgt", init_level4_pgt);
> >>+	READ_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
> >>+	READ_SYMBOL("init_top_pgt", init_top_pgt);
> >> 	READ_SYMBOL("vmlist", vmlist);
> >> 	READ_SYMBOL("vmap_area_list", vmap_area_list);
> >> 	READ_SYMBOL("node_online_map", node_online_map);
> >>diff --git a/makedumpfile.h b/makedumpfile.h
> >>index 8a05794..9357e47 100644
> >>--- a/makedumpfile.h
> >>+++ b/makedumpfile.h
> >>@@ -1517,6 +1517,8 @@ struct symbol_table {
> >> 	unsigned long long	_stext;
> >> 	unsigned long long	swapper_pg_dir;
> >> 	unsigned long long	init_level4_pgt;
> >>+	unsigned long long	level4_kernel_pgt;
> >>+	unsigned long long	init_top_pgt;
> >> 	unsigned long long	vmlist;
> >> 	unsigned long long	vmap_area_list;
> >> 	unsigned long long	phys_base;
> >>
> >>
> >>--
> >>Jeff Mahoney
> >>SUSE Labs
> >
> >
> >
> >_______________________________________________
> >kexec mailing list
> >kexec@lists.infradead.org
> >http://lists.infradead.org/mailman/listinfo/kexec
> 
> 
> _______________________________________________
> kexec mailing list
> kexec@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/kexec

Thanks
Dave

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

RE: [PATCH] handle renamed init_level4_pgt -> init_top_pgt

[Atsushi Kumagai]

Hello Dave,

>[dyoung@dhcp-*-* makedumpfile]$ sudo ./makedumpfile -l -d 31 /mnt/vmcore/vmcore /tmp/vmcore.1
>The kernel version is not supported.
>The makedumpfile operation may be incomplete.
>Checking for memory holes                         : [100.0 %] |                  __vtop4_x86_64: Can't get a valid pte.
>readmem: Can't convert a virtual address(ffff88007ebb1000) to physical address.
>readmem: type_addr: 0, addr:ffff88007ebb1000, size:32768
>__exclude_unnecessary_pages: Can't read the buffer of struct page.
>create_2nd_bitmap: Can't exclude unnecessary pages.
>
>makedumpfile Failed.
>
>If you need the vmcore for debugging please let me know, my test is just
>a normal test in kvm guest.

Thanks for your report.
I can't reproduce that in my environment, could you give me the vmcore ?
It's helpful if you append the vmlinux and the .config.

Thanks,
Atsushi Kumagai

>> >>Signed-off-by: Jeff Mahoney <jeffm@suse.com>
>> >>---
>> >> arch/x86_64.c  | 24 +++++++++++++++++++++---
>> >> makedumpfile.c |  6 ++++++
>> >> makedumpfile.h |  2 ++
>> >> 3 files changed, 29 insertions(+), 3 deletions(-)
>> >>
>> >>diff --git a/arch/x86_64.c b/arch/x86_64.c
>> >>index 08dd6b2..9b09035 100644
>> >>--- a/arch/x86_64.c
>> >>+++ b/arch/x86_64.c
>> >>@@ -259,16 +259,26 @@ vtop4_x86_64(unsigned long vaddr)
>> >> {
>> >> 	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) {
>> >>+	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 = SYMBOL(init_level4_pgt) - __START_KERNEL_map + info->phys_base;
>> >>+	page_dir = init_level4_pgt - __START_KERNEL_map + info->phys_base;
>> >> 	if (is_xen_memory()) {
>> >> 		page_dir = ptom_xen(page_dir);
>> >> 		if (page_dir == NOT_PADDR)
>> >>@@ -549,8 +559,16 @@ find_vmemmap_x86_64()
>> >> 	struct vmap_pfns *vmapp, *vmaphead = NULL, *cur, *tail;
>> >>
>> >> 	init_level4_pgt = SYMBOL(init_level4_pgt);
>> >>+	if (init_level4_pgt == NOT_FOUND_SYMBOL)
>> >>+		init_level4_pgt = SYMBOL(init_top_pgt);
>> >>+
>> >> 	if (init_level4_pgt == NOT_FOUND_SYMBOL) {
>> >>-		ERRMSG("init_level4_pgt not found\n");
>> >>+		ERRMSG("init_level4_pgt/init_top_pgt not found\n");
>> >>+		return FAILED;
>> >>+	}
>> >>+
>> >>+	if (SYMBOL(level4_kernel_pgt) != NOT_FOUND_SYMBOL) {
>> >>+		ERRMSG("kernel is configured for 5-level page tables\n");
>> >> 		return FAILED;
>> >> 	}
>> >> 	pagestructsize = size_table.page;
>> >>diff --git a/makedumpfile.c b/makedumpfile.c
>> >>index f85003a..6e5ec34 100644
>> >>--- a/makedumpfile.c
>> >>+++ b/makedumpfile.c
>> >>@@ -1486,6 +1486,8 @@ get_symbol_info(void)
>> >> 	SYMBOL_INIT(_stext, "_stext");
>> >> 	SYMBOL_INIT(swapper_pg_dir, "swapper_pg_dir");
>> >> 	SYMBOL_INIT(init_level4_pgt, "init_level4_pgt");
>> >>+	SYMBOL_INIT(level4_kernel_pgt, "level4_kernel_pgt");
>> >>+	SYMBOL_INIT(init_top_pgt, "init_top_pgt");
>> >> 	SYMBOL_INIT(vmlist, "vmlist");
>> >> 	SYMBOL_INIT(vmap_area_list, "vmap_area_list");
>> >> 	SYMBOL_INIT(node_online_map, "node_online_map");
>> >>@@ -2105,6 +2107,8 @@ write_vmcoreinfo_data(void)
>> >> 	WRITE_SYMBOL("_stext", _stext);
>> >> 	WRITE_SYMBOL("swapper_pg_dir", swapper_pg_dir);
>> >> 	WRITE_SYMBOL("init_level4_pgt", init_level4_pgt);
>> >>+	WRITE_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
>> >>+	WRITE_SYMBOL("init_top_pgt", init_top_pgt);
>> >> 	WRITE_SYMBOL("vmlist", vmlist);
>> >> 	WRITE_SYMBOL("vmap_area_list", vmap_area_list);
>> >> 	WRITE_SYMBOL("node_online_map", node_online_map);
>> >>@@ -2500,6 +2504,8 @@ read_vmcoreinfo(void)
>> >> 	READ_SYMBOL("_stext", _stext);
>> >> 	READ_SYMBOL("swapper_pg_dir", swapper_pg_dir);
>> >> 	READ_SYMBOL("init_level4_pgt", init_level4_pgt);
>> >>+	READ_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
>> >>+	READ_SYMBOL("init_top_pgt", init_top_pgt);
>> >> 	READ_SYMBOL("vmlist", vmlist);
>> >> 	READ_SYMBOL("vmap_area_list", vmap_area_list);
>> >> 	READ_SYMBOL("node_online_map", node_online_map);
>> >>diff --git a/makedumpfile.h b/makedumpfile.h
>> >>index 8a05794..9357e47 100644
>> >>--- a/makedumpfile.h
>> >>+++ b/makedumpfile.h
>> >>@@ -1517,6 +1517,8 @@ struct symbol_table {
>> >> 	unsigned long long	_stext;
>> >> 	unsigned long long	swapper_pg_dir;
>> >> 	unsigned long long	init_level4_pgt;
>> >>+	unsigned long long	level4_kernel_pgt;
>> >>+	unsigned long long	init_top_pgt;
>> >> 	unsigned long long	vmlist;
>> >> 	unsigned long long	vmap_area_list;
>> >> 	unsigned long long	phys_base;
>> >>
>> >>
>> >>--
>> >>Jeff Mahoney
>> >>SUSE Labs
>> >
>> >
>> >
>> >_______________________________________________
>> >kexec mailing list
>> >kexec@lists.infradead.org
>> >http://lists.infradead.org/mailman/listinfo/kexec
>>
>>
>> _______________________________________________
>> kexec mailing list
>> kexec@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/kexec
>
>Thanks
>Dave



_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] handle renamed init_level4_pgt -> init_top_pgt

[Dave Young]

Hi Atsushi,
On 12/21/17 at 08:48am, Atsushi Kumagai wrote:
> Hello Dave,
> 
> >[dyoung@dhcp-*-* makedumpfile]$ sudo ./makedumpfile -l -d 31 /mnt/vmcore/vmcore /tmp/vmcore.1
> >The kernel version is not supported.
> >The makedumpfile operation may be incomplete.
> >Checking for memory holes                         : [100.0 %] |                  __vtop4_x86_64: Can't get a valid pte.
> >readmem: Can't convert a virtual address(ffff88007ebb1000) to physical address.
> >readmem: type_addr: 0, addr:ffff88007ebb1000, size:32768
> >__exclude_unnecessary_pages: Can't read the buffer of struct page.
> >create_2nd_bitmap: Can't exclude unnecessary pages.
> >
> >makedumpfile Failed.
> >
> >If you need the vmcore for debugging please let me know, my test is just
> >a normal test in kvm guest.
> 
> Thanks for your report.
> I can't reproduce that in my environment, could you give me the vmcore ?
> It's helpful if you append the vmlinux and the .config.

I'm bisecting it, nearly finished, will post the results and share
vmcore if needed soon.

> 
> Thanks,
> Atsushi Kumagai
> 
> >> >>Signed-off-by: Jeff Mahoney <jeffm@suse.com>
> >> >>---
> >> >> arch/x86_64.c  | 24 +++++++++++++++++++++---
> >> >> makedumpfile.c |  6 ++++++
> >> >> makedumpfile.h |  2 ++
> >> >> 3 files changed, 29 insertions(+), 3 deletions(-)
> >> >>
> >> >>diff --git a/arch/x86_64.c b/arch/x86_64.c
> >> >>index 08dd6b2..9b09035 100644
> >> >>--- a/arch/x86_64.c
> >> >>+++ b/arch/x86_64.c
> >> >>@@ -259,16 +259,26 @@ vtop4_x86_64(unsigned long vaddr)
> >> >> {
> >> >> 	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) {
> >> >>+	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 = SYMBOL(init_level4_pgt) - __START_KERNEL_map + info->phys_base;
> >> >>+	page_dir = init_level4_pgt - __START_KERNEL_map + info->phys_base;
> >> >> 	if (is_xen_memory()) {
> >> >> 		page_dir = ptom_xen(page_dir);
> >> >> 		if (page_dir == NOT_PADDR)
> >> >>@@ -549,8 +559,16 @@ find_vmemmap_x86_64()
> >> >> 	struct vmap_pfns *vmapp, *vmaphead = NULL, *cur, *tail;
> >> >>
> >> >> 	init_level4_pgt = SYMBOL(init_level4_pgt);
> >> >>+	if (init_level4_pgt == NOT_FOUND_SYMBOL)
> >> >>+		init_level4_pgt = SYMBOL(init_top_pgt);
> >> >>+
> >> >> 	if (init_level4_pgt == NOT_FOUND_SYMBOL) {
> >> >>-		ERRMSG("init_level4_pgt not found\n");
> >> >>+		ERRMSG("init_level4_pgt/init_top_pgt not found\n");
> >> >>+		return FAILED;
> >> >>+	}
> >> >>+
> >> >>+	if (SYMBOL(level4_kernel_pgt) != NOT_FOUND_SYMBOL) {
> >> >>+		ERRMSG("kernel is configured for 5-level page tables\n");
> >> >> 		return FAILED;
> >> >> 	}
> >> >> 	pagestructsize = size_table.page;
> >> >>diff --git a/makedumpfile.c b/makedumpfile.c
> >> >>index f85003a..6e5ec34 100644
> >> >>--- a/makedumpfile.c
> >> >>+++ b/makedumpfile.c
> >> >>@@ -1486,6 +1486,8 @@ get_symbol_info(void)
> >> >> 	SYMBOL_INIT(_stext, "_stext");
> >> >> 	SYMBOL_INIT(swapper_pg_dir, "swapper_pg_dir");
> >> >> 	SYMBOL_INIT(init_level4_pgt, "init_level4_pgt");
> >> >>+	SYMBOL_INIT(level4_kernel_pgt, "level4_kernel_pgt");
> >> >>+	SYMBOL_INIT(init_top_pgt, "init_top_pgt");
> >> >> 	SYMBOL_INIT(vmlist, "vmlist");
> >> >> 	SYMBOL_INIT(vmap_area_list, "vmap_area_list");
> >> >> 	SYMBOL_INIT(node_online_map, "node_online_map");
> >> >>@@ -2105,6 +2107,8 @@ write_vmcoreinfo_data(void)
> >> >> 	WRITE_SYMBOL("_stext", _stext);
> >> >> 	WRITE_SYMBOL("swapper_pg_dir", swapper_pg_dir);
> >> >> 	WRITE_SYMBOL("init_level4_pgt", init_level4_pgt);
> >> >>+	WRITE_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
> >> >>+	WRITE_SYMBOL("init_top_pgt", init_top_pgt);
> >> >> 	WRITE_SYMBOL("vmlist", vmlist);
> >> >> 	WRITE_SYMBOL("vmap_area_list", vmap_area_list);
> >> >> 	WRITE_SYMBOL("node_online_map", node_online_map);
> >> >>@@ -2500,6 +2504,8 @@ read_vmcoreinfo(void)
> >> >> 	READ_SYMBOL("_stext", _stext);
> >> >> 	READ_SYMBOL("swapper_pg_dir", swapper_pg_dir);
> >> >> 	READ_SYMBOL("init_level4_pgt", init_level4_pgt);
> >> >>+	READ_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
> >> >>+	READ_SYMBOL("init_top_pgt", init_top_pgt);
> >> >> 	READ_SYMBOL("vmlist", vmlist);
> >> >> 	READ_SYMBOL("vmap_area_list", vmap_area_list);
> >> >> 	READ_SYMBOL("node_online_map", node_online_map);
> >> >>diff --git a/makedumpfile.h b/makedumpfile.h
> >> >>index 8a05794..9357e47 100644
> >> >>--- a/makedumpfile.h
> >> >>+++ b/makedumpfile.h
> >> >>@@ -1517,6 +1517,8 @@ struct symbol_table {
> >> >> 	unsigned long long	_stext;
> >> >> 	unsigned long long	swapper_pg_dir;
> >> >> 	unsigned long long	init_level4_pgt;
> >> >>+	unsigned long long	level4_kernel_pgt;
> >> >>+	unsigned long long	init_top_pgt;
> >> >> 	unsigned long long	vmlist;
> >> >> 	unsigned long long	vmap_area_list;
> >> >> 	unsigned long long	phys_base;
> >> >>
> >> >>
> >> >>--
> >> >>Jeff Mahoney
> >> >>SUSE Labs
> >> >
> >> >
> >> >
> >> >_______________________________________________
> >> >kexec mailing list
> >> >kexec@lists.infradead.org
> >> >http://lists.infradead.org/mailman/listinfo/kexec
> >>
> >>
> >> _______________________________________________
> >> kexec mailing list
> >> kexec@lists.infradead.org
> >> http://lists.infradead.org/mailman/listinfo/kexec
> >
> >Thanks
> >Dave
> 
> 

Thanks
Dave

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] handle renamed init_level4_pgt -> init_top_pgt

[Dave Young]

On 12/22/17 at 12:54pm, Dave Young wrote:
> Hi Atsushi,
> On 12/21/17 at 08:48am, Atsushi Kumagai wrote:
> > Hello Dave,
> > 
> > >[dyoung@dhcp-*-* makedumpfile]$ sudo ./makedumpfile -l -d 31 /mnt/vmcore/vmcore /tmp/vmcore.1
> > >The kernel version is not supported.
> > >The makedumpfile operation may be incomplete.
> > >Checking for memory holes                         : [100.0 %] |                  __vtop4_x86_64: Can't get a valid pte.
> > >readmem: Can't convert a virtual address(ffff88007ebb1000) to physical address.
> > >readmem: type_addr: 0, addr:ffff88007ebb1000, size:32768
> > >__exclude_unnecessary_pages: Can't read the buffer of struct page.
> > >create_2nd_bitmap: Can't exclude unnecessary pages.
> > >
> > >makedumpfile Failed.
> > >
> > >If you need the vmcore for debugging please let me know, my test is just
> > >a normal test in kvm guest.
> > 
> > Thanks for your report.
> > I can't reproduce that in my environment, could you give me the vmcore ?
> > It's helpful if you append the vmlinux and the .config.
> 
> I'm bisecting it, nearly finished, will post the results and share
> vmcore if needed soon.

vmcore/vmlinux (gzipped) and .config:
http://people.redhat.com/ruyang/rhbz1528542/

Bisect result is below:

83e3c48729d9ebb7af5a31a504f3fd6aff0348c4 is the first bad commit
commit 83e3c48729d9ebb7af5a31a504f3fd6aff0348c4
Author: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Date:   Fri Sep 29 17:08:16 2017 +0300

    mm/sparsemem: Allocate mem_section at runtime for CONFIG_SPARSEMEM_EXTREME=y
    
    Size of the mem_section[] array depends on the size of the physical address space.
    
    In preparation for boot-time switching between paging modes on x86-64
    we need to make the allocation of mem_section[] dynamic, because otherwise
    we waste a lot of RAM: with CONFIG_NODE_SHIFT=10, mem_section[] size is 32kB
    for 4-level paging and 2MB for 5-level paging mode.
    
    The patch allocates the array on the first call to sparse_memory_present_with_active_regions().
    
    Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Andy Lutomirski <luto@amacapital.net>
    Cc: Borislav Petkov <bp@suse.de>
    Cc: Cyrill Gorcunov <gorcunov@openvz.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: linux-mm@kvack.org
    Link: http://lkml.kernel.org/r/20170929140821.37654-2-kirill.shutemov@linux.intel.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>

:040000 040000 68b7ff3eedc2c9ff56e31108f7e982eacbb233fc 0014ee63bebe14efb0e36e0028e2cbe718fd6c30 M	include
:040000 040000 78adbc296527c802400b1f68e0fbd716920726fa a4eea8117cb318527c0d5a6281d68f312f644831 M	mm

> 
> > 
> > Thanks,
> > Atsushi Kumagai
> > 
> > >> >>Signed-off-by: Jeff Mahoney <jeffm@suse.com>
> > >> >>---
> > >> >> arch/x86_64.c  | 24 +++++++++++++++++++++---
> > >> >> makedumpfile.c |  6 ++++++
> > >> >> makedumpfile.h |  2 ++
> > >> >> 3 files changed, 29 insertions(+), 3 deletions(-)
> > >> >>
> > >> >>diff --git a/arch/x86_64.c b/arch/x86_64.c
> > >> >>index 08dd6b2..9b09035 100644
> > >> >>--- a/arch/x86_64.c
> > >> >>+++ b/arch/x86_64.c
> > >> >>@@ -259,16 +259,26 @@ vtop4_x86_64(unsigned long vaddr)
> > >> >> {
> > >> >> 	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) {
> > >> >>+	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 = SYMBOL(init_level4_pgt) - __START_KERNEL_map + info->phys_base;
> > >> >>+	page_dir = init_level4_pgt - __START_KERNEL_map + info->phys_base;
> > >> >> 	if (is_xen_memory()) {
> > >> >> 		page_dir = ptom_xen(page_dir);
> > >> >> 		if (page_dir == NOT_PADDR)
> > >> >>@@ -549,8 +559,16 @@ find_vmemmap_x86_64()
> > >> >> 	struct vmap_pfns *vmapp, *vmaphead = NULL, *cur, *tail;
> > >> >>
> > >> >> 	init_level4_pgt = SYMBOL(init_level4_pgt);
> > >> >>+	if (init_level4_pgt == NOT_FOUND_SYMBOL)
> > >> >>+		init_level4_pgt = SYMBOL(init_top_pgt);
> > >> >>+
> > >> >> 	if (init_level4_pgt == NOT_FOUND_SYMBOL) {
> > >> >>-		ERRMSG("init_level4_pgt not found\n");
> > >> >>+		ERRMSG("init_level4_pgt/init_top_pgt not found\n");
> > >> >>+		return FAILED;
> > >> >>+	}
> > >> >>+
> > >> >>+	if (SYMBOL(level4_kernel_pgt) != NOT_FOUND_SYMBOL) {
> > >> >>+		ERRMSG("kernel is configured for 5-level page tables\n");
> > >> >> 		return FAILED;
> > >> >> 	}
> > >> >> 	pagestructsize = size_table.page;
> > >> >>diff --git a/makedumpfile.c b/makedumpfile.c
> > >> >>index f85003a..6e5ec34 100644
> > >> >>--- a/makedumpfile.c
> > >> >>+++ b/makedumpfile.c
> > >> >>@@ -1486,6 +1486,8 @@ get_symbol_info(void)
> > >> >> 	SYMBOL_INIT(_stext, "_stext");
> > >> >> 	SYMBOL_INIT(swapper_pg_dir, "swapper_pg_dir");
> > >> >> 	SYMBOL_INIT(init_level4_pgt, "init_level4_pgt");
> > >> >>+	SYMBOL_INIT(level4_kernel_pgt, "level4_kernel_pgt");
> > >> >>+	SYMBOL_INIT(init_top_pgt, "init_top_pgt");
> > >> >> 	SYMBOL_INIT(vmlist, "vmlist");
> > >> >> 	SYMBOL_INIT(vmap_area_list, "vmap_area_list");
> > >> >> 	SYMBOL_INIT(node_online_map, "node_online_map");
> > >> >>@@ -2105,6 +2107,8 @@ write_vmcoreinfo_data(void)
> > >> >> 	WRITE_SYMBOL("_stext", _stext);
> > >> >> 	WRITE_SYMBOL("swapper_pg_dir", swapper_pg_dir);
> > >> >> 	WRITE_SYMBOL("init_level4_pgt", init_level4_pgt);
> > >> >>+	WRITE_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
> > >> >>+	WRITE_SYMBOL("init_top_pgt", init_top_pgt);
> > >> >> 	WRITE_SYMBOL("vmlist", vmlist);
> > >> >> 	WRITE_SYMBOL("vmap_area_list", vmap_area_list);
> > >> >> 	WRITE_SYMBOL("node_online_map", node_online_map);
> > >> >>@@ -2500,6 +2504,8 @@ read_vmcoreinfo(void)
> > >> >> 	READ_SYMBOL("_stext", _stext);
> > >> >> 	READ_SYMBOL("swapper_pg_dir", swapper_pg_dir);
> > >> >> 	READ_SYMBOL("init_level4_pgt", init_level4_pgt);
> > >> >>+	READ_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
> > >> >>+	READ_SYMBOL("init_top_pgt", init_top_pgt);
> > >> >> 	READ_SYMBOL("vmlist", vmlist);
> > >> >> 	READ_SYMBOL("vmap_area_list", vmap_area_list);
> > >> >> 	READ_SYMBOL("node_online_map", node_online_map);
> > >> >>diff --git a/makedumpfile.h b/makedumpfile.h
> > >> >>index 8a05794..9357e47 100644
> > >> >>--- a/makedumpfile.h
> > >> >>+++ b/makedumpfile.h
> > >> >>@@ -1517,6 +1517,8 @@ struct symbol_table {
> > >> >> 	unsigned long long	_stext;
> > >> >> 	unsigned long long	swapper_pg_dir;
> > >> >> 	unsigned long long	init_level4_pgt;
> > >> >>+	unsigned long long	level4_kernel_pgt;
> > >> >>+	unsigned long long	init_top_pgt;
> > >> >> 	unsigned long long	vmlist;
> > >> >> 	unsigned long long	vmap_area_list;
> > >> >> 	unsigned long long	phys_base;
> > >> >>
> > >> >>
> > >> >>--
> > >> >>Jeff Mahoney
> > >> >>SUSE Labs
> > >> >
> > >> >
> > >> >
> > >> >_______________________________________________
> > >> >kexec mailing list
> > >> >kexec@lists.infradead.org
> > >> >http://lists.infradead.org/mailman/listinfo/kexec
> > >>
> > >>
> > >> _______________________________________________
> > >> kexec mailing list
> > >> kexec@lists.infradead.org
> > >> http://lists.infradead.org/mailman/listinfo/kexec
> > >
> > >Thanks
> > >Dave
> > 
> > 
> 
> Thanks
> Dave

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

RE: [PATCH] handle renamed init_level4_pgt -> init_top_pgt

[Atsushi Kumagai]

>On 12/22/17 at 12:54pm, Dave Young wrote:
>> Hi Atsushi,
>> On 12/21/17 at 08:48am, Atsushi Kumagai wrote:
>> > Hello Dave,
>> >
>> > >[dyoung@dhcp-*-* makedumpfile]$ sudo ./makedumpfile -l -d 31 /mnt/vmcore/vmcore /tmp/vmcore.1
>> > >The kernel version is not supported.
>> > >The makedumpfile operation may be incomplete.
>> > >Checking for memory holes                         : [100.0 %] |                  __vtop4_x86_64: Can't get a valid
>pte.
>> > >readmem: Can't convert a virtual address(ffff88007ebb1000) to physical address.
>> > >readmem: type_addr: 0, addr:ffff88007ebb1000, size:32768
>> > >__exclude_unnecessary_pages: Can't read the buffer of struct page.
>> > >create_2nd_bitmap: Can't exclude unnecessary pages.
>> > >
>> > >makedumpfile Failed.
>> > >
>> > >If you need the vmcore for debugging please let me know, my test is just
>> > >a normal test in kvm guest.
>> >
>> > Thanks for your report.
>> > I can't reproduce that in my environment, could you give me the vmcore ?
>> > It's helpful if you append the vmlinux and the .config.
>>
>> I'm bisecting it, nearly finished, will post the results and share
>> vmcore if needed soon.
>
>vmcore/vmlinux (gzipped) and .config:
>http://people.redhat.com/ruyang/rhbz1528542/

Thanks.

>Bisect result is below:

I'm not sure why this commit affects makedumpfile yet, but
I'll give priority to release v1.6.3 since the commit will not be included
in the supported kernel(4.14).

Regards,
Atsushi Kumagai

>83e3c48729d9ebb7af5a31a504f3fd6aff0348c4 is the first bad commit
>commit 83e3c48729d9ebb7af5a31a504f3fd6aff0348c4
>Author: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
>Date:   Fri Sep 29 17:08:16 2017 +0300
>
>    mm/sparsemem: Allocate mem_section at runtime for CONFIG_SPARSEMEM_EXTREME=y
>
>    Size of the mem_section[] array depends on the size of the physical address space.
>
>    In preparation for boot-time switching between paging modes on x86-64
>    we need to make the allocation of mem_section[] dynamic, because otherwise
>    we waste a lot of RAM: with CONFIG_NODE_SHIFT=10, mem_section[] size is 32kB
>    for 4-level paging and 2MB for 5-level paging mode.
>
>    The patch allocates the array on the first call to sparse_memory_present_with_active_regions().
>
>    Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
>    Cc: Andrew Morton <akpm@linux-foundation.org>
>    Cc: Andy Lutomirski <luto@amacapital.net>
>    Cc: Borislav Petkov <bp@suse.de>
>    Cc: Cyrill Gorcunov <gorcunov@openvz.org>
>    Cc: Linus Torvalds <torvalds@linux-foundation.org>
>    Cc: Peter Zijlstra <peterz@infradead.org>
>    Cc: Thomas Gleixner <tglx@linutronix.de>
>    Cc: linux-mm@kvack.org
>    Link: http://lkml.kernel.org/r/20170929140821.37654-2-kirill.shutemov@linux.intel.com
>    Signed-off-by: Ingo Molnar <mingo@kernel.org>
>
>:040000 040000 68b7ff3eedc2c9ff56e31108f7e982eacbb233fc 0014ee63bebe14efb0e36e0028e2cbe718fd6c30 M	include
>:040000 040000 78adbc296527c802400b1f68e0fbd716920726fa a4eea8117cb318527c0d5a6281d68f312f644831 M	mm
>
>>
>> >
>> > Thanks,
>> > Atsushi Kumagai
>> >
>> > >> >>Signed-off-by: Jeff Mahoney <jeffm@suse.com>
>> > >> >>---
>> > >> >> arch/x86_64.c  | 24 +++++++++++++++++++++---
>> > >> >> makedumpfile.c |  6 ++++++
>> > >> >> makedumpfile.h |  2 ++
>> > >> >> 3 files changed, 29 insertions(+), 3 deletions(-)
>> > >> >>
>> > >> >>diff --git a/arch/x86_64.c b/arch/x86_64.c
>> > >> >>index 08dd6b2..9b09035 100644
>> > >> >>--- a/arch/x86_64.c
>> > >> >>+++ b/arch/x86_64.c
>> > >> >>@@ -259,16 +259,26 @@ vtop4_x86_64(unsigned long vaddr)
>> > >> >> {
>> > >> >> 	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) {
>> > >> >>+	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 = SYMBOL(init_level4_pgt) - __START_KERNEL_map + info->phys_base;
>> > >> >>+	page_dir = init_level4_pgt - __START_KERNEL_map + info->phys_base;
>> > >> >> 	if (is_xen_memory()) {
>> > >> >> 		page_dir = ptom_xen(page_dir);
>> > >> >> 		if (page_dir == NOT_PADDR)
>> > >> >>@@ -549,8 +559,16 @@ find_vmemmap_x86_64()
>> > >> >> 	struct vmap_pfns *vmapp, *vmaphead = NULL, *cur, *tail;
>> > >> >>
>> > >> >> 	init_level4_pgt = SYMBOL(init_level4_pgt);
>> > >> >>+	if (init_level4_pgt == NOT_FOUND_SYMBOL)
>> > >> >>+		init_level4_pgt = SYMBOL(init_top_pgt);
>> > >> >>+
>> > >> >> 	if (init_level4_pgt == NOT_FOUND_SYMBOL) {
>> > >> >>-		ERRMSG("init_level4_pgt not found\n");
>> > >> >>+		ERRMSG("init_level4_pgt/init_top_pgt not found\n");
>> > >> >>+		return FAILED;
>> > >> >>+	}
>> > >> >>+
>> > >> >>+	if (SYMBOL(level4_kernel_pgt) != NOT_FOUND_SYMBOL) {
>> > >> >>+		ERRMSG("kernel is configured for 5-level page tables\n");
>> > >> >> 		return FAILED;
>> > >> >> 	}
>> > >> >> 	pagestructsize = size_table.page;
>> > >> >>diff --git a/makedumpfile.c b/makedumpfile.c
>> > >> >>index f85003a..6e5ec34 100644
>> > >> >>--- a/makedumpfile.c
>> > >> >>+++ b/makedumpfile.c
>> > >> >>@@ -1486,6 +1486,8 @@ get_symbol_info(void)
>> > >> >> 	SYMBOL_INIT(_stext, "_stext");
>> > >> >> 	SYMBOL_INIT(swapper_pg_dir, "swapper_pg_dir");
>> > >> >> 	SYMBOL_INIT(init_level4_pgt, "init_level4_pgt");
>> > >> >>+	SYMBOL_INIT(level4_kernel_pgt, "level4_kernel_pgt");
>> > >> >>+	SYMBOL_INIT(init_top_pgt, "init_top_pgt");
>> > >> >> 	SYMBOL_INIT(vmlist, "vmlist");
>> > >> >> 	SYMBOL_INIT(vmap_area_list, "vmap_area_list");
>> > >> >> 	SYMBOL_INIT(node_online_map, "node_online_map");
>> > >> >>@@ -2105,6 +2107,8 @@ write_vmcoreinfo_data(void)
>> > >> >> 	WRITE_SYMBOL("_stext", _stext);
>> > >> >> 	WRITE_SYMBOL("swapper_pg_dir", swapper_pg_dir);
>> > >> >> 	WRITE_SYMBOL("init_level4_pgt", init_level4_pgt);
>> > >> >>+	WRITE_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
>> > >> >>+	WRITE_SYMBOL("init_top_pgt", init_top_pgt);
>> > >> >> 	WRITE_SYMBOL("vmlist", vmlist);
>> > >> >> 	WRITE_SYMBOL("vmap_area_list", vmap_area_list);
>> > >> >> 	WRITE_SYMBOL("node_online_map", node_online_map);
>> > >> >>@@ -2500,6 +2504,8 @@ read_vmcoreinfo(void)
>> > >> >> 	READ_SYMBOL("_stext", _stext);
>> > >> >> 	READ_SYMBOL("swapper_pg_dir", swapper_pg_dir);
>> > >> >> 	READ_SYMBOL("init_level4_pgt", init_level4_pgt);
>> > >> >>+	READ_SYMBOL("level4_kernel_pgt", level4_kernel_pgt);
>> > >> >>+	READ_SYMBOL("init_top_pgt", init_top_pgt);
>> > >> >> 	READ_SYMBOL("vmlist", vmlist);
>> > >> >> 	READ_SYMBOL("vmap_area_list", vmap_area_list);
>> > >> >> 	READ_SYMBOL("node_online_map", node_online_map);
>> > >> >>diff --git a/makedumpfile.h b/makedumpfile.h
>> > >> >>index 8a05794..9357e47 100644
>> > >> >>--- a/makedumpfile.h
>> > >> >>+++ b/makedumpfile.h
>> > >> >>@@ -1517,6 +1517,8 @@ struct symbol_table {
>> > >> >> 	unsigned long long	_stext;
>> > >> >> 	unsigned long long	swapper_pg_dir;
>> > >> >> 	unsigned long long	init_level4_pgt;
>> > >> >>+	unsigned long long	level4_kernel_pgt;
>> > >> >>+	unsigned long long	init_top_pgt;
>> > >> >> 	unsigned long long	vmlist;
>> > >> >> 	unsigned long long	vmap_area_list;
>> > >> >> 	unsigned long long	phys_base;
>> > >> >>
>> > >> >>
>> > >> >>--
>> > >> >>Jeff Mahoney
>> > >> >>SUSE Labs
>> > >> >
>> > >> >
>> > >> >
>> > >> >_______________________________________________
>> > >> >kexec mailing list
>> > >> >kexec@lists.infradead.org
>> > >> >http://lists.infradead.org/mailman/listinfo/kexec
>> > >>
>> > >>
>> > >> _______________________________________________
>> > >> kexec mailing list
>> > >> kexec@lists.infradead.org
>> > >> http://lists.infradead.org/mailman/listinfo/kexec
>> > >
>> > >Thanks
>> > >Dave
>> >
>> >
>>
>> Thanks
>> Dave


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] handle renamed init_level4_pgt -> init_top_pgt

[Dave Young]

Hi Atsushi,

Happy new year!

On 12/26/17 at 08:21am, Atsushi Kumagai wrote:
> >On 12/22/17 at 12:54pm, Dave Young wrote:
> >> Hi Atsushi,
> >> On 12/21/17 at 08:48am, Atsushi Kumagai wrote:
> >> > Hello Dave,
> >> >
> >> > >[dyoung@dhcp-*-* makedumpfile]$ sudo ./makedumpfile -l -d 31 /mnt/vmcore/vmcore /tmp/vmcore.1
> >> > >The kernel version is not supported.
> >> > >The makedumpfile operation may be incomplete.
> >> > >Checking for memory holes                         : [100.0 %] |                  __vtop4_x86_64: Can't get a valid
> >pte.
> >> > >readmem: Can't convert a virtual address(ffff88007ebb1000) to physical address.
> >> > >readmem: type_addr: 0, addr:ffff88007ebb1000, size:32768
> >> > >__exclude_unnecessary_pages: Can't read the buffer of struct page.
> >> > >create_2nd_bitmap: Can't exclude unnecessary pages.
> >> > >
> >> > >makedumpfile Failed.
> >> > >
> >> > >If you need the vmcore for debugging please let me know, my test is just
> >> > >a normal test in kvm guest.
> >> >
> >> > Thanks for your report.
> >> > I can't reproduce that in my environment, could you give me the vmcore ?
> >> > It's helpful if you append the vmlinux and the .config.
> >>
> >> I'm bisecting it, nearly finished, will post the results and share
> >> vmcore if needed soon.
> >
> >vmcore/vmlinux (gzipped) and .config:
> >http://people.redhat.com/ruyang/rhbz1528542/
> 
> Thanks.
> 
> >Bisect result is below:
> 
> I'm not sure why this commit affects makedumpfile yet, but
> I'll give priority to release v1.6.3 since the commit will not be included
> in the supported kernel(4.14).
> 
> Regards,
> Atsushi Kumagai
> 
> >83e3c48729d9ebb7af5a31a504f3fd6aff0348c4 is the first bad commit
> >commit 83e3c48729d9ebb7af5a31a504f3fd6aff0348c4
> >Author: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> >Date:   Fri Sep 29 17:08:16 2017 +0300
> >
> >    mm/sparsemem: Allocate mem_section at runtime for CONFIG_SPARSEMEM_EXTREME=y
> >
> >    Size of the mem_section[] array depends on the size of the physical address space.
> >
> >    In preparation for boot-time switching between paging modes on x86-64
> >    we need to make the allocation of mem_section[] dynamic, because otherwise
> >    we waste a lot of RAM: with CONFIG_NODE_SHIFT=10, mem_section[] size is 32kB
> >    for 4-level paging and 2MB for 5-level paging mode.
> >
> >    The patch allocates the array on the first call to sparse_memory_present_with_active_regions().
> >
> >    Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> >    Cc: Andrew Morton <akpm@linux-foundation.org>
> >    Cc: Andy Lutomirski <luto@amacapital.net>
> >    Cc: Borislav Petkov <bp@suse.de>
> >    Cc: Cyrill Gorcunov <gorcunov@openvz.org>
> >    Cc: Linus Torvalds <torvalds@linux-foundation.org>
> >    Cc: Peter Zijlstra <peterz@infradead.org>
> >    Cc: Thomas Gleixner <tglx@linutronix.de>
> >    Cc: linux-mm@kvack.org
> >    Link: http://lkml.kernel.org/r/20170929140821.37654-2-kirill.shutemov@linux.intel.com
> >    Signed-off-by: Ingo Molnar <mingo@kernel.org>
> >
> >:040000 040000 68b7ff3eedc2c9ff56e31108f7e982eacbb233fc 0014ee63bebe14efb0e36e0028e2cbe718fd6c30 M	include
> >:040000 040000 78adbc296527c802400b1f68e0fbd716920726fa a4eea8117cb318527c0d5a6281d68f312f644831 M	mm

The root cause is this commit makes mem_section as a pointer instead of
the static array.

VMCOREINFO_SYMBOL() expand it as &mem_section, this is not correct in
the test case any more.

This hack code works for me:

diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index b3663896278e..f5fe6068ae39 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -376,6 +376,8 @@ phys_addr_t __weak paddr_vmcoreinfo_note(void)
 {
 	return __pa(vmcoreinfo_note);
 }
+#define VMCOREINFO_SYMBOL_HACK(name) \
+	vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)name)
 
 static int __init crash_save_vmcoreinfo_init(void)
 {
@@ -410,10 +412,11 @@ static int __init crash_save_vmcoreinfo_init(void)
 	VMCOREINFO_SYMBOL(contig_page_data);
 #endif
 #ifdef CONFIG_SPARSEMEM
-	VMCOREINFO_SYMBOL(mem_section);
+	VMCOREINFO_SYMBOL_HACK(mem_section);
 	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
 	VMCOREINFO_STRUCT_SIZE(mem_section);
 	VMCOREINFO_OFFSET(mem_section, section_mem_map);
+
 #endif
 	VMCOREINFO_STRUCT_SIZE(page);
 	VMCOREINFO_STRUCT_SIZE(pglist_data);


But probably we need this instead, but I can not test it because I do
not know how to fix makedumpfile to use a _NUMBER instead of a SYMBOL.
Thus bring up the issue, seeking for thoughts and discussion.

diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index b3663896278e..dfa2238e2c28 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -410,10 +410,17 @@ static int __init crash_save_vmcoreinfo_init(void)
	VMCOREINFO_SYMBOL(contig_page_data);
 #endif
 #ifdef CONFIG_SPARSEMEM
+#ifdef CONFIG_SPARSEMEM_EXTREME
+	VMCOREINFO_NUMBER(mem_section);
+#else
	VMCOREINFO_SYMBOL(mem_section);
+#endif
	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
	VMCOREINFO_STRUCT_SIZE(mem_section);
	VMCOREINFO_OFFSET(mem_section, section_mem_map);

[snip]

Thanks
Dave

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] handle renamed init_level4_pgt -> init_top_pgt

[Baoquan He]

On 01/02/18 at 04:57pm, Dave Young wrote:
> The root cause is this commit makes mem_section as a pointer instead of
> the static array.
> 
> VMCOREINFO_SYMBOL() expand it as &mem_section, this is not correct in
> the test case any more.
> 
> This hack code works for me:
> 
> diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> index b3663896278e..f5fe6068ae39 100644
> --- a/kernel/crash_core.c
> +++ b/kernel/crash_core.c
> @@ -376,6 +376,8 @@ phys_addr_t __weak paddr_vmcoreinfo_note(void)
>  {
>  	return __pa(vmcoreinfo_note);
>  }
> +#define VMCOREINFO_SYMBOL_HACK(name) \
> +	vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)name)

Oh, you made a new one. We may use vmcoreinfo_append_str directly since
there's an existing one in crash_save_vmcoreinfo():

vmcoreinfo_append_str("CRASHTIME=%ld\n", get_seconds());

The thing is that VMCOREINFO_SYMBOL will reference symbol. While
checking all exported symbol, all of them are array names. So here
the value of &array_name is equal to the address of the first element of
array. Now the first exception appeared, mem_section, which could be not
an array name, but a pointer pointing at the allocated memory.

For this issue, we either change as Dave mentioned two options, or can
we adjust VMCOREINFO_SYMBOL(name)?

>  
>  static int __init crash_save_vmcoreinfo_init(void)
>  {
> @@ -410,10 +412,11 @@ static int __init crash_save_vmcoreinfo_init(void)
>  	VMCOREINFO_SYMBOL(contig_page_data);
>  #endif
>  #ifdef CONFIG_SPARSEMEM
> -	VMCOREINFO_SYMBOL(mem_section);
> +	VMCOREINFO_SYMBOL_HACK(mem_section);
>  	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
>  	VMCOREINFO_STRUCT_SIZE(mem_section);
>  	VMCOREINFO_OFFSET(mem_section, section_mem_map);
> +
>  #endif
>  	VMCOREINFO_STRUCT_SIZE(page);
>  	VMCOREINFO_STRUCT_SIZE(pglist_data);
> 
> 
> But probably we need this instead, but I can not test it because I do
> not know how to fix makedumpfile to use a _NUMBER instead of a SYMBOL.
> Thus bring up the issue, seeking for thoughts and discussion.
> 
> diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> index b3663896278e..dfa2238e2c28 100644
> --- a/kernel/crash_core.c
> +++ b/kernel/crash_core.c
> @@ -410,10 +410,17 @@ static int __init crash_save_vmcoreinfo_init(void)
> 	VMCOREINFO_SYMBOL(contig_page_data);
>  #endif
>  #ifdef CONFIG_SPARSEMEM
> +#ifdef CONFIG_SPARSEMEM_EXTREME
> +	VMCOREINFO_NUMBER(mem_section);
> +#else
> 	VMCOREINFO_SYMBOL(mem_section);
> +#endif
> 	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
> 	VMCOREINFO_STRUCT_SIZE(mem_section);
> 	VMCOREINFO_OFFSET(mem_section, section_mem_map);
> 
> [snip]
> 
> Thanks
> Dave

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

makedumpfile saving vmcore fails with dynamically allocated mem_section (was: Re: [PATCH] handle renamed init_level4_pgt -> init_top_pgt)

[Dave Young]

On 01/02/18 at 05:08pm, Baoquan He wrote:
> On 01/02/18 at 04:57pm, Dave Young wrote:
> > The root cause is this commit makes mem_section as a pointer instead of
> > the static array.
> > 
> > VMCOREINFO_SYMBOL() expand it as &mem_section, this is not correct in
> > the test case any more.
> > 
> > This hack code works for me:
> > 
> > diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> > index b3663896278e..f5fe6068ae39 100644
> > --- a/kernel/crash_core.c
> > +++ b/kernel/crash_core.c
> > @@ -376,6 +376,8 @@ phys_addr_t __weak paddr_vmcoreinfo_note(void)
> >  {
> >  	return __pa(vmcoreinfo_note);
> >  }
> > +#define VMCOREINFO_SYMBOL_HACK(name) \
> > +	vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)name)
> 
> Oh, you made a new one. We may use vmcoreinfo_append_str directly since
> there's an existing one in crash_save_vmcoreinfo():

Yes, it should be something like this instead, this should ensure
makedumpfile maybe crash tool works without any modifications,
waiting for feedback from Atsushi, also ccing Dave for crash utility
potential issue. 

diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index b3663896278e..122494364179 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -410,10 +410,16 @@ static int __init crash_save_vmcoreinfo_init(void)
 	VMCOREINFO_SYMBOL(contig_page_data);
 #endif
 #ifdef CONFIG_SPARSEMEM
+#ifdef CONFIG_SPARSEMEM_EXTREME
+	vmcoreinfo_append_str("SYMBOL(mem_section)=%lx\n",
+			      (unsigned long)mem_section);
+#else
 	VMCOREINFO_SYMBOL(mem_section);
+#endif
 	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
 	VMCOREINFO_STRUCT_SIZE(mem_section);
 	VMCOREINFO_OFFSET(mem_section, section_mem_map);
+
 #endif
 	VMCOREINFO_STRUCT_SIZE(page);
 	VMCOREINFO_STRUCT_SIZE(pglist_data);

> 
> vmcoreinfo_append_str("CRASHTIME=%ld\n", get_seconds());
> 
> The thing is that VMCOREINFO_SYMBOL will reference symbol. While
> checking all exported symbol, all of them are array names. So here
> the value of &array_name is equal to the address of the first element of
> array. Now the first exception appeared, mem_section, which could be not
> an array name, but a pointer pointing at the allocated memory.
> 
> For this issue, we either change as Dave mentioned two options, or can
> we adjust VMCOREINFO_SYMBOL(name)?
> 
> >  
> >  static int __init crash_save_vmcoreinfo_init(void)
> >  {
> > @@ -410,10 +412,11 @@ static int __init crash_save_vmcoreinfo_init(void)
> >  	VMCOREINFO_SYMBOL(contig_page_data);
> >  #endif
> >  #ifdef CONFIG_SPARSEMEM
> > -	VMCOREINFO_SYMBOL(mem_section);
> > +	VMCOREINFO_SYMBOL_HACK(mem_section);
> >  	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
> >  	VMCOREINFO_STRUCT_SIZE(mem_section);
> >  	VMCOREINFO_OFFSET(mem_section, section_mem_map);
> > +
> >  #endif
> >  	VMCOREINFO_STRUCT_SIZE(page);
> >  	VMCOREINFO_STRUCT_SIZE(pglist_data);
> > 
> > 
> > But probably we need this instead, but I can not test it because I do
> > not know how to fix makedumpfile to use a _NUMBER instead of a SYMBOL.
> > Thus bring up the issue, seeking for thoughts and discussion.
> > 
> > diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> > index b3663896278e..dfa2238e2c28 100644
> > --- a/kernel/crash_core.c
> > +++ b/kernel/crash_core.c
> > @@ -410,10 +410,17 @@ static int __init crash_save_vmcoreinfo_init(void)
> > 	VMCOREINFO_SYMBOL(contig_page_data);
> >  #endif
> >  #ifdef CONFIG_SPARSEMEM
> > +#ifdef CONFIG_SPARSEMEM_EXTREME
> > +	VMCOREINFO_NUMBER(mem_section);
> > +#else
> > 	VMCOREINFO_SYMBOL(mem_section);
> > +#endif
> > 	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
> > 	VMCOREINFO_STRUCT_SIZE(mem_section);
> > 	VMCOREINFO_OFFSET(mem_section, section_mem_map);
> > 
> > [snip]
> > 
> > Thanks
> > Dave

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: makedumpfile saving vmcore fails with dynamically allocated mem_section (was: Re: [PATCH] handle renamed init_level4_pgt -> init_top_pgt)

[Baoquan He]

On 01/03/18 at 10:30am, Dave Young wrote:
> On 01/02/18 at 05:08pm, Baoquan He wrote:
> > On 01/02/18 at 04:57pm, Dave Young wrote:
> > > The root cause is this commit makes mem_section as a pointer instead of
> > > the static array.
> > > 
> > > VMCOREINFO_SYMBOL() expand it as &mem_section, this is not correct in
> > > the test case any more.
> > > 
> > > This hack code works for me:
> > > 
> > > diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> > > index b3663896278e..f5fe6068ae39 100644
> > > --- a/kernel/crash_core.c
> > > +++ b/kernel/crash_core.c
> > > @@ -376,6 +376,8 @@ phys_addr_t __weak paddr_vmcoreinfo_note(void)
> > >  {
> > >  	return __pa(vmcoreinfo_note);
> > >  }
> > > +#define VMCOREINFO_SYMBOL_HACK(name) \
> > > +	vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)name)
> > 
> > Oh, you made a new one. We may use vmcoreinfo_append_str directly since
> > there's an existing one in crash_save_vmcoreinfo():
> 
> Yes, it should be something like this instead, this should ensure
> makedumpfile maybe crash tool works without any modifications,
> waiting for feedback from Atsushi, also ccing Dave for crash utility
> potential issue. 
> 
> diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> index b3663896278e..122494364179 100644
> --- a/kernel/crash_core.c
> +++ b/kernel/crash_core.c
> @@ -410,10 +410,16 @@ static int __init crash_save_vmcoreinfo_init(void)
>  	VMCOREINFO_SYMBOL(contig_page_data);
>  #endif
>  #ifdef CONFIG_SPARSEMEM
> +#ifdef CONFIG_SPARSEMEM_EXTREME
> +	vmcoreinfo_append_str("SYMBOL(mem_section)=%lx\n",
> +			      (unsigned long)mem_section);
> +#else
>  	VMCOREINFO_SYMBOL(mem_section);
> +#endif

	vmcoreinfo_append_str("SYMBOL(mem_section)=%lx\n",
				(unsigned long)mem_section);

This is enough to cover both cases. mem_section is array name in non
SPARSEMEM_EXTREME case, so value of &mem_section == value of
mem_section.

>  	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
>  	VMCOREINFO_STRUCT_SIZE(mem_section);
>  	VMCOREINFO_OFFSET(mem_section, section_mem_map);
> +
>  #endif
>  	VMCOREINFO_STRUCT_SIZE(page);
>  	VMCOREINFO_STRUCT_SIZE(pglist_data);
> 
> > 
> > vmcoreinfo_append_str("CRASHTIME=%ld\n", get_seconds());
> > 
> > The thing is that VMCOREINFO_SYMBOL will reference symbol. While
> > checking all exported symbol, all of them are array names. So here
> > the value of &array_name is equal to the address of the first element of
> > array. Now the first exception appeared, mem_section, which could be not
> > an array name, but a pointer pointing at the allocated memory.
> > 
> > For this issue, we either change as Dave mentioned two options, or can
> > we adjust VMCOREINFO_SYMBOL(name)?
> > 
> > >  
> > >  static int __init crash_save_vmcoreinfo_init(void)
> > >  {
> > > @@ -410,10 +412,11 @@ static int __init crash_save_vmcoreinfo_init(void)
> > >  	VMCOREINFO_SYMBOL(contig_page_data);
> > >  #endif
> > >  #ifdef CONFIG_SPARSEMEM
> > > -	VMCOREINFO_SYMBOL(mem_section);
> > > +	VMCOREINFO_SYMBOL_HACK(mem_section);
> > >  	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
> > >  	VMCOREINFO_STRUCT_SIZE(mem_section);
> > >  	VMCOREINFO_OFFSET(mem_section, section_mem_map);
> > > +
> > >  #endif
> > >  	VMCOREINFO_STRUCT_SIZE(page);
> > >  	VMCOREINFO_STRUCT_SIZE(pglist_data);
> > > 
> > > 
> > > But probably we need this instead, but I can not test it because I do
> > > not know how to fix makedumpfile to use a _NUMBER instead of a SYMBOL.
> > > Thus bring up the issue, seeking for thoughts and discussion.
> > > 
> > > diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> > > index b3663896278e..dfa2238e2c28 100644
> > > --- a/kernel/crash_core.c
> > > +++ b/kernel/crash_core.c
> > > @@ -410,10 +410,17 @@ static int __init crash_save_vmcoreinfo_init(void)
> > > 	VMCOREINFO_SYMBOL(contig_page_data);
> > >  #endif
> > >  #ifdef CONFIG_SPARSEMEM
> > > +#ifdef CONFIG_SPARSEMEM_EXTREME
> > > +	VMCOREINFO_NUMBER(mem_section);
> > > +#else
> > > 	VMCOREINFO_SYMBOL(mem_section);
> > > +#endif
> > > 	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
> > > 	VMCOREINFO_STRUCT_SIZE(mem_section);
> > > 	VMCOREINFO_OFFSET(mem_section, section_mem_map);
> > > 
> > > [snip]
> > > 
> > > Thanks
> > > Dave

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

RE: makedumpfile saving vmcore fails with dynamically allocated mem_section (was: Re: [PATCH] handle renamed init_level4_pgt -> init_top_pgt)

[Atsushi Kumagai]

>On 01/03/18 at 10:30am, Dave Young wrote:
>> On 01/02/18 at 05:08pm, Baoquan He wrote:
>> > On 01/02/18 at 04:57pm, Dave Young wrote:
>> > > The root cause is this commit makes mem_section as a pointer instead of
>> > > the static array.
>> > >
>> > > VMCOREINFO_SYMBOL() expand it as &mem_section, this is not correct in
>> > > the test case any more.
>> > >
>> > > This hack code works for me:
>> > >
>> > > diff --git a/kernel/crash_core.c b/kernel/crash_core.c
>> > > index b3663896278e..f5fe6068ae39 100644
>> > > --- a/kernel/crash_core.c
>> > > +++ b/kernel/crash_core.c
>> > > @@ -376,6 +376,8 @@ phys_addr_t __weak paddr_vmcoreinfo_note(void)
>> > >  {
>> > >  	return __pa(vmcoreinfo_note);
>> > >  }
>> > > +#define VMCOREINFO_SYMBOL_HACK(name) \
>> > > +	vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)name)
>> >
>> > Oh, you made a new one. We may use vmcoreinfo_append_str directly since
>> > there's an existing one in crash_save_vmcoreinfo():
>>
>> Yes, it should be something like this instead, this should ensure
>> makedumpfile maybe crash tool works without any modifications,
>> waiting for feedback from Atsushi, also ccing Dave for crash utility
>> potential issue.

makedumpfile needs some fix anyway since some logic depend on the array length
of mem_section. I'm trying to fix it referring to the crash's fix.

> I'll give priority to release v1.6.3 since the commit will not be included
> in the supported kernel(4.14).

The kernel change was merged also into kernel 4.14.9, I'm working on this issue
for the next release(v1.6.3).

Thanks,
Atsushi Kumagai

>> diff --git a/kernel/crash_core.c b/kernel/crash_core.c
>> index b3663896278e..122494364179 100644
>> --- a/kernel/crash_core.c
>> +++ b/kernel/crash_core.c
>> @@ -410,10 +410,16 @@ static int __init crash_save_vmcoreinfo_init(void)
>>  	VMCOREINFO_SYMBOL(contig_page_data);
>>  #endif
>>  #ifdef CONFIG_SPARSEMEM
>> +#ifdef CONFIG_SPARSEMEM_EXTREME
>> +	vmcoreinfo_append_str("SYMBOL(mem_section)=%lx\n",
>> +			      (unsigned long)mem_section);
>> +#else
>>  	VMCOREINFO_SYMBOL(mem_section);
>> +#endif
>
>	vmcoreinfo_append_str("SYMBOL(mem_section)=%lx\n",
>				(unsigned long)mem_section);
>
>This is enough to cover both cases. mem_section is array name in non
>SPARSEMEM_EXTREME case, so value of &mem_section == value of
>mem_section.
>
>>  	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
>>  	VMCOREINFO_STRUCT_SIZE(mem_section);
>>  	VMCOREINFO_OFFSET(mem_section, section_mem_map);
>> +
>>  #endif
>>  	VMCOREINFO_STRUCT_SIZE(page);
>>  	VMCOREINFO_STRUCT_SIZE(pglist_data);
>>
>> >
>> > vmcoreinfo_append_str("CRASHTIME=%ld\n", get_seconds());
>> >
>> > The thing is that VMCOREINFO_SYMBOL will reference symbol. While
>> > checking all exported symbol, all of them are array names. So here
>> > the value of &array_name is equal to the address of the first element of
>> > array. Now the first exception appeared, mem_section, which could be not
>> > an array name, but a pointer pointing at the allocated memory.
>> >
>> > For this issue, we either change as Dave mentioned two options, or can
>> > we adjust VMCOREINFO_SYMBOL(name)?
>> >
>> > >
>> > >  static int __init crash_save_vmcoreinfo_init(void)
>> > >  {
>> > > @@ -410,10 +412,11 @@ static int __init crash_save_vmcoreinfo_init(void)
>> > >  	VMCOREINFO_SYMBOL(contig_page_data);
>> > >  #endif
>> > >  #ifdef CONFIG_SPARSEMEM
>> > > -	VMCOREINFO_SYMBOL(mem_section);
>> > > +	VMCOREINFO_SYMBOL_HACK(mem_section);
>> > >  	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
>> > >  	VMCOREINFO_STRUCT_SIZE(mem_section);
>> > >  	VMCOREINFO_OFFSET(mem_section, section_mem_map);
>> > > +
>> > >  #endif
>> > >  	VMCOREINFO_STRUCT_SIZE(page);
>> > >  	VMCOREINFO_STRUCT_SIZE(pglist_data);
>> > >
>> > >
>> > > But probably we need this instead, but I can not test it because I do
>> > > not know how to fix makedumpfile to use a _NUMBER instead of a SYMBOL.
>> > > Thus bring up the issue, seeking for thoughts and discussion.
>> > >
>> > > diff --git a/kernel/crash_core.c b/kernel/crash_core.c
>> > > index b3663896278e..dfa2238e2c28 100644
>> > > --- a/kernel/crash_core.c
>> > > +++ b/kernel/crash_core.c
>> > > @@ -410,10 +410,17 @@ static int __init crash_save_vmcoreinfo_init(void)
>> > > 	VMCOREINFO_SYMBOL(contig_page_data);
>> > >  #endif
>> > >  #ifdef CONFIG_SPARSEMEM
>> > > +#ifdef CONFIG_SPARSEMEM_EXTREME
>> > > +	VMCOREINFO_NUMBER(mem_section);
>> > > +#else
>> > > 	VMCOREINFO_SYMBOL(mem_section);
>> > > +#endif
>> > > 	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
>> > > 	VMCOREINFO_STRUCT_SIZE(mem_section);
>> > > 	VMCOREINFO_OFFSET(mem_section, section_mem_map);
>> > >
>> > > [snip]
>> > >
>> > > Thanks
>> > > Dave



_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: makedumpfile saving vmcore fails with dynamically allocated mem_section (was: Re: [PATCH] handle renamed init_level4_pgt -> init_top_pgt)

[Dave Young]

On 01/05/18 at 08:19am, Atsushi Kumagai wrote:
> >On 01/03/18 at 10:30am, Dave Young wrote:
> >> On 01/02/18 at 05:08pm, Baoquan He wrote:
> >> > On 01/02/18 at 04:57pm, Dave Young wrote:
> >> > > The root cause is this commit makes mem_section as a pointer instead of
> >> > > the static array.
> >> > >
> >> > > VMCOREINFO_SYMBOL() expand it as &mem_section, this is not correct in
> >> > > the test case any more.
> >> > >
> >> > > This hack code works for me:
> >> > >
> >> > > diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> >> > > index b3663896278e..f5fe6068ae39 100644
> >> > > --- a/kernel/crash_core.c
> >> > > +++ b/kernel/crash_core.c
> >> > > @@ -376,6 +376,8 @@ phys_addr_t __weak paddr_vmcoreinfo_note(void)
> >> > >  {
> >> > >  	return __pa(vmcoreinfo_note);
> >> > >  }
> >> > > +#define VMCOREINFO_SYMBOL_HACK(name) \
> >> > > +	vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)name)
> >> >
> >> > Oh, you made a new one. We may use vmcoreinfo_append_str directly since
> >> > there's an existing one in crash_save_vmcoreinfo():
> >>
> >> Yes, it should be something like this instead, this should ensure
> >> makedumpfile maybe crash tool works without any modifications,
> >> waiting for feedback from Atsushi, also ccing Dave for crash utility
> >> potential issue.
> 
> makedumpfile needs some fix anyway since some logic depend on the array length
> of mem_section. I'm trying to fix it referring to the crash's fix.

Hmm, a makedumpfile only fix is enough for this issue?

> 
> > I'll give priority to release v1.6.3 since the commit will not be included
> > in the supported kernel(4.14).
> 
> The kernel change was merged also into kernel 4.14.9, I'm working on this issue
> for the next release(v1.6.3).
> 
> Thanks,
> Atsushi Kumagai
> 
> >> diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> >> index b3663896278e..122494364179 100644
> >> --- a/kernel/crash_core.c
> >> +++ b/kernel/crash_core.c
> >> @@ -410,10 +410,16 @@ static int __init crash_save_vmcoreinfo_init(void)
> >>  	VMCOREINFO_SYMBOL(contig_page_data);
> >>  #endif
> >>  #ifdef CONFIG_SPARSEMEM
> >> +#ifdef CONFIG_SPARSEMEM_EXTREME
> >> +	vmcoreinfo_append_str("SYMBOL(mem_section)=%lx\n",
> >> +			      (unsigned long)mem_section);
> >> +#else
> >>  	VMCOREINFO_SYMBOL(mem_section);
> >> +#endif
> >
> >	vmcoreinfo_append_str("SYMBOL(mem_section)=%lx\n",
> >				(unsigned long)mem_section);
> >
> >This is enough to cover both cases. mem_section is array name in non
> >SPARSEMEM_EXTREME case, so value of &mem_section == value of
> >mem_section.
> >
> >>  	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
> >>  	VMCOREINFO_STRUCT_SIZE(mem_section);
> >>  	VMCOREINFO_OFFSET(mem_section, section_mem_map);
> >> +
> >>  #endif
> >>  	VMCOREINFO_STRUCT_SIZE(page);
> >>  	VMCOREINFO_STRUCT_SIZE(pglist_data);
> >>
> >> >
> >> > vmcoreinfo_append_str("CRASHTIME=%ld\n", get_seconds());
> >> >
> >> > The thing is that VMCOREINFO_SYMBOL will reference symbol. While
> >> > checking all exported symbol, all of them are array names. So here
> >> > the value of &array_name is equal to the address of the first element of
> >> > array. Now the first exception appeared, mem_section, which could be not
> >> > an array name, but a pointer pointing at the allocated memory.
> >> >
> >> > For this issue, we either change as Dave mentioned two options, or can
> >> > we adjust VMCOREINFO_SYMBOL(name)?
> >> >
> >> > >
> >> > >  static int __init crash_save_vmcoreinfo_init(void)
> >> > >  {
> >> > > @@ -410,10 +412,11 @@ static int __init crash_save_vmcoreinfo_init(void)
> >> > >  	VMCOREINFO_SYMBOL(contig_page_data);
> >> > >  #endif
> >> > >  #ifdef CONFIG_SPARSEMEM
> >> > > -	VMCOREINFO_SYMBOL(mem_section);
> >> > > +	VMCOREINFO_SYMBOL_HACK(mem_section);
> >> > >  	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
> >> > >  	VMCOREINFO_STRUCT_SIZE(mem_section);
> >> > >  	VMCOREINFO_OFFSET(mem_section, section_mem_map);
> >> > > +
> >> > >  #endif
> >> > >  	VMCOREINFO_STRUCT_SIZE(page);
> >> > >  	VMCOREINFO_STRUCT_SIZE(pglist_data);
> >> > >
> >> > >
> >> > > But probably we need this instead, but I can not test it because I do
> >> > > not know how to fix makedumpfile to use a _NUMBER instead of a SYMBOL.
> >> > > Thus bring up the issue, seeking for thoughts and discussion.
> >> > >
> >> > > diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> >> > > index b3663896278e..dfa2238e2c28 100644
> >> > > --- a/kernel/crash_core.c
> >> > > +++ b/kernel/crash_core.c
> >> > > @@ -410,10 +410,17 @@ static int __init crash_save_vmcoreinfo_init(void)
> >> > > 	VMCOREINFO_SYMBOL(contig_page_data);
> >> > >  #endif
> >> > >  #ifdef CONFIG_SPARSEMEM
> >> > > +#ifdef CONFIG_SPARSEMEM_EXTREME
> >> > > +	VMCOREINFO_NUMBER(mem_section);
> >> > > +#else
> >> > > 	VMCOREINFO_SYMBOL(mem_section);
> >> > > +#endif
> >> > > 	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
> >> > > 	VMCOREINFO_STRUCT_SIZE(mem_section);
> >> > > 	VMCOREINFO_OFFSET(mem_section, section_mem_map);
> >> > >
> >> > > [snip]
> >> > >
> >> > > Thanks
> >> > > Dave
> 
> 

Thanks
Dave

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

RE: makedumpfile saving vmcore fails with dynamically allocated mem_section (was: Re: [PATCH] handle renamed init_level4_pgt -> init_top_pgt)

[Atsushi Kumagai]

>> >> > > The root cause is this commit makes mem_section as a pointer instead of
>> >> > > the static array.
>> >> > >
>> >> > > VMCOREINFO_SYMBOL() expand it as &mem_section, this is not correct in
>> >> > > the test case any more.
>> >> > >
>> >> > > This hack code works for me:
>> >> > >
>> >> > > diff --git a/kernel/crash_core.c b/kernel/crash_core.c
>> >> > > index b3663896278e..f5fe6068ae39 100644
>> >> > > --- a/kernel/crash_core.c
>> >> > > +++ b/kernel/crash_core.c
>> >> > > @@ -376,6 +376,8 @@ phys_addr_t __weak paddr_vmcoreinfo_note(void)
>> >> > >  {
>> >> > >  	return __pa(vmcoreinfo_note);
>> >> > >  }
>> >> > > +#define VMCOREINFO_SYMBOL_HACK(name) \
>> >> > > +	vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)name)
>> >> >
>> >> > Oh, you made a new one. We may use vmcoreinfo_append_str directly since
>> >> > there's an existing one in crash_save_vmcoreinfo():
>> >>
>> >> Yes, it should be something like this instead, this should ensure
>> >> makedumpfile maybe crash tool works without any modifications,
>> >> waiting for feedback from Atsushi, also ccing Dave for crash utility
>> >> potential issue.
>>
>> makedumpfile needs some fix anyway since some logic depend on the array length
>> of mem_section. I'm trying to fix it referring to the crash's fix.
>
>Hmm, a makedumpfile only fix is enough for this issue?

Sorry, it was thoughtless of me. The crash's fix uses dwarf info,
the kernel side fix you thought is necessary for makedumpfile to work without
vmlinux.


Thanks,
Atsushi Kumagai

>>
>> > I'll give priority to release v1.6.3 since the commit will not be included
>> > in the supported kernel(4.14).
>>
>> The kernel change was merged also into kernel 4.14.9, I'm working on this issue
>> for the next release(v1.6.3).
>>
>> Thanks,
>> Atsushi Kumagai
>>
>> >> diff --git a/kernel/crash_core.c b/kernel/crash_core.c
>> >> index b3663896278e..122494364179 100644
>> >> --- a/kernel/crash_core.c
>> >> +++ b/kernel/crash_core.c
>> >> @@ -410,10 +410,16 @@ static int __init crash_save_vmcoreinfo_init(void)
>> >>  	VMCOREINFO_SYMBOL(contig_page_data);
>> >>  #endif
>> >>  #ifdef CONFIG_SPARSEMEM
>> >> +#ifdef CONFIG_SPARSEMEM_EXTREME
>> >> +	vmcoreinfo_append_str("SYMBOL(mem_section)=%lx\n",
>> >> +			      (unsigned long)mem_section);
>> >> +#else
>> >>  	VMCOREINFO_SYMBOL(mem_section);
>> >> +#endif
>> >
>> >	vmcoreinfo_append_str("SYMBOL(mem_section)=%lx\n",
>> >				(unsigned long)mem_section);
>> >
>> >This is enough to cover both cases. mem_section is array name in non
>> >SPARSEMEM_EXTREME case, so value of &mem_section == value of
>> >mem_section.
>> >
>> >>  	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
>> >>  	VMCOREINFO_STRUCT_SIZE(mem_section);
>> >>  	VMCOREINFO_OFFSET(mem_section, section_mem_map);
>> >> +
>> >>  #endif
>> >>  	VMCOREINFO_STRUCT_SIZE(page);
>> >>  	VMCOREINFO_STRUCT_SIZE(pglist_data);
>> >>
>> >> >
>> >> > vmcoreinfo_append_str("CRASHTIME=%ld\n", get_seconds());
>> >> >
>> >> > The thing is that VMCOREINFO_SYMBOL will reference symbol. While
>> >> > checking all exported symbol, all of them are array names. So here
>> >> > the value of &array_name is equal to the address of the first element of
>> >> > array. Now the first exception appeared, mem_section, which could be not
>> >> > an array name, but a pointer pointing at the allocated memory.
>> >> >
>> >> > For this issue, we either change as Dave mentioned two options, or can
>> >> > we adjust VMCOREINFO_SYMBOL(name)?
>> >> >
>> >> > >
>> >> > >  static int __init crash_save_vmcoreinfo_init(void)
>> >> > >  {
>> >> > > @@ -410,10 +412,11 @@ static int __init crash_save_vmcoreinfo_init(void)
>> >> > >  	VMCOREINFO_SYMBOL(contig_page_data);
>> >> > >  #endif
>> >> > >  #ifdef CONFIG_SPARSEMEM
>> >> > > -	VMCOREINFO_SYMBOL(mem_section);
>> >> > > +	VMCOREINFO_SYMBOL_HACK(mem_section);
>> >> > >  	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
>> >> > >  	VMCOREINFO_STRUCT_SIZE(mem_section);
>> >> > >  	VMCOREINFO_OFFSET(mem_section, section_mem_map);
>> >> > > +
>> >> > >  #endif
>> >> > >  	VMCOREINFO_STRUCT_SIZE(page);
>> >> > >  	VMCOREINFO_STRUCT_SIZE(pglist_data);
>> >> > >
>> >> > >
>> >> > > But probably we need this instead, but I can not test it because I do
>> >> > > not know how to fix makedumpfile to use a _NUMBER instead of a SYMBOL.
>> >> > > Thus bring up the issue, seeking for thoughts and discussion.
>> >> > >
>> >> > > diff --git a/kernel/crash_core.c b/kernel/crash_core.c
>> >> > > index b3663896278e..dfa2238e2c28 100644
>> >> > > --- a/kernel/crash_core.c
>> >> > > +++ b/kernel/crash_core.c
>> >> > > @@ -410,10 +410,17 @@ static int __init crash_save_vmcoreinfo_init(void)
>> >> > > 	VMCOREINFO_SYMBOL(contig_page_data);
>> >> > >  #endif
>> >> > >  #ifdef CONFIG_SPARSEMEM
>> >> > > +#ifdef CONFIG_SPARSEMEM_EXTREME
>> >> > > +	VMCOREINFO_NUMBER(mem_section);
>> >> > > +#else
>> >> > > 	VMCOREINFO_SYMBOL(mem_section);
>> >> > > +#endif
>> >> > > 	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
>> >> > > 	VMCOREINFO_STRUCT_SIZE(mem_section);
>> >> > > 	VMCOREINFO_OFFSET(mem_section, section_mem_map);
>> >> > >
>> >> > > [snip]
>> >> > >
>> >> > > Thanks
>> >> > > Dave
>>
>>
>
>Thanks
>Dave
>
>_______________________________________________
>kexec mailing list
>kexec@lists.infradead.org
>http://lists.infradead.org/mailman/listinfo/kexec



_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: makedumpfile saving vmcore fails with dynamically allocated mem_section (was: Re: [PATCH] handle renamed init_level4_pgt -> init_top_pgt)

[Dave Young]

On 01/09/18 at 05:17am, Atsushi Kumagai wrote:
> >> >> > > The root cause is this commit makes mem_section as a pointer instead of
> >> >> > > the static array.
> >> >> > >
> >> >> > > VMCOREINFO_SYMBOL() expand it as &mem_section, this is not correct in
> >> >> > > the test case any more.
> >> >> > >
> >> >> > > This hack code works for me:
> >> >> > >
> >> >> > > diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> >> >> > > index b3663896278e..f5fe6068ae39 100644
> >> >> > > --- a/kernel/crash_core.c
> >> >> > > +++ b/kernel/crash_core.c
> >> >> > > @@ -376,6 +376,8 @@ phys_addr_t __weak paddr_vmcoreinfo_note(void)
> >> >> > >  {
> >> >> > >  	return __pa(vmcoreinfo_note);
> >> >> > >  }
> >> >> > > +#define VMCOREINFO_SYMBOL_HACK(name) \
> >> >> > > +	vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)name)
> >> >> >
> >> >> > Oh, you made a new one. We may use vmcoreinfo_append_str directly since
> >> >> > there's an existing one in crash_save_vmcoreinfo():
> >> >>
> >> >> Yes, it should be something like this instead, this should ensure
> >> >> makedumpfile maybe crash tool works without any modifications,
> >> >> waiting for feedback from Atsushi, also ccing Dave for crash utility
> >> >> potential issue.
> >>
> >> makedumpfile needs some fix anyway since some logic depend on the array length
> >> of mem_section. I'm trying to fix it referring to the crash's fix.
> >
> >Hmm, a makedumpfile only fix is enough for this issue?
> 
> Sorry, it was thoughtless of me. The crash's fix uses dwarf info,
> the kernel side fix you thought is necessary for makedumpfile to work without
> vmlinux.

Ok, Kirill A. Shutemov posted a similar fix which can solve it.

> 
> 
> Thanks,
> Atsushi Kumagai
> 
> >>
> >> > I'll give priority to release v1.6.3 since the commit will not be included
> >> > in the supported kernel(4.14).
> >>
> >> The kernel change was merged also into kernel 4.14.9, I'm working on this issue
> >> for the next release(v1.6.3).
> >>
> >> Thanks,
> >> Atsushi Kumagai
> >>
> >> >> diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> >> >> index b3663896278e..122494364179 100644
> >> >> --- a/kernel/crash_core.c
> >> >> +++ b/kernel/crash_core.c
> >> >> @@ -410,10 +410,16 @@ static int __init crash_save_vmcoreinfo_init(void)
> >> >>  	VMCOREINFO_SYMBOL(contig_page_data);
> >> >>  #endif
> >> >>  #ifdef CONFIG_SPARSEMEM
> >> >> +#ifdef CONFIG_SPARSEMEM_EXTREME
> >> >> +	vmcoreinfo_append_str("SYMBOL(mem_section)=%lx\n",
> >> >> +			      (unsigned long)mem_section);
> >> >> +#else
> >> >>  	VMCOREINFO_SYMBOL(mem_section);
> >> >> +#endif
> >> >
> >> >	vmcoreinfo_append_str("SYMBOL(mem_section)=%lx\n",
> >> >				(unsigned long)mem_section);
> >> >
> >> >This is enough to cover both cases. mem_section is array name in non
> >> >SPARSEMEM_EXTREME case, so value of &mem_section == value of
> >> >mem_section.
> >> >
> >> >>  	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
> >> >>  	VMCOREINFO_STRUCT_SIZE(mem_section);
> >> >>  	VMCOREINFO_OFFSET(mem_section, section_mem_map);
> >> >> +
> >> >>  #endif
> >> >>  	VMCOREINFO_STRUCT_SIZE(page);
> >> >>  	VMCOREINFO_STRUCT_SIZE(pglist_data);
> >> >>
> >> >> >
> >> >> > vmcoreinfo_append_str("CRASHTIME=%ld\n", get_seconds());
> >> >> >
> >> >> > The thing is that VMCOREINFO_SYMBOL will reference symbol. While
> >> >> > checking all exported symbol, all of them are array names. So here
> >> >> > the value of &array_name is equal to the address of the first element of
> >> >> > array. Now the first exception appeared, mem_section, which could be not
> >> >> > an array name, but a pointer pointing at the allocated memory.
> >> >> >
> >> >> > For this issue, we either change as Dave mentioned two options, or can
> >> >> > we adjust VMCOREINFO_SYMBOL(name)?
> >> >> >
> >> >> > >
> >> >> > >  static int __init crash_save_vmcoreinfo_init(void)
> >> >> > >  {
> >> >> > > @@ -410,10 +412,11 @@ static int __init crash_save_vmcoreinfo_init(void)
> >> >> > >  	VMCOREINFO_SYMBOL(contig_page_data);
> >> >> > >  #endif
> >> >> > >  #ifdef CONFIG_SPARSEMEM
> >> >> > > -	VMCOREINFO_SYMBOL(mem_section);
> >> >> > > +	VMCOREINFO_SYMBOL_HACK(mem_section);
> >> >> > >  	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
> >> >> > >  	VMCOREINFO_STRUCT_SIZE(mem_section);
> >> >> > >  	VMCOREINFO_OFFSET(mem_section, section_mem_map);
> >> >> > > +
> >> >> > >  #endif
> >> >> > >  	VMCOREINFO_STRUCT_SIZE(page);
> >> >> > >  	VMCOREINFO_STRUCT_SIZE(pglist_data);
> >> >> > >
> >> >> > >
> >> >> > > But probably we need this instead, but I can not test it because I do
> >> >> > > not know how to fix makedumpfile to use a _NUMBER instead of a SYMBOL.
> >> >> > > Thus bring up the issue, seeking for thoughts and discussion.
> >> >> > >
> >> >> > > diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> >> >> > > index b3663896278e..dfa2238e2c28 100644
> >> >> > > --- a/kernel/crash_core.c
> >> >> > > +++ b/kernel/crash_core.c
> >> >> > > @@ -410,10 +410,17 @@ static int __init crash_save_vmcoreinfo_init(void)
> >> >> > > 	VMCOREINFO_SYMBOL(contig_page_data);
> >> >> > >  #endif
> >> >> > >  #ifdef CONFIG_SPARSEMEM
> >> >> > > +#ifdef CONFIG_SPARSEMEM_EXTREME
> >> >> > > +	VMCOREINFO_NUMBER(mem_section);
> >> >> > > +#else
> >> >> > > 	VMCOREINFO_SYMBOL(mem_section);
> >> >> > > +#endif
> >> >> > > 	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
> >> >> > > 	VMCOREINFO_STRUCT_SIZE(mem_section);
> >> >> > > 	VMCOREINFO_OFFSET(mem_section, section_mem_map);
> >> >> > >
> >> >> > > [snip]
> >> >> > >
> >> >> > > Thanks
> >> >> > > Dave
> >>
> >>
> >
> >Thanks
> >Dave
> >
> >_______________________________________________
> >kexec mailing list
> >kexec@lists.infradead.org
> >http://lists.infradead.org/mailman/listinfo/kexec
> 
> 

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec