86a81de3e5
Patches have been taken from kexec-tools and makedumpfile to fix issue
with `makedumpfile --mem-usage /proc/kcore`.
Two of the patches is from kexec-tools and rest are from makedumpfile.
All the patches have been acked upstream and applies without conflict.
Kexec-tools patches:
(kexec-tools-2.0.14-x86-x86_64-Fix-format-warning-with-die.patch), which
fixes koji build issue.
kexec-tools-2.0.14-build_mem_phdrs-check-if-p_paddr-is-invalid.patch fixes
the regresssion caused by kernel /proc/kcore fix to use -1 as default value
of p_paddr for pt_loads. Without his patch kexec -p will fail with latest
kernel.
Other makedumpfile patches are backported to support --mem-usage while
kernel kaslr being enabled. Details please see the patch log of the individual
patches.
All the patches are backport of upstream commits.
Patches has been tested with kernel 4.11.0-0.rc1.git0.1.fc26.x86_64.
# makedumpfile --mem-usage /proc/kcore -f
The kernel version is not supported.
The makedumpfile operation may be incomplete.
TYPE PAGES EXCLUDABLE DESCRIPTION
----------------------------------------------------------------------
ZERO 1960 yes Pages filled
with zero
NON_PRI_CACHE 22850 yes Cache pages
without private flag
PRI_CACHE 1517 yes Cache pages with
private flag
USER 32522 yes User process
pages
FREE 1898981 yes Free pages
KERN_DATA 78721 no Dumpable kernel
data
page size: 4096
Total pages on system: 2036551
Total size on system: 8341712896 Byte
We won't need to pass -f once fedora kernel is rebased with v4.12.
Signed-off-by: Pratyush Anand <panand@redhat.com>
Acked-by: Dave Young <dyoung@redhat.com>
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
From f4ab6897a716d3f3959f6cb8cab27744eaecb5a6 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <f4ab6897a716d3f3959f6cb8cab27744eaecb5a6.1489471500.git.panand@redhat.com>
|
|
In-Reply-To: <4b0bed3523a5f6c2c428d9dab3d27d4572207d52.1489471500.git.panand@redhat.com>
|
|
References: <4b0bed3523a5f6c2c428d9dab3d27d4572207d52.1489471500.git.panand@redhat.com>
|
|
From: Pratyush Anand <panand@redhat.com>
|
|
Date: Thu, 2 Mar 2017 17:37:16 +0900
|
|
Subject: [PATCH 4/7] [PATCH v3 4/7] elf_info: kcore: check for invalid
|
|
physical address
|
|
|
|
kcore passes correct phys_start for direct mapped region and an invalid
|
|
value (-1) for all other regions after the kernel commit
|
|
464920104bf7(/proc/kcore: update physical address for kcore ram and
|
|
text). arch specific function is_phys_addr() accepts only virt_start.
|
|
Therefore, check for valid phys_start in get_kcore_dump_loads().
|
|
|
|
Signed-off-by: Pratyush Anand <panand@redhat.com>
|
|
---
|
|
elf_info.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/makedumpfile-1.6.1/elf_info.c b/makedumpfile-1.6.1/elf_info.c
|
|
index 65ff333cf33a..c5743b3cab28 100644
|
|
--- a/makedumpfile-1.6.1/elf_info.c
|
|
+++ b/makedumpfile-1.6.1/elf_info.c
|
|
@@ -881,7 +881,8 @@ int get_kcore_dump_loads(void)
|
|
|
|
for (i = 0; i < num_pt_loads; ++i) {
|
|
struct pt_load_segment *p = &pt_loads[i];
|
|
- if (!is_phys_addr(p->virt_start))
|
|
+ if (p->phys_start == NOT_PADDR
|
|
+ || !is_phys_addr(p->virt_start))
|
|
continue;
|
|
loads++;
|
|
}
|
|
@@ -901,7 +902,8 @@ int get_kcore_dump_loads(void)
|
|
|
|
for (i = 0, j = 0; i < num_pt_loads; ++i) {
|
|
struct pt_load_segment *p = &pt_loads[i];
|
|
- if (!is_phys_addr(p->virt_start))
|
|
+ if (p->phys_start == NOT_PADDR
|
|
+ || !is_phys_addr(p->virt_start))
|
|
continue;
|
|
if (j >= loads)
|
|
return FALSE;
|
|
--
|
|
2.9.3
|
|
|