From 145707b5b6495467515cb6f3e0814df81cb55404 Mon Sep 17 00:00:00 2001

Message-Id: <145707b5b6495467515cb6f3e0814df81cb55404.1431708455.git.panand@redhat.com>

From: Pratyush Anand <panand@redhat.com>

Date: Tue, 28 Apr 2015 15:15:15 +0530

Subject: [PATCH] makedumpfile: Support ARM64

Patch adds support for ARM64 in makedumpfile. It takes care of vmalloc,

vmemmap, module and directly map kernel memory region's translation.

Signed-off-by: Pratyush Anand <panand@redhat.com>

---

 Makefile       |   1 +

 arch/arm64.c   | 259 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 makedumpfile.h |  49 +++++++++++

 3 files changed, 309 insertions(+)

 create mode 100644 arch/arm64.c

diff --git a/makedumpfile-1.5.7/Makefile b/makedumpfile-1.5.7/Makefile

index e45c3cfe5e9d..b8d77dbad856 100644

--- a/makedumpfile-1.5.7/Makefile

+++ b/makedumpfile-1.5.7/Makefile

@@ -49,6 +49,7 @@ SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info

 SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c

 OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))

 SRC_ARCH = arch/arm.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c arch/s390x.c arch/ppc.c

+SRC_ARCH = arch/arm.c arch/arm64.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c arch/s390x.c arch/ppc.c

 OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))

 LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz

diff --git a/makedumpfile-1.5.7/arch/arm64.c b/makedumpfile-1.5.7/arch/arm64.c

new file mode 100644

index 000000000000..28e2adef7ae3

--- /dev/null

+++ b/makedumpfile-1.5.7/arch/arm64.c

@@ -0,0 +1,259 @@

+/*

+ * arch/arm64.c : Based on arch/arm.c

+ *

+ * Copyright (C) 2015 Red Hat, Pratyush Anand <panand@redhat.com>

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation (version 2 of the License).

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

+ */

+

+#ifdef __aarch64__

+

+#include "../elf_info.h"

+#include "../makedumpfile.h"

+#include "../print_info.h"

+

+#if CONFIG_ARM64_PGTABLE_LEVELS == 2

+typedef struct {

+	unsigned long pgd;

+} pgd_t;

+

+typedef struct {

+	pgd_t pgd;

+} pud_t;

+

+typedef struct {

+	pud_t pud;

+} pmd_t;

+

+#define pud_offset(pgd, vaddr) 	((pud_t *)pgd)

+#define pmd_offset(pud, vaddr) 	((pmd_t *)pud)

+#define pgd_val(x)		((x).pgd)

+#define pud_val(x)		(pgd_val((x).pgd))

+#define pmd_val(x)		(pud_val((x).pud))

+

+#define PUD_SHIFT		PGDIR_SHIFT

+#define PUD_SIZE		(1UL << PUD_SHIFT)

+

+#endif

+

+typedef struct {

+	unsigned long pte;

+} pte_t;

+#define pte_val(x)		((x).pte)

+

+#define PAGE_SIZE		(1UL << PAGE_SHIFT)

+#define PAGE_MASK		(~(PAGE_SIZE - 1))

+#define PGDIR_SHIFT		((PAGE_SHIFT - 3) * ARM64_PGTABLE_LEVELS + 3)

+#define PTRS_PER_PGD		(1 << (VA_BITS - PGDIR_SHIFT))

+#define PMD_SHIFT		((PAGE_SHIFT - 3) * 2 + 3)

+#define PTRS_PER_PTE		(1 << (PAGE_SHIFT - 3))

+#define PMD_SHIFT		((PAGE_SHIFT - 3) * 2 + 3)

+#define PMD_SIZE		(1UL << PMD_SHIFT)

+#define PMD_MASK		(~(PMD_SIZE - 1))

+#define PTRS_PER_PMD		PTRS_PER_PTE

+

