forked from pool/kexec-tools
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
53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
From 4a6d67d9e938a7accf128aff23f8ad4bda67f729 Mon Sep 17 00:00:00 2001
|
|
From: Xunlei Pang <xlpang@redhat.com>
|
|
Date: Thu, 23 Mar 2017 19:16:59 +0800
|
|
Subject: [PATCH 33/45] x86: Support large number of memory ranges
|
|
|
|
We got a problem on one SGI 64TB machine, the current kexec-tools
|
|
failed to work due to the insufficient ranges(MAX_MEMORY_RANGES)
|
|
allowed which is defined as 1024(less than the ranges on the machine).
|
|
The kcore header is insufficient due to the same reason as well.
|
|
|
|
To solve this, this patch simply doubles "MAX_MEMORY_RANGES" and
|
|
"KCORE_ELF_HEADERS_SIZE".
|
|
|
|
Signed-off-by: Xunlei Pang <xlpang@redhat.com>
|
|
Tested-by: Frank Ramsay <frank.ramsay@hpe.com>
|
|
Signed-off-by: Simon Horman <horms@verge.net.au>
|
|
---
|
|
kexec/arch/i386/kexec-x86.h | 2 +-
|
|
kexec/crashdump.h | 4 ++--
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h
|
|
index 33df3524f4e2..51855f8db762 100644
|
|
--- a/kexec/arch/i386/kexec-x86.h
|
|
+++ b/kexec/arch/i386/kexec-x86.h
|
|
@@ -1,7 +1,7 @@
|
|
#ifndef KEXEC_X86_H
|
|
#define KEXEC_X86_H
|
|
|
|
-#define MAX_MEMORY_RANGES 1024
|
|
+#define MAX_MEMORY_RANGES 2048
|
|
|
|
enum coretype {
|
|
CORE_TYPE_UNDEF = 0,
|
|
diff --git a/kexec/crashdump.h b/kexec/crashdump.h
|
|
index 86e1ef2523ca..18bd691c33e2 100644
|
|
--- a/kexec/crashdump.h
|
|
+++ b/kexec/crashdump.h
|
|
@@ -7,8 +7,8 @@ extern int get_xen_vmcoreinfo(uint64_t *addr, uint64_t *len);
|
|
|
|
/* Need to find a better way to determine per cpu notes section size. */
|
|
#define MAX_NOTE_BYTES 1024
|
|
-/* Expecting ELF headers to fit in 32K. Increase it if you need more. */
|
|
-#define KCORE_ELF_HEADERS_SIZE 32768
|
|
+/* Expecting ELF headers to fit in 64K. Increase it if you need more. */
|
|
+#define KCORE_ELF_HEADERS_SIZE 65536
|
|
/* The address of the ELF header is passed to the secondary kernel
|
|
* using the kernel command line option memmap=nnn.
|
|
* The smallest unit the kernel accepts is in kilobytes,
|
|
--
|
|
2.13.0
|
|
|