diff --git a/makedumpfile-sadump-Fix-failure-of-reading.patch b/makedumpfile-sadump-Fix-failure-of-reading.patch new file mode 100644 index 0000000..62cfdcd --- /dev/null +++ b/makedumpfile-sadump-Fix-failure-of-reading.patch @@ -0,0 +1,54 @@ +From: "saito.kazuya@fujitsu.com" +Date: Thu, 21 May 2020 07:15:19 +0000 +Subject: sadump: Fix failure of reading __per_cpu_load memory +References: bsc#1168798 +Upstream: merged +Git-commit: c9e078531efaffbe6f780221d40bdac21a84855b + +Creating vmcore from sadump by makedumpfile fails with the following +error messages since kernel-4.19 with PTI (Page Table Isolation) +enabled: + + __vtop4_x86_64: Can't get a valid pte. + readmem: Can't convert a virtual address(ffffffffb2986000) to physical address. + readmem: type_addr: 0, addr:ffffffffb2986000, size:8 + per_cpu_init: Can't read __per_cpu_load memory. + +This is caused by the following patch: +https://github.com/torvalds/linux/commit/c40a56a7818cfe735fc93a69e1875f8bba834483 + +The above patch clears _PAGE_PRESENT bit of __per_cpu_load memory, so +__vtop4_x86_64 fails to convert the virtual address of the +__per_cpu_load. + +To fix this issue, this patch changes sanity check of per_cpu_ptr() +to use address of the __per_cpu_load instead of data of the memory. + +Signed-off-by: Kazuya Saito +Signed-off-by: Kiyotaka Nakamura +--- + sadump_info.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sadump_info.c b/sadump_info.c +index 46867ce..72a077b 100644 +--- a/sadump_info.c ++++ b/sadump_info.c +@@ -1732,11 +1732,11 @@ per_cpu_init(void) + return FALSE; + } + +- if (!readmem(VADDR, SYMBOL(__per_cpu_load), &si->__per_cpu_load, +- sizeof(unsigned long))) { +- ERRMSG("Can't read __per_cpu_load memory.\n"); ++ if (SYMBOL(__per_cpu_load) == NOT_FOUND_SYMBOL) { ++ ERRMSG("Can't find __per_cpu_load symbol.\n"); + return FALSE; + } ++ si->__per_cpu_load = SYMBOL(__per_cpu_load); + + DEBUG_MSG("sadump: __per_cpu_load: %#lx\n", si->__per_cpu_load); + DEBUG_MSG("sadump: __per_cpu_offset: LENGTH: %ld\n", +-- +2.26.2 + diff --git a/makedumpfile.changes b/makedumpfile.changes index d02a3e1..5b517c4 100644 --- a/makedumpfile.changes +++ b/makedumpfile.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 4 09:57:15 UTC 2020 - Petr Tesařík + +- makedumpfile-sadump-Fix-failure-of-reading.patch: sadump: Fix + failure of reading __per_cpu_load memory (bsc#1168798). + ------------------------------------------------------------------- Fri Apr 3 05:51:49 UTC 2020 - Martin Liška diff --git a/makedumpfile.spec b/makedumpfile.spec index dc5f0cc..aed6a5e 100644 --- a/makedumpfile.spec +++ b/makedumpfile.spec @@ -45,6 +45,7 @@ Patch2: %{name}-ppc64-VA-range-SUSE.patch Patch3: %{name}-PN_XNUM.patch Patch4: %{name}-arm64-Align-PMD_SECTION_MASK-with-PHYS_MASK.patch Patch5: %{name}-Fix-cd_header-offset-overflow-with-large-pfn.patch +Patch6: %{name}-sadump-Fix-failure-of-reading.patch BuildRequires: libdw-devel BuildRequires: libelf-devel BuildRequires: libeppic-devel