From: Huacai Chen <chenhc@xxxxxxxxxx>
Memory layout:
+---------+ end_pfn(e0+128M)
| |
+---------+ e0
| |
| |
| |
+---------+ e1(crashk_res.start)
| |
| |
| |
+---------+ s1(crashk_res.start)
| |
+---------+ s0(start_pfn)
[1] When producing the kernel:
Reserve the crashkernel space through crashkernel="YM@XM", so that
[s1, e1] is reserved for the capture kernel.
If the available memory range is greater than 1G, an additional 128M
range is reserved from top to bottom for the capture kernel (ie
[e0, end_pfn] range). The advantage of this is that it can make more
memory available to the capture kernel and avoid triggering insufficient
memory, resulting in panic.
[2] When capturing the kernel:
Finally, the "mem=" parameter is automatically added through kexec-tools
(the "mem=" parameter actually comes from the "crashkernel=" parameter,
and the scope is the same).
It is necessary to reserve the available memory area of the previous
production kernel to avoid the captured data of the production kernel
from being destroyed. If this area in the memory is not reserved, the
captured data will be destroyed, the generated vmcore file is invalid
and cannot be parsed by the crash-utility.
[3] Only consider the memory situation of kdump operation as follows:
1. Production kernel:
memblock.reserve: [s1, e1] and [e0, end_pfn] (Memory is reserved)
memblock.memory: [s0, s1] and [e1, e0] (Memory available)
2. Capture kernel:
memblock.reserve: [s0, s1] and [e1, e0] (Memory is reserved)
memblock.memory: [s1, e1] and [e0, end_pfn] (Memory available)
In conclusion，[s0, s1] and [e1, e0] memory areas should be reserved.
Signed-off-by: Huacai Chen <chenhuacai@xxxxxxxxxx>
Signed-off-by: Youling Tang <tangyouling@xxxxxxxxxxx>
---
v2:
- New patch.
arch/mips/kernel/setup.c | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index af2c860..aa89f28 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -55,6 +55,8 @@ EXPORT_SYMBOL(cpu_data);
struct screen_info screen_info;
#endif
+static phys_addr_t crashmem_start, crashmem_size;
+
/*
* Setup information
*
@@ -367,6 +369,11 @@ static int __init early_parse_mem(char *p)
memblock_add_node(start, size, pa_to_nid(start));
+ if (strstr(boot_command_line, "elfcorehdr") && start && size) {
+ crashmem_start = start;
+ crashmem_size = size;
+ }
+
return 0;
}
early_param("mem", early_parse_mem);
@@ -525,6 +532,36 @@ static void reserve_crashm_region(int node, unsigned long s0, unsigned long e0)
}
#endif /* !defined(CONFIG_KEXEC) */
+/*
+ * After the kdump operation is performed to enter the capture kernel, the
+ * memory area used by the previous production kernel should be reserved to
+ * avoid destroy to the captured data.
+ */
+static void reserve_oldmem_region(int node, unsigned long s0, unsigned long e0)
+{
+ unsigned long s1, e1;
+
+ if (!is_kdump_kernel())
+ return;
+
+ if ((e0 - s0) > (SZ_1G >> PAGE_SHIFT))
+ e0 = e0 - (SZ_128M >> PAGE_SHIFT);
+
+ /* crashmem_start is crashk_res reserved by primary production kernel */
+ s1 = PFN_UP(crashmem_start);
+ e1 = PFN_DOWN(crashmem_start + crashmem_size);
+
+ if (s1 == 0)
+ return;
+
+ if (node == 0) {
+ memblock_reserve(PFN_PHYS(s0), (s1 - s0) << PAGE_SHIFT);
+ memblock_reserve(PFN_PHYS(e1), (e0 - e1) << PAGE_SHIFT);
+ } else {
+ memblock_reserve(PFN_PHYS(s0), (e0 - s0) << PAGE_SHIFT);
+ }
+}
+
static void __init check_kernel_sections_mem(void)
{
phys_addr_t start = __pa_symbol(&_text);
@@ -696,6 +733,7 @@ static void __init arch_mem_init(char **cmdline_p)
for_each_online_node(node) {
get_pfn_range_for_nid(node, &start_pfn, &end_pfn);
reserve_crashm_region(node, start_pfn, end_pfn);
+ reserve_oldmem_region(node, start_pfn, end_pfn);
}
device_tree_init();
--
2.1.0
_______________________________________________
kexec mailing list
kexec@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/kexec