+#define PAGE_PRESENT		(1 << 0)

+#define SECTIONS_SIZE_BITS	30

+/*

+

+* Highest possible physical address supported.

+*/

+#define PHYS_MASK_SHIFT		48

+#define PHYS_MASK		((1UL << PHYS_MASK_SHIFT) - 1)

+

+#define PMD_TYPE_MASK		3

+#define PMD_TYPE_SECT		1

+#define PMD_TYPE_TABLE		3

+

+#define __va(paddr) 			((paddr) - info->phys_base + PAGE_OFFSET)

+#define __pa(vaddr) 			((vaddr) - PAGE_OFFSET + info->phys_base)

+

+#define pgd_index(vaddr) 		(((vaddr) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))

+#define pgd_offset(pgdir, vaddr)	((pgd_t *)(pgdir) + pgd_index(vaddr))

+

+#define pte_index(addr) 		(((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))

+#define pmd_page_vaddr(pmd)		(__va(pmd_val(pmd) & PHYS_MASK & (int32_t)PAGE_MASK))

+#define pte_offset(dir, vaddr) 		((pte_t*)pmd_page_vaddr((*dir)) + pte_index(vaddr))

+

+/* kernel struct page size can be kernel version dependent, currently

+ * keep it constant.

+ */

+#define KERN_STRUCT_PAGE_SIZE		64

+#define ALIGN(x, a) 			(((x) + (a) - 1) & ~((a) - 1))

+#define PFN_DOWN(x)			((x) >> PAGE_SHIFT)

+#define VMEMMAP_SIZE			ALIGN((1UL << (VA_BITS - PAGE_SHIFT)) * KERN_STRUCT_PAGE_SIZE, PUD_SIZE)

+#define MODULES_END			PAGE_OFFSET

+#define MODULES_VADDR			(MODULES_END - 0x4000000)

+

+int is_vmalloc_addr(unsigned long vaddr)

+{

+	return (vaddr >= VMALLOC_START && vaddr <= VMALLOC_END);

+}

+

+static int is_vtop_from_page_table_arm64(unsigned long vaddr)

+{

+	/* If virtual address lies in vmalloc, vmemmap or module space

+	 * region then, get the physical address from page table.

+	 */

+	return ((vaddr >= VMALLOC_START && vaddr <= VMALLOC_END)

+		|| (vaddr >= VMEMMAP_START && vaddr <= VMEMMAP_END)

+		|| (vaddr >= MODULES_VADDR && vaddr <= MODULES_END));

+}

+

+int get_phys_base_arm64(void)

+{

+	unsigned long phys_base = ULONG_MAX;

+	unsigned long long phys_start;

+	int i;

+	/*

+	 * We resolve phys_base from PT_LOAD segments. LMA contains physical

+	 * address of the segment, and we use the lowest start as

+	 * phys_base.

+	 */

+	for (i = 0; get_pt_load(i, &phys_start, NULL, NULL, NULL); i++) {

+		if (phys_start < phys_base)

+			phys_base = phys_start;

+	}

+

+	if (phys_base == ULONG_MAX) {

+		ERRMSG("Can't determine phys_base\n");

+		return FALSE;

+	}

+

+	info->phys_base = phys_base;

+

+	DEBUG_MSG("phys_base    : %lx\n", phys_base);

+

+	return TRUE;

+}

+

+int get_machdep_info_arm64(void)

