080f64dafa
- Update to version 2.0.14 (bsc#1039937, FATE#320672, FATE#320671) Changelog: http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.13..v2.0.14 - Backport upstream fixes (bsc#1039937, FATE#320672, FATE#320671) 0001-kexec-tools-2.0.14.git.patch 0002-ppc64-Reduce-number-of-ELF-LOAD-segments.patch 0003-kexec-Increase-the-upper-limit-for-RAM-segments.patch 0004-alpha-add-missing-__NR_kexec_load-definition.patch 0005-kexec-implemented-XEN-KEXEC-STATUS-to-determine-if-a.patch 0006-kexec-Remove-redundant-space-from-help-message.patch 0007-purgatory-Add-purgatory.map-and-purgatory.ro.sym-to-.patch 0008-kexec-Add-option-to-get-crash-kernel-region-size.patch 0009-crashdump-arm-Add-get_crash_kernel_load_range-functi.patch 0010-crashdump-arm64-Add-get_crash_kernel_load_range-func.patch 0011-crashdump-cris-Add-get_crash_kernel_load_range-funct.patch 0012-crashdump-ia64-Add-get_crash_kernel_load_range-funct.patch 0013-crashdump-m68k-Add-get_crash_kernel_load_range-funct.patch 0014-crashdump-mips-Add-get_crash_kernel_load_range-funct.patch 0015-crashdump-ppc-Add-get_crash_kernel_load_range-functi.patch 0016-crashdump-ppc64-Add-get_crash_kernel_load_range-func.patch 0017-crashdump-s390-Add-get_crash_kernel_load_range-funct.patch 0018-crashdump-sh-Add-get_crash_kernel_load_range-functio.patch 0019-gitignore-add-two-generated-files-in-purgatory.patch 0020-Only-print-debug-message-when-failed-to-serach-for-k.patch 0021-build_mem_phdrs-check-if-p_paddr-is-invalid.patch 0022-uImage-fix-realloc-pointer-confusion.patch 0023-uImage-Fix-uImage_load-for-little-endian-machines.patch 0024-uImage-Add-new-IH_ARCH_xxx-definitions.patch 0025-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch 0026-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch 0027-arm64-add-uImage-support.patch OBS-URL: https://build.opensuse.org/request/show/500203 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=83
67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
From f63d8530b9b6a2d7e79b946e326e5a2197eb8f87 Mon Sep 17 00:00:00 2001
|
|
From: Petr Tesarik <ptesarik@suse.com>
|
|
Date: Thu, 19 Jan 2017 18:37:09 +0100
|
|
Subject: [PATCH 02/45] ppc64: Reduce number of ELF LOAD segments
|
|
|
|
The number of program header table entries (e_phnum) is an Elf64_Half,
|
|
which is a 16-bit entity, i.e. the limit is 65534 entries (one entry is
|
|
reserved for NOTE). This is a hard limit, defined by the ELF standard.
|
|
It is possible that more LMBs (Logical Memory Blocks) are needed to
|
|
represent all RAM on some machines, and this field overflows, causing
|
|
an incomplete /proc/vmcore file.
|
|
|
|
This has actually happened on a machine with 31TB of RAM and an LMB size
|
|
of 256MB.
|
|
|
|
However, since there is usually no memory hole between adjacent LMBs, the
|
|
map can be "compressed", combining multiple adjacent into a single LOAD
|
|
segment.
|
|
|
|
Signed-off-by: Petr Tesarik <ptesarik@suse.com>
|
|
Signed-off-by: Simon Horman <horms@verge.net.au>
|
|
---
|
|
kexec/arch/ppc64/crashdump-ppc64.c | 12 +++++++++++-
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/kexec/arch/ppc64/crashdump-ppc64.c b/kexec/arch/ppc64/crashdump-ppc64.c
|
|
index b3c89285a733..f62b1599c162 100644
|
|
--- a/kexec/arch/ppc64/crashdump-ppc64.c
|
|
+++ b/kexec/arch/ppc64/crashdump-ppc64.c
|
|
@@ -123,6 +123,7 @@ static void exclude_crash_region(uint64_t start, uint64_t end)
|
|
static int get_dyn_reconf_crash_memory_ranges(void)
|
|
{
|
|
uint64_t start, end;
|
|
+ uint64_t startrange, endrange;
|
|
char fname[128], buf[32];
|
|
FILE *file;
|
|
unsigned int i;
|
|
@@ -137,6 +138,7 @@ static int get_dyn_reconf_crash_memory_ranges(void)
|
|
}
|
|
|
|
fseek(file, 4, SEEK_SET);
|
|
+ startrange = endrange = 0;
|
|
for (i = 0; i < num_of_lmbs; i++) {
|
|
if ((n = fread(buf, 1, 24, file)) < 0) {
|
|
perror(fname);
|
|
@@ -162,8 +164,16 @@ static int get_dyn_reconf_crash_memory_ranges(void)
|
|
if ((flags & 0x80) || !(flags & 0x8))
|
|
continue;
|
|
|
|
- exclude_crash_region(start, end);
|
|
+ if (start != endrange) {
|
|
+ if (startrange != endrange)
|
|
+ exclude_crash_region(startrange, endrange);
|
|
+ startrange = start;
|
|
+ }
|
|
+ endrange = end;
|
|
}
|
|
+ if (startrange != endrange)
|
|
+ exclude_crash_region(startrange, endrange);
|
|
+
|
|
fclose(file);
|
|
return 0;
|
|
}
|
|
--
|
|
2.13.0
|
|
|