[RFC PATCH 1/4] Use ELF vmcoreinfo note for --mem-usage option

[kazuhito . hagio]

From: Kazuhito Hagio <k-hagio...@nec.com>

Signed-off-by: Kazuhito Hagio <k-hagio...@nec.com>
---
 makedumpfile.c | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/makedumpfile.c b/makedumpfile.c
index ecd63fa..199748b 100644
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -11426,6 +11426,7 @@ int show_mem_usage(void)
 {
        uint64_t vmcoreinfo_addr, vmcoreinfo_len;
        struct cycle cycle = {0};
+       int vmcoreinfo = FALSE;
 
        if (!is_crashkernel_mem_reserved()) {
                ERRMSG("No memory is reserved for crashkernel!\n");
@@ -11437,9 +11438,22 @@ int show_mem_usage(void)
        if (!open_files_for_creating_dumpfile())
                return FALSE;
 
-       if (!get_elf_loads(info->fd_memory, info->name_memory))
+       if (!get_elf_info(info->fd_memory, info->name_memory))
                return FALSE;
 
+       /*
+        * /proc/kcore on Linux 4.19 and later kernels have vmcoreinfo note in
+        * NOTE segment.  See commit 23c85094fe18.
+        */
+       if (has_vmcoreinfo()) {
+               off_t offset;
+               unsigned long size;
+
+               get_vmcoreinfo(&offset, &size);
+               vmcoreinfo = read_vmcoreinfo_from_vmcore(offset, size, FALSE);
+               DEBUG_MSG("Read vmcoreinfo from NOTE segment: %d\n", 
vmcoreinfo);
+       }
+
        if (!get_page_offset())
                return FALSE;
 
@@ -11447,11 +11461,13 @@ int show_mem_usage(void)
        if (!get_phys_base())
                return FALSE;
 
-       if (!get_sys_kernel_vmcoreinfo(&vmcoreinfo_addr, &vmcoreinfo_len))
-               return FALSE;
+       if (!vmcoreinfo) {
+               if (!get_sys_kernel_vmcoreinfo(&vmcoreinfo_addr, 
&vmcoreinfo_len))
+                       return FALSE;
 
-       if (!set_kcore_vmcoreinfo(vmcoreinfo_addr, vmcoreinfo_len))
-               return FALSE;
+               if (!set_kcore_vmcoreinfo(vmcoreinfo_addr, vmcoreinfo_len))
+                       return FALSE;
+       }
 
        if (!initial())
                return FALSE;
-- 
2.9.3


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