+{

+	info->max_physmem_bits = PHYS_MASK_SHIFT;

+	info->section_size_bits = SECTIONS_SIZE_BITS;

+	info->page_offset = KVBASE;

+	info->vmalloc_start = 0xffffffffffffffffUL << VA_BITS;

+	info->vmalloc_end = PAGE_OFFSET - PUD_SIZE - VMEMMAP_SIZE - 0x10000;

+	info->vmemmap_start = VMALLOC_END + 0x10000;

+	info->vmemmap_end = VMEMMAP_START + VMEMMAP_SIZE;

+

+	DEBUG_MSG("max_physmem_bits : %lx\n", info->max_physmem_bits);

+	DEBUG_MSG("section_size_bits: %lx\n", info->section_size_bits);

+	DEBUG_MSG("page_offset      : %lx\n", info->page_offset);

+	DEBUG_MSG("vmalloc_start    : %lx\n", info->vmalloc_start);

+	DEBUG_MSG("vmalloc_end      : %lx\n", info->vmalloc_end);

+	DEBUG_MSG("vmemmap_start    : %lx\n", info->vmemmap_start);

+	DEBUG_MSG("vmemmap_end      : %lx\n", info->vmemmap_end);

+	DEBUG_MSG("modules_start    : %lx\n", MODULES_VADDR);

+	DEBUG_MSG("modules_end      : %lx\n", MODULES_END);

+

+	return TRUE;

+}

+

+unsigned long long kvtop_xen_arm64(unsigned long kvaddr)

+{

+	return ERROR;

+}

+

+int get_xen_basic_info_arm64(void)

+{

+	return ERROR;

+}

+

+int get_xen_info_arm64(void)

+{

+	return ERROR;

+}

+

+int get_versiondep_info_arm64(void)

+{

+	return TRUE;

+}

+

+/*

+ * vtop_arm64() - translate arbitrary virtual address to physical

+ * @vaddr: virtual address to translate

+ *

+ * Function translates @vaddr into physical address using page tables. This

+ * address can be any virtual address. Returns physical address of the

+ * corresponding virtual address or %NOT_PADDR when there is no translation.

+ */

+static unsigned long long vtop_arm64(unsigned long vaddr)

+{

+	unsigned long long paddr = NOT_PADDR;

+	pgd_t	*pgda, pgdv;

+	pud_t	*puda;

+	pmd_t	*pmda, pmdv;

+	pte_t 	*ptea, ptev;

+

+	if (SYMBOL(swapper_pg_dir) == NOT_FOUND_SYMBOL) {

+		ERRMSG("Can't get the symbol of swapper_pg_dir.\n");

+		return NOT_PADDR;

+	}

+

+	pgda = pgd_offset(SYMBOL(swapper_pg_dir), vaddr);

+	if (!readmem(VADDR, (unsigned long long)pgda, &pgdv, sizeof(pgdv))) {

+		ERRMSG("Can't read pgd\n");

+		return NOT_PADDR;

+	}

+

+	puda = pud_offset(pgda, vaddr);

+	pmda = pmd_offset(puda, vaddr);

+	if (!readmem(VADDR, (unsigned long long)pmda, &pmdv, sizeof(pmdv))) {

+		ERRMSG("Can't read pmd\n");

+		return NOT_PADDR;

+	}

+

+	switch (pmd_val(pmdv) & PMD_TYPE_MASK) {

+	case PMD_TYPE_TABLE:

+		ptea = pte_offset(&pmdv, vaddr);

+		/* 64k page */

+		if (!readmem(VADDR, (unsigned long long)ptea, &ptev, sizeof(ptev))) {

+			ERRMSG("Can't read pte\n");

+			return NOT_PADDR;

+		}

+

+		if (!(pte_val(ptev) & PAGE_PRESENT)) {

+			ERRMSG("Can't get a valid pte.\n");

+			return NOT_PADDR;

+		} else {

+

+			paddr = (PAGEBASE(pte_val(ptev)) & PHYS_MASK)

+					+ (vaddr & (PAGESIZE() - 1));

+		}

+		break;

+	case PMD_TYPE_SECT:

+		/* 1GB section */

+		paddr = (pmd_val(pmdv) & PMD_MASK) + (vaddr & (PMD_SIZE - 1));

+		break;

+	}

+

+	return paddr;

+}

+

+unsigned long long vaddr_to_paddr_arm64(unsigned long vaddr)

