From dd3886b82ed56c18d9d6d0e7228a2b31eed0ec5a Mon Sep 17 00:00:00 2001

Message-Id: <dd3886b82ed56c18d9d6d0e7228a2b31eed0ec5a.1489676829.git.panand@redhat.com>

In-Reply-To: <f85183096d31d865c97565614535d84943b12908.1489676829.git.panand@redhat.com>

References: <f85183096d31d865c97565614535d84943b12908.1489676829.git.panand@redhat.com>

From: AKASHI Takahiro <takahiro.akashi@linaro.org>

Date: Wed, 15 Mar 2017 18:38:20 +0900

Subject: [PATCH 06/10] arm64: kdump: add elf core header segment

Elf core header contains the information necessary for the coredump of

the 1st kernel, including its physcal memory layout as well as cpu register

states at the panic.

The segment is allocated inside the reserved memory of crash dump kernel.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>

---

 kexec/arch/arm64/crashdump-arm64.c | 96 ++++++++++++++++++++++++++++++++++++++

 kexec/arch/arm64/crashdump-arm64.h |  3 ++

 kexec/arch/arm64/iomem.h           |  2 +

 kexec/arch/arm64/kexec-elf-arm64.c | 10 ++++

 4 files changed, 111 insertions(+)

diff --git a/kexec/arch/arm64/crashdump-arm64.c b/kexec/arch/arm64/crashdump-arm64.c

index dcaca434af62..83461312d412 100644

--- a/kexec/arch/arm64/crashdump-arm64.c

+++ b/kexec/arch/arm64/crashdump-arm64.c

@@ -39,6 +39,39 @@ struct memory_ranges usablemem_rgns = {

 	.ranges = &crash_reserved_mem,

 };

+struct memory_range elfcorehdr_mem;

+

+static struct crash_elf_info elf_info = {

+	.class		= ELFCLASS64,

+#if (__BYTE_ORDER == __LITTLE_ENDIAN)

+	.data		= ELFDATA2LSB,

+#else

+	.data		= ELFDATA2MSB,

+#endif

+	.machine	= EM_AARCH64,

+};

+

+/*

+ * Note: The returned value is correct only if !CONFIG_RANDOMIZE_BASE.

+ */

+static uint64_t get_kernel_page_offset(void)

+{

+	int i;

+

+	if (elf_info.kern_vaddr_start == UINT64_MAX)

+		return UINT64_MAX;

+

+	/* Current max virtual memory range is 48-bits. */

+	for (i = 48; i > 0; i--)

+		if (!(elf_info.kern_vaddr_start & (1UL << i)))

+			break;

+

+	if (i <= 0)

+		return UINT64_MAX;

+	else

+		return UINT64_MAX << i;

+}

+

 /*

  * iomem_range_callback() - callback called for each iomem region

  * @data: not used

@@ -62,6 +95,10 @@ static int iomem_range_callback(void *UNUSED(data), int UNUSED(nr),

 	else if (strncmp(str, SYSTEM_RAM, strlen(SYSTEM_RAM)) == 0)

 		return mem_regions_add(&crash_memory_rgns,

 				       base, length, RANGE_RAM);

+	else if (strncmp(str, KERNEL_CODE, strlen(KERNEL_CODE)) == 0)

+		elf_info.kern_paddr_start = base;

+	else if (strncmp(str, KERNEL_DATA, strlen(KERNEL_DATA)) == 0)

+		elf_info.kern_size = base + length - elf_info.kern_paddr_start;

 	return 0;

 }

@@ -115,5 +152,64 @@ static int crash_get_memory_ranges(void)

 	dbgprint_mem_range("Coredump memory ranges",

 			   crash_memory_rgns.ranges, crash_memory_rgns.size);

+	/*

+	 * For additional kernel code/data segment.

+	 * kern_paddr_start/kern_size are determined in iomem_range_callback

+	 */

+	elf_info.kern_vaddr_start = get_kernel_sym("_text");

+	if (!elf_info.kern_vaddr_start)

+		elf_info.kern_vaddr_start = UINT64_MAX;

