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>
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From 4c53423b995463067fbbd394e724b4d1d6ea3d62 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <4c53423b995463067fbbd394e724b4d1d6ea3d62.1489471500.git.panand@redhat.com>
|
|
In-Reply-To: <4b0bed3523a5f6c2c428d9dab3d27d4572207d52.1489471500.git.panand@redhat.com>
|
|
References: <4b0bed3523a5f6c2c428d9dab3d27d4572207d52.1489471500.git.panand@redhat.com>
|
|
From: Baoquan He <bhe@redhat.com>
|
|
Date: Thu, 2 Mar 2017 17:37:19 +0900
|
|
Subject: [PATCH 5/7] [PATCH v3 5/7] makedumpfile: Correct the calculation of
|
|
kvaddr in set_kcore_vmcoreinfo
|
|
|
|
In set_kcore_vmcoreinfo, we calculate the virtual address of vmcoreinfo
|
|
by OR operation as below:
|
|
|
|
kvaddr = (ulong)vmcoreinfo_addr | PAGE_OFFSET;
|
|
|
|
When mm sections kaslr is not enabled, this is correct since the
|
|
starting address of direct mapping section is 0xffff880000000000 which
|
|
is 1T aligned. Usually system with memory below 1T won't cause problem.
|
|
|
|
However with mm section kaslr enabled, the starting address of direct
|
|
mapping is 1G aligned. The above code makes kvaddr unsure.
|
|
|
|
So change it to adding operation:
|
|
kvaddr = (ulong)vmcoreinfo_addr + PAGE_OFFSET;
|
|
|
|
Signed-off-by: Baoquan He <bhe@redhat.com>
|
|
---
|
|
elf_info.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/makedumpfile-1.6.1/elf_info.c b/makedumpfile-1.6.1/elf_info.c
|
|
index c5743b3cab28..100272f83c48 100644
|
|
--- a/makedumpfile-1.6.1/elf_info.c
|
|
+++ b/makedumpfile-1.6.1/elf_info.c
|
|
@@ -372,7 +372,7 @@ int set_kcore_vmcoreinfo(uint64_t vmcoreinfo_addr, uint64_t vmcoreinfo_len)
|
|
off_t offset_desc;
|
|
|
|
offset = UNINITIALIZED;
|
|
- kvaddr = (ulong)vmcoreinfo_addr | PAGE_OFFSET;
|
|
+ kvaddr = (ulong)vmcoreinfo_addr + PAGE_OFFSET;
|
|
|
|
for (i = 0; i < num_pt_loads; ++i) {
|
|
struct pt_load_segment *p = &pt_loads[i];
|
|
--
|
|
2.9.3
|
|
|