+{

+	/*

+	 * use translation tables when a) user has explicitly requested us to

+	 * perform translation for a given address. b) virtual address lies in

+	 * vmalloc, vmemmap or modules memory region. Otherwise we assume that

+	 * the translation is done within the kernel direct mapped region.

+	 */

+	if ((info->vaddr_for_vtop == vaddr) ||

+			is_vtop_from_page_table_arm64(vaddr))

+		return vtop_arm64(vaddr);

+

+	return __pa(vaddr);

+}

+#endif

diff --git a/makedumpfile-1.5.7/makedumpfile.h b/makedumpfile-1.5.7/makedumpfile.h

index 96830b071f6e..2af3a8e72e0a 100644

--- a/makedumpfile-1.5.7/makedumpfile.h

+++ b/makedumpfile-1.5.7/makedumpfile.h

@@ -483,6 +483,33 @@ do { \

 #define VMEMMAP_START		(info->vmemmap_start)

 #define VMEMMAP_END		(info->vmemmap_end)

+#ifdef __aarch64__

+#define CONFIG_ARM64_PGTABLE_LEVELS	2

+#define CONFIG_ARM64_VA_BITS		42

+#define CONFIG_ARM64_64K_PAGES		1

+

+/* Currently we only suport following defines based on above

+ * config definitions.

+ * TODOs: We need to find a way to get above defines dynamically and

+ * then to support following definitions based on that

+ */

+

+#if CONFIG_ARM64_PGTABLE_LEVELS == 2

+#define ARM64_PGTABLE_LEVELS	2

+#endif

+

+#if CONFIG_ARM64_VA_BITS == 42

+#define VA_BITS			42

+#endif

+

+#ifdef CONFIG_ARM64_64K_PAGES

+#define PAGE_SHIFT		16

+#endif

+

+#define KVBASE_MASK		(0xffffffffffffffffUL << (VA_BITS - 1))

+#define KVBASE			(SYMBOL(_stext) & KVBASE_MASK)

+#endif /* aarch64 */

+

 #ifdef __arm__

 #define KVBASE_MASK		(0xffff)

 #define KVBASE			(SYMBOL(_stext) & ~KVBASE_MASK)

@@ -757,6 +784,23 @@ do { \

 /*

  * The function of dependence on machine

  */

+#ifdef __aarch64__

+int get_phys_base_arm64(void);

+int get_machdep_info_arm64(void);

+unsigned long long vaddr_to_paddr_arm64(unsigned long vaddr);

+int get_versiondep_info_arm64(void);

+int get_xen_basic_info_arm64(void);

+int get_xen_info_arm64(void);

+int is_vmalloc_addr_arm64(unsigned long vaddr);

+#define vaddr_to_paddr(X)	vaddr_to_paddr_arm64(X)

+#define get_phys_base()		get_phys_base_arm64()

+#define get_machdep_info()	get_machdep_info_arm64()

+#define get_versiondep_info()	get_versiondep_info_arm64()

+#define get_xen_basic_info_arch(X) get_xen_basic_info_arm64(X)

+#define get_xen_info_arch(X) 	get_xen_info_arm64(X)

+#define is_vmalloc_addr(X)	is_vmalloc_addr_arm64(X)

+#endif /* aarch64 */

+

 #ifdef __arm__

 int get_phys_base_arm(void);

 int get_machdep_info_arm(void);

@@ -1581,6 +1625,11 @@ struct domain_list {

 #define PAGES_PER_MAPWORD 	(sizeof(unsigned long) * 8)

 #define MFNS_PER_FRAME		(info->page_size / sizeof(unsigned long))

+#ifdef __aarch64__

+unsigned long long kvtop_xen_arm64(unsigned long kvaddr);

+#define kvtop_xen(X)	kvtop_xen_arm64(X)

+#endif /* aarch64 */

+

 #ifdef __arm__

 #define kvtop_xen(X)	FALSE

 #define get_xen_basic_info_arch(X) FALSE

-- 

2.1.0