+

+	return 0;

+}

+

+/*

+ * load_crashdump_segments() - load the elf core header

+ * @info: kexec info structure

+ *

+ * This function creates and loads an additional segment of elf core header

+ : which is used to construct /proc/vmcore on crash dump kernel.

+ *

+ * Return 0 in case of success and -1 in case of error.

+ */

+

+int load_crashdump_segments(struct kexec_info *info)

+{

+	unsigned long elfcorehdr;

+	unsigned long bufsz;

+	void *buf;

+	int err;

+

+	/*

+	 * First fetch all the memory (RAM) ranges that we are going to

+	 * pass to the crash dump kernel during panic.

+	 */

+

+	err = crash_get_memory_ranges();

+

+	if (err)

+		return err;

+

+	elf_info.page_offset = get_kernel_page_offset();

+	dbgprintf("%s: page_offset:   %016llx\n", __func__,

+			elf_info.page_offset);

+

+	err = crash_create_elf64_headers(info, &elf_info,

+			crash_memory_rgns.ranges, crash_memory_rgns.size,

+			&buf, &bufsz, ELF_CORE_HEADER_ALIGN);

+

+	if (err)

+		return err;

+

+	elfcorehdr = add_buffer_phys_virt(info, buf, bufsz, bufsz, 0,

+		crash_reserved_mem.start, crash_reserved_mem.end,

+		-1, 0);

+

+	elfcorehdr_mem.start = elfcorehdr;

+	elfcorehdr_mem.end = elfcorehdr + bufsz - 1;

+

+	dbgprintf("%s: elfcorehdr 0x%llx-0x%llx\n", __func__,

+			elfcorehdr_mem.start, elfcorehdr_mem.end);

+

 	return 0;

 }

diff --git a/kexec/arch/arm64/crashdump-arm64.h b/kexec/arch/arm64/crashdump-arm64.h

index 07a0ed0bc344..da75a2d0c5f1 100644

--- a/kexec/arch/arm64/crashdump-arm64.h

+++ b/kexec/arch/arm64/crashdump-arm64.h

@@ -18,5 +18,8 @@

 extern struct memory_ranges usablemem_rgns;

 extern struct memory_range crash_reserved_mem;

+extern struct memory_range elfcorehdr_mem;

+

+extern int load_crashdump_segments(struct kexec_info *info);

 #endif /* CRASHDUMP_ARM64_H */

diff --git a/kexec/arch/arm64/iomem.h b/kexec/arch/arm64/iomem.h

index 20cda87dbd02..d4864bb44922 100644

--- a/kexec/arch/arm64/iomem.h

+++ b/kexec/arch/arm64/iomem.h

@@ -2,6 +2,8 @@

 #define IOMEM_H

 #define SYSTEM_RAM		"System RAM\n"

+#define KERNEL_CODE		"Kernel code\n"

+#define KERNEL_DATA		"Kernel data\n"

 #define CRASH_KERNEL		"Crash kernel\n"

 #define IOMEM_RESERVED		"reserved\n"

diff --git a/kexec/arch/arm64/kexec-elf-arm64.c b/kexec/arch/arm64/kexec-elf-arm64.c

index daf8bf0df9c4..c70a37ae7732 100644

--- a/kexec/arch/arm64/kexec-elf-arm64.c

+++ b/kexec/arch/arm64/kexec-elf-arm64.c

@@ -119,6 +119,16 @@ int elf_arm64_load(int argc, char **argv, const char *kernel_buf,

 	dbgprintf("%s: PE format:      %s\n", __func__,

 		(arm64_header_check_pe_sig(header) ? "yes" : "no"));

+	if (info->kexec_flags & KEXEC_ON_CRASH) {

+		/* create and initialize elf core header segment */

+		result = load_crashdump_segments(info);

+		if (result) {

+			dbgprintf("%s: Creating eflcorehdr failed.\n",

+								__func__);

+			goto exit;

+		}

+	}

+

 	/* load the kernel */

 	result = elf_exec_load(&ehdr, info);

-- 

2.9.3