Skip to contentSkip to conversation

arm64 kexec kernel patches

PATCH Superseded Geoff Levand 4 participants 23 messages Jun 3, 2016 – Jun 9, 2016

Subsystems (6)

v17 of 20 Superseded Latest is v20 →

lore
Share & tools
lore
#0 lore raw

v17 cover arm64 kexec kernel patches

This series adds the core support for kexec re-boot and kdump on ARM64. This version of the series combines Takahiro's kdump patches with my kexec patches. Please consider all patches for inclusion.

Takahiro has done some extensive testing for this version with various configurations af endian, image format, memory options and layouts, etc.

To load a second stage kernel and execute a kexec re-boot or to work with kdump on ARM64 systems a series of patches to kexec-tools [2], which have not yet been merged upstream, are needed. Please update to the latest if you have been using an older version.

To examine vmcore (/proc/vmcore), you should use
- gdb v7.7 or later
- crash v7.1.1 or later

[1] https://git.kernel.org/cgit/linux/kernel/git/geoff/linux-kexec.git
[2] https://git.kernel.org/cgit/linux/kernel/git/geoff/kexec-tools.git

Changes for v17 (June 3, 2016, 25m):

o Rebase to Linux-4.7-rc1.
o Added one VMCOREINFO parameter to vmcore for crash utility.
o Added a check for CPUs stuck in kernel.

Changes for v16 (Apr 14, 2016, 23m):

o Rebase to Linux-4.6-rc3.
o Don't try to explicitly enter EL2 at machine_kexec() when VHE in use
o Add unreachable() in case of ipi_cpu_crash_stop()
o Add more "#ifdef" to eliminate code unused when !CONFIG_KEXEC_CORE
o Fix a build error around ipi_cpu_crash_stop() when !CONFIG_HOTPLUG_CPU
o Revert "arm64: Add new hcall HVC_CALL_FUNC"
o Revert "Convert hcalls to use HVC immediate value"
(replaced by James' "hyp/kvm: Extend hyp-stub API to allow function calls
at EL2")

Modified by James:
o Add missing icache maintenance + isb to __kvm_hyp_reset()
o Rework kvm cpu hotplug for VHE

Added by James:
o arm64: head.S: el2_setup() to accept sctlr_el1 as an argument
o arm64: hyp/kvm: Extend hyp-stub API to allow function calls at EL2
o arm64: kvm: Move lr save/restore from do_el2_call into EL1
o arm64: kvm: Move the do_el2_call macro to a header file

Changes for v15 (Mar 14, 2016, 22m):

o Rebase to Linux-4.5.
o Remove DEBUG conditional in 'Add pr_debug output'.

Changes for v14 (Mar 4, 2016, 22m):

o Rebase to Linux-4.5-rc6.
o Rename setup_mm_for_reboot to cpu_install_idmap.
o kdump: leave non-boot cpus online at crash dump
As we don't have to make non-boot (crashed) cpus offline at crash dump, this patch adds a variant of smp_send_stop().
o kdump: use a new device-tree property, "linux,elfcorehdr", instead of traditional "elfcorehdr=" kernel parameter
o limit memory regions based on DT property, "usable-memory", instead of "mem=" kernel parameter
o kdump: fix a build error when !CONFIG_KEXEC_CORE
o kvm: use generic kvm_call_hyp() interface instead of kvm_cpu_reset()
o kvm: initialize only a primary cpu at init_hyp_mode()

Changes for v13 (Jan 15, 2016, 20m):

o Rebase to Linux-4.4.
o Remove align directive from cpu_reset.c.
o Use inline C wrapper for cpu_soft_restart.
o Revert the new image d-cache flush changes of v10.
o Add SCTLR cleanup patch.
o Change pr_devel to pr_debug.
o Call flush_icache_range() for reboot_code_buffer.
o Add .ltorg directive to arm64_relocate_new_kernel.
o Make new asm macro copy_page.
o Change cache maintenence from inner-shareable to non-shareable.
o Rename KEXEC_ARCH_ARM64 to KEXEC_ARCH_AARCH64.

o arm64: kvm: allows kvm cpu hotplug
- remove some garbage code from kvm_host.h
o arm64: kdump: reserve memory for crash dump kernel
- change CONFIG_KEXEC to CONFIG_KEXEC_CORE
- don't panic on crash kernel alloc failure
(thanks to Mark Salter, RH)
o arm64: kdump: implement machine_crash_shutdown()
- change "boot/non-boot cpu" to "crashing/non-crashing cpu"
- introduce is_in_crash_kexec() for readability
- re-introduce machine_kexec_mask_interrupts(), as arch/arm has, to discard unexpected interrupts
- call crash_save_cpu() before making cpus offline to avoid a possible race (thanks to Pratyush Anand/Mark Salter, RH)
o arm64: kdump: update a kernel doc
- clarify that we support "Image" format as well as vmlinux in kdump.txt
o arm64: kdump: relax BUG_ON() if more than one cpus are still active
- change a warning message at the failure of shooting down non-crahsing cpus

Changes for v12 (Nov 24, 2015, 18m):

o No changes, rebase to Linux-4.4-rc2.

Changes for v11 (Nov 6, 2015, 18m):

o Rebase to Linux-4.3.
o Move the new image d-cache flush from arm64_relocate_new_kernel to machine_kexec.
o Pass values to arm64_relocate_new_kernel in registers, not in global variables.
o Fixups to setting the sctlr_el1 and sctlr_el2 flags.

Changes for v10 (Oct 18, 2015, 17m):

o Rebase to Linux-4.3-rc6.
o Move tcr_set_idmap_t0sz to assembler.h.
o Add back simplified cpu_reset routines.
o Combine kexec + kdump patches.

Changes for v9 (Apr 7, 2015, 11m):

o Use new upstream flag IND_FLAGS.

Changes for v8 (Mar 19, 2015, 10m):

o Rebase to Linux-4.0-rc4.
o Re-boot using purgatory only.

Changes for v7 (Jan 16, 2015, 8m):

o Rebase to Linux-3.19-rc4.
o Change from ESR_EL2_ to ESR_ELx_.
o Remove work-arounds for EFI systems.

Changes for v6 (Dec 2, 2014, 7m):

o Rebase to Linux-3.18-rc2

Changes for v5 (Nov 16, 2014, 6m):

Changes for v4 (Oct 3, 2014, 5m):

Changes for v3 (Sept 23, 2014, 4m):

Changes for v2 (Sep 9, 2014, 4m):

o Rebase to Linux-3.17-rc4.
o Move macros from proc-macros.S to assembler.h.
o Convert hcalls to use ISS field.
o Add new hcall HVC_CALL_FUNC.
o Add EL2 switch to soft_restart.

First submission v1 (May 13, 2014):

o Based on Linux-3.15-rc4.

-Geoff

The following changes since commit 1a695a905c18548062509178b98bc91e67510864:

Linux 4.7-rc1 (2016-05-29 09:29:24 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/geoff/linux-kexec.git kexec-v17

for you to fetch changes up to 89f1e3dfe16477c732dac8f407300039c0947568:

Documentation: dt: usable-memory and elfcorehdr nodes for arm64 kexec (2016-06-03 10:12:45 -0700)

----------------------------------------------------------------
AKASHI Takahiro (7):
arm64: kdump: reserve memory for crash dump kernel
arm64: limit memory regions based on DT property, usable-memory
arm64: kdump: implement machine_crash_shutdown()
arm64: kdump: add kdump support
arm64: kdump: add VMCOREINFO for user-space coredump tools
arm64: kdump: enable kdump in the arm64 defconfig
arm64: kdump: update a kernel doc

Geoff Levand (4):
arm64: Add back cpu reset routines arm64/kexec: Add core kexec support arm64/kexec: Add pr_debug output arm64/kexec: Enable kexec in the arm64 defconfig

James Morse (2):
arm64: Add cpus_are_stuck_in_kernel
Documentation: dt: usable-memory and elfcorehdr nodes for arm64 kexec

 Documentation/devicetree/bindings/chosen.txt |  28 +++
 Documentation/kdump/kdump.txt                |  15 +-
 arch/arm64/Kconfig                           |  21 ++
 arch/arm64/configs/defconfig                 |   2 +
 arch/arm64/include/asm/hardirq.h             |   2 +-
 arch/arm64/include/asm/kexec.h               |  87 ++++++++
 arch/arm64/include/asm/smp.h                 |  14 ++
 arch/arm64/include/asm/virt.h                |   5 +
 arch/arm64/kernel/Makefile                   |   3 +
 arch/arm64/kernel/cpu-reset.S                |  54 +++++
 arch/arm64/kernel/cpu-reset.h                |  29 +++
 arch/arm64/kernel/crash_dump.c               |  71 ++++++
 arch/arm64/kernel/hyp-stub.S                 |  11 +-
 arch/arm64/kernel/machine_kexec.c            | 309 +++++++++++++++++++++++++++
 arch/arm64/kernel/relocate_kernel.S          | 131 ++++++++++++
 arch/arm64/kernel/setup.c                    |   7 +-
 arch/arm64/kernel/smp.c                      |  66 ++++++
 arch/arm64/mm/init.c                         | 154 +++++++++++++
 include/uapi/linux/kexec.h                   |   1 +
 19 files changed, 1006 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm64/include/asm/kexec.h
 create mode 100644 arch/arm64/kernel/cpu-reset.S
 create mode 100644 arch/arm64/kernel/cpu-reset.h
 create mode 100644 arch/arm64/kernel/crash_dump.c
 create mode 100644 arch/arm64/kernel/machine_kexec.c
 create mode 100644 arch/arm64/kernel/relocate_kernel.S
Signature · 7 lines
2.5.0


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#1 lore raw

PATCH v17 1/13 arm64: Add back cpu reset routines

Commit 68234df4ea7939f98431aa81113fbdce10c4a84b (arm64: kill flush_cache_all()) removed the global arm64 routines cpu_reset() and cpu_soft_restart() needed by the arm64 kexec and kdump support. Add simplified versions of those two routines back with some changes needed for kexec in the new files cpu_reset.S, and cpu_reset.h.

When a CPU is reset it needs to be put into the exception level it had when it entered the kernel. Update cpu_soft_restart() to accept an argument which signals if the reset address needs to be entered at EL1 or EL2, and add a new hypercall HVC_SOFT_RESTART which is used for the EL2 switch.

---
 arch/arm64/include/asm/virt.h |  5 ++++
 arch/arm64/kernel/cpu-reset.S | 54 +++++++++++++++++++++++++++++++++++++++++++
 arch/arm64/kernel/cpu-reset.h | 29 +++++++++++++++++++++++
 arch/arm64/kernel/hyp-stub.S  | 11 ++++++++-
 4 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm64/kernel/cpu-reset.S
 create mode 100644 arch/arm64/kernel/cpu-reset.h
arch/arm64/include/asm/virt.h +5 -0
index dcbcf8d..bbc6a8c 100644
@@ -34,6 +34,11 @@
  */
 #define HVC_SET_VECTORS 1
 
+/*
+ * HVC_SOFT_RESTART - CPU soft reset, used by the cpu_soft_restart routine.
+ */
+#define HVC_SOFT_RESTART 2
+
 #define BOOT_CPU_MODE_EL1	(0xe11)
 #define BOOT_CPU_MODE_EL2	(0xe12)
 
arch/arm64/kernel/cpu-reset.S new file +54 -0

54 lines not on this page · raw message

arch/arm64/kernel/cpu-reset.h new file +29 -0
new file mode 100644
index 0000000..5a5ea0a
@@ -0,0 +1,29 @@
+/*
+ * CPU reset routines
+ *
+ * Copyright (C) 2015 Huawei Futurewei Technologies.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _ARM64_CPU_RESET_H
+#define _ARM64_CPU_RESET_H
+
+#include <asm/virt.h>
+
+void __cpu_soft_restart(unsigned long el2_switch, unsigned long entry,
+	unsigned long arg0, unsigned long arg1, unsigned long arg2);
+
+static inline void __noreturn cpu_soft_restart(unsigned long el2_switch,
+	unsigned long entry, unsigned long arg0, unsigned long arg1,
+	unsigned long arg2)
+{
+	typeof(__cpu_soft_restart) *restart;
+	restart = (void *)virt_to_phys(__cpu_soft_restart);
+	restart(el2_switch, entry, arg0, arg1, arg2);
+	unreachable();
+}
+
+#endif
arch/arm64/kernel/hyp-stub.S +10 -1
index 8727f44..a129e57 100644
@@ -71,8 +71,17 @@ el1_sync:
 	msr	vbar_el2, x1
 	b	9f
 
+2:	cmp	x0, #HVC_SOFT_RESTART
+	b.ne	3f
+	mov	x0, x2
+	mov	x2, x4
+	mov	x4, x1
+	mov	x1, x3
+	blr	x4
+	b	9f
+
 	/* Someone called kvm_call_hyp() against the hyp-stub... */
-2:	mov     x0, #ARM_EXCEPTION_HYP_GONE
+3:	mov	x0, #ARM_EXCEPTION_HYP_GONE
 
 9:	eret
 ENDPROC(el1_sync)
Signature · 8 lines
2.5.0



_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#4 lore raw

PATCH v17 2/13 arm64: Add cpus_are_stuck_in_kernel

In reply to Geoff Levand

From: James Morse <[email protected]>

kernel/smp.c has a fancy counter that keeps track of the number of CPUs it marked as not-present and left in cpu_park_loop(). If there are any CPUs spinning in here, kexec will release them once the memory is re-used by the new kernel.

We can't return an error once we reach machine_kexec(), so as a sanity check we forbid kexec images to be loaded if there are already cpus stuck in the kernel, or we have multiple cpus and no way of disabling them.

[Split off from a larger patch]
---
 arch/arm64/include/asm/smp.h | 10 ++++++++++
 arch/arm64/kernel/smp.c      |  5 +++++
 2 files changed, 15 insertions(+)
arch/arm64/include/asm/smp.h +10 -0
index 433e504..38712f4 100644
@@ -124,6 +124,16 @@ static inline void cpu_panic_kernel(void)
 	cpu_park_loop();
 }
 
+/*
+ * If a secondary CPU fails to come online, (e.g. due to mismatched features),
+ * it will try to call cpu_die(). If this fails, it updates
+ * cpus_stuck_in_kernel and sits in cpu_park_loop().
+ *
+ * Kexec checks this counter and refuses to load/kexec if it is non-zero, as
+ * cpu_park_loop() would be overwritten releasing the parked cpus.
+ */
+bool cpus_are_stuck_in_kernel(void);
+
 #endif /* ifndef __ASSEMBLY__ */
 
 #endif /* ifndef __ASM_SMP_H */
arch/arm64/kernel/smp.c +5 -0
index 678e084..d0bcd55 100644
@@ -909,3 +909,8 @@ int setup_profiling_timer(unsigned int multiplier)
 {
 	return -EINVAL;
 }
+
+bool cpus_are_stuck_in_kernel(void)
+{
+	return !!cpus_stuck_in_kernel;
+}
Signature · 8 lines
2.5.0



_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#7 lore raw

PATCH v17 3/13 arm64/kexec: Add core kexec support

In reply to Geoff Levand

Add three new files, kexec.h, machine_kexec.c and relocate_kernel.S to the arm64 architecture that add support for the kexec re-boot mechanism (CONFIG_KEXEC) on arm64 platforms.

---
 arch/arm64/Kconfig                  |  10 ++
 arch/arm64/include/asm/kexec.h      |  48 +++++++++
 arch/arm64/kernel/Makefile          |   2 +
 arch/arm64/kernel/machine_kexec.c   | 187 ++++++++++++++++++++++++++++++++++++
 arch/arm64/kernel/relocate_kernel.S | 131 +++++++++++++++++++++++++
 include/uapi/linux/kexec.h          |   1 +
 6 files changed, 379 insertions(+)
 create mode 100644 arch/arm64/include/asm/kexec.h
 create mode 100644 arch/arm64/kernel/machine_kexec.c
 create mode 100644 arch/arm64/kernel/relocate_kernel.S
arch/arm64/Kconfig +10 -0
index 76747d9..00aa50b 100644
@@ -643,6 +643,16 @@ config PARAVIRT_TIME_ACCOUNTING
 
 	  If in doubt, say N here.
 
+config KEXEC
+	depends on PM_SLEEP_SMP
+	select KEXEC_CORE
+	bool "kexec system call"
+	---help---
+	  kexec is a system call that implements the ability to shutdown your
+	  current kernel, and to start another kernel.  It is like a reboot
+	  but it is independent of the system firmware.   And like a reboot
+	  you can start any kernel with it, not just Linux.
+
 config XEN_DOM0
 	def_bool y
 	depends on XEN
arch/arm64/include/asm/kexec.h new file +48 -0

48 lines not on this page · raw message

arch/arm64/kernel/Makefile +2 -0
index 2173149..7700c0c 100644
@@ -46,6 +46,8 @@ arm64-obj-$(CONFIG_ARM64_ACPI_PARKING_PROTOCOL)	+= acpi_parking_protocol.o
 arm64-obj-$(CONFIG_PARAVIRT)		+= paravirt.o
 arm64-obj-$(CONFIG_RANDOMIZE_BASE)	+= kaslr.o
 arm64-obj-$(CONFIG_HIBERNATION)		+= hibernate.o hibernate-asm.o
+arm64-obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o	\
+					   cpu-reset.o
 
 obj-y					+= $(arm64-obj-y) vdso/
 obj-m					+= $(arm64-obj-m)
arch/arm64/kernel/machine_kexec.c new file +187 -0

187 lines not on this page · raw message

arch/arm64/kernel/relocate_kernel.S new file +131 -0

131 lines not on this page · raw message

include/uapi/linux/kexec.h +1 -0
index 99048e5..aae5ebf 100644
@@ -39,6 +39,7 @@
 #define KEXEC_ARCH_SH      (42 << 16)
 #define KEXEC_ARCH_MIPS_LE (10 << 16)
 #define KEXEC_ARCH_MIPS    ( 8 << 16)
+#define KEXEC_ARCH_AARCH64 (183 << 16)
 
 /* The artificial cap on the number of segments passed to kexec_load. */
 #define KEXEC_SEGMENT_MAX 16
Signature · 8 lines
2.5.0



_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#8 lore raw

PATCH v17 4/13 arm64/kexec: Add pr_debug output

In reply to Geoff Levand

To aid in debugging kexec problems or when adding new functionality to kexec add a new routine kexec_image_info() and several inline pr_debug statements.

---
 arch/arm64/kernel/machine_kexec.c | 63 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
arch/arm64/kernel/machine_kexec.c +63 -0
index bb05529..f232bca 100644
@@ -11,6 +11,7 @@
 
 #include <linux/highmem.h>
 #include <linux/kexec.h>
+#include <linux/libfdt_env.h>
 #include <linux/of_fdt.h>
 #include <linux/slab.h>
 #include <linux/smp.h>
@@ -29,6 +30,47 @@ extern const unsigned long arm64_relocate_new_kernel_size;
 
 static unsigned long kimage_start;
 
+/**
+ * kexec_is_dtb - Helper routine to check the device tree header signature.
+ */
+static bool kexec_is_dtb(const void *dtb)
+{
+	__be32 magic;
+
+	if (get_user(magic, (__be32 *)dtb))
+		return false;
+
+	return fdt32_to_cpu(magic) == OF_DT_HEADER;
+}
+
+/**
+ * kexec_image_info - For debugging output.
+ */
+#define kexec_image_info(_i) _kexec_image_info(__func__, __LINE__, _i)
+static void _kexec_image_info(const char *func, int line,
+	const struct kimage *kimage)
+{
+	unsigned long i;
+
+	pr_debug("%s:%d:\n", func, line);
+	pr_debug("  kexec kimage info:\n");
+	pr_debug("    type:        %d\n", kimage->type);
+	pr_debug("    start:       %lx\n", kimage->start);
+	pr_debug("    head:        %lx\n", kimage->head);
+	pr_debug("    nr_segments: %lu\n", kimage->nr_segments);
+
+	for (i = 0; i < kimage->nr_segments; i++) {
+		pr_debug("      segment[%lu]: %016lx - %016lx, 0x%lx bytes, %lu pages%s\n",
+			i,
+			kimage->segment[i].mem,
+			kimage->segment[i].mem + kimage->segment[i].memsz,
+			kimage->segment[i].memsz,
+			kimage->segment[i].memsz /  PAGE_SIZE,
+			(kexec_is_dtb(kimage->segment[i].buf) ?
+				", dtb segment" : ""));
+	}
+}
+
 void machine_kexec_cleanup(struct kimage *kimage)
 {
 	/* Empty routine needed to avoid build errors. */
@@ -65,6 +107,8 @@ int machine_kexec_prepare(struct kimage *kimage)
 		}
 	}
 
+	kexec_image_info(kimage);
+
 	return 0;
 }
 
@@ -140,6 +184,25 @@ void machine_kexec(struct kimage *kimage)
 	reboot_code_buffer_phys = page_to_phys(kimage->control_code_page);
 	reboot_code_buffer = kmap(kimage->control_code_page);
 
+	kexec_image_info(kimage);
+
+	pr_debug("%s:%d: control_code_page:        %p\n", __func__, __LINE__,
+		kimage->control_code_page);
+	pr_debug("%s:%d: reboot_code_buffer_phys:  %pa\n", __func__, __LINE__,
+		&reboot_code_buffer_phys);
+	pr_debug("%s:%d: reboot_code_buffer:       %p\n", __func__, __LINE__,
+		reboot_code_buffer);
+	pr_debug("%s:%d: relocate_new_kernel:      %p\n", __func__, __LINE__,
+		arm64_relocate_new_kernel);
+	pr_debug("%s:%d: relocate_new_kernel_size: 0x%lx(%lu) bytes\n",
+		__func__, __LINE__, arm64_relocate_new_kernel_size,
+		arm64_relocate_new_kernel_size);
+
+	pr_debug("%s:%d: kimage_head:              %lx\n", __func__, __LINE__,
+		kimage->head);
+	pr_debug("%s:%d: kimage_start:             %lx\n", __func__, __LINE__,
+		kimage_start);
+
 	/*
 	 * Copy arm64_relocate_new_kernel to the reboot_code_buffer for use
 	 * after the kernel is shut down.
Signature · 8 lines
2.5.0



_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#9 lore raw

PATCH v17 5/13 arm64/kexec: Enable kexec in the arm64 defconfig

In reply to Geoff Levand
---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/configs/defconfig +1 -0
index fd2d74d..4ed4756 100644
@@ -70,6 +70,7 @@ CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_CMA=y
 CONFIG_XEN=y
+CONFIG_KEXEC=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_COMPAT=y
 CONFIG_CPU_IDLE=y
Signature · 8 lines
2.5.0



_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#10 lore raw

PATCH v17 6/13 arm64: kdump: reserve memory for crash dump kernel

In reply to Geoff Levand

From: AKASHI Takahiro <[email protected]>

On the startup of primary kernel, the memory region used by crash dump kernel must be specified by "crashkernel=" kernel parameter. reserve_crashkernel() will allocate and reserve the region for later use.

User space tools, like kexec-tools, will be able to find that region marked as "Crash kernel" in /proc/iomem.

---
 arch/arm64/kernel/setup.c |  7 +++++-
 arch/arm64/mm/init.c      | 62 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 1 deletion(-)
arch/arm64/kernel/setup.c +6 -1
index 3279def..e411957 100644
@@ -31,7 +31,6 @@
 #include <linux/screen_info.h>
 #include <linux/init.h>
 #include <linux/kexec.h>
-#include <linux/crash_dump.h>
 #include <linux/root_dev.h>
 #include <linux/cpu.h>
 #include <linux/interrupt.h>
@@ -222,6 +221,12 @@ static void __init request_standard_resources(void)
 		    kernel_data.end <= res->end)
 			request_resource(res, &kernel_data);
 	}
+
+#ifdef CONFIG_KEXEC_CORE
+	/* User space tools will find "Crash kernel" region in /proc/iomem. */
+	if (crashk_res.end)
+		insert_resource(&iomem_resource, &crashk_res);
+#endif
 }
 
 u64 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALID_HWID };
arch/arm64/mm/init.c +62 -0

80 lines not on this page · raw message

Signature · 8 lines
2.5.0



_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#11 lore raw

PATCH v17 7/13 arm64: limit memory regions based on DT property, usable-memory

In reply to Geoff Levand

From: AKASHI Takahiro <[email protected]>

Crash dump kernel will be run with a limited range of memory as System RAM.

On arm64, we will use a device-tree property under /chosen,
linux,usable-memory = <BASE SIZE>
in order for primary kernel either on uefi or non-uefi (device tree only) system to hand over the information about usable memory region to crash dump kernel. This property will supercede entries in uefi memory map table and "memory" nodes in a device tree.

---
 arch/arm64/mm/init.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
arch/arm64/mm/init.c +38 -0
index 45f1319..f679918 100644
@@ -249,10 +249,48 @@ static int __init early_mem(char *p)
 }
 early_param("mem", early_mem);
 
+static int __init early_init_dt_scan_usablemem(unsigned long node,
+		const char *uname, int depth, void *data)
+{
+	struct memblock_region *usablemem = (struct memblock_region *)data;
+	const __be32 *reg;
+	int len;
+
+	usablemem->size = 0;
+
+	if (depth != 1 || strcmp(uname, "chosen") != 0)
+		return 0;
+
+	reg = of_get_flat_dt_prop(node, "linux,usable-memory", &len);
+	if (!reg || (len < (dt_root_addr_cells + dt_root_size_cells)))
+		return 1;
+
+	usablemem->base = dt_mem_next_cell(dt_root_addr_cells, &reg);
+	usablemem->size = dt_mem_next_cell(dt_root_size_cells, &reg);
+
+	return 1;
+}
+
+static void __init fdt_enforce_memory_region(void)
+{
+	struct memblock_region reg;
+
+	of_scan_flat_dt(early_init_dt_scan_usablemem, &reg);
+
+	if (reg.size) {
+		memblock_remove(0, PAGE_ALIGN(reg.base));
+		memblock_remove(round_down(reg.base + reg.size, PAGE_SIZE),
+				ULLONG_MAX);
+	}
+}
+
 void __init arm64_memblock_init(void)
 {
 	const s64 linear_region_size = -(s64)PAGE_OFFSET;
 
+	/* Handle linux,usable-memory property */
+	fdt_enforce_memory_region();
+
 	/*
 	 * Ensure that the linear region takes up exactly half of the kernel
 	 * virtual address space. This way, we can distinguish a linear address
Signature · 8 lines
2.5.0



_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#12 lore raw

PATCH v17 8/13 arm64: kdump: implement machine_crash_shutdown()

In reply to Geoff Levand

From: AKASHI Takahiro <[email protected]>

Primary kernel calls machine_crash_shutdown() to shut down non-boot cpus and save registers' status in per-cpu ELF notes before starting crash dump kernel. See kernel_kexec().
Even if not all secondary cpus have shut down, we do kdump anyway.

As we don't have to make non-boot(crashed) cpus offline (to preserve correct status of cpus at crash dump) before shutting down, this patch also adds a variant of smp_send_stop().

---
 arch/arm64/include/asm/hardirq.h  |  2 +-
 arch/arm64/include/asm/kexec.h    | 41 +++++++++++++++++++++++++-
 arch/arm64/include/asm/smp.h      |  4 +++
 arch/arm64/kernel/machine_kexec.c | 57 ++++++++++++++++++++++++++++++++++--
 arch/arm64/kernel/smp.c           | 61 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 160 insertions(+), 5 deletions(-)
arch/arm64/include/asm/hardirq.h +1 -1
index 8740297..1473fc2 100644
@@ -20,7 +20,7 @@
 #include <linux/threads.h>
 #include <asm/irq.h>
 
-#define NR_IPI	6
+#define NR_IPI	7
 
 typedef struct {
 	unsigned int __softirq_pending;
arch/arm64/include/asm/kexec.h +40 -1

47 lines not on this page · raw message

arch/arm64/include/asm/smp.h +4 -0
index 38712f4..979154a 100644
@@ -134,6 +134,10 @@ static inline void cpu_panic_kernel(void)
  */
 bool cpus_are_stuck_in_kernel(void);
 
+#ifdef CONFIG_KEXEC_CORE
+extern void smp_send_crash_stop(void);
+#endif
+
 #endif /* ifndef __ASSEMBLY__ */
 
 #endif /* ifndef __ASM_SMP_H */
arch/arm64/kernel/machine_kexec.c +54 -3

86 lines not on this page · raw message

arch/arm64/kernel/smp.c +61 -0

97 lines not on this page · raw message

Signature · 8 lines
2.5.0



_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#13 lore raw

PATCH v17 9/13 arm64: kdump: add kdump support

In reply to Geoff Levand

From: AKASHI Takahiro <[email protected]>

On crash dump kernel, all the information about primary kernel's system memory (core image) is available in elf core header.
The primary kernel will set aside this header with reserve_elfcorehdr() at boot time and inform crash dump kernel of its location via a new device-tree property, "linux,elfcorehdr".

Please note that all other architectures use traditional "elfcorehdr=" kernel parameter for this purpose.

Then crash dump kernel will access the primary kernel's memory with copy_oldmem_page(), which reads one page by ioremap'ing it since it does not reside in linear mapping on crash dump kernel.

We also need our own elfcorehdr_read() here since the header is placed within crash dump kernel's usable memory.

---
 arch/arm64/Kconfig             | 11 +++++++
 arch/arm64/kernel/Makefile     |  1 +
 arch/arm64/kernel/crash_dump.c | 71 ++++++++++++++++++++++++++++++++++++++++++
 arch/arm64/mm/init.c           | 54 ++++++++++++++++++++++++++++++++
 4 files changed, 137 insertions(+)
 create mode 100644 arch/arm64/kernel/crash_dump.c
arch/arm64/Kconfig +11 -0
index 00aa50b..c9fc9c06 100644
@@ -653,6 +653,17 @@ config KEXEC
 	  but it is independent of the system firmware.   And like a reboot
 	  you can start any kernel with it, not just Linux.
 
+config CRASH_DUMP
+	bool "Build kdump crash kernel"
+	help
+	  Generate crash dump after being started by kexec. This should
+	  be normally only set in special crash dump kernels which are
+	  loaded in the main kernel with kexec-tools into a specially
+	  reserved region and then later executed after a crash by
+	  kdump/kexec.
+
+	  For more details see Documentation/kdump/kdump.txt
+
 config XEN_DOM0
 	def_bool y
 	depends on XEN
arch/arm64/kernel/Makefile +1 -0
index 7700c0c..c13d3eb 100644
@@ -48,6 +48,7 @@ arm64-obj-$(CONFIG_RANDOMIZE_BASE)	+= kaslr.o
 arm64-obj-$(CONFIG_HIBERNATION)		+= hibernate.o hibernate-asm.o
 arm64-obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o	\
 					   cpu-reset.o
+arm64-obj-$(CONFIG_CRASH_DUMP)		+= crash_dump.o
 
 obj-y					+= $(arm64-obj-y) vdso/
 obj-m					+= $(arm64-obj-m)
arch/arm64/kernel/crash_dump.c new file +71 -0

71 lines not on this page · raw message

arch/arm64/mm/init.c +54 -0

72 lines not on this page · raw message

Signature · 8 lines
2.5.0



_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#14 lore raw

PATCH v17 10/13 arm64: kdump: add VMCOREINFO for user-space coredump tools

In reply to Geoff Levand

From: AKASHI Takahiro <[email protected]>

For the current crash utility, we need to know, at least, a value of "kimage_voffset" to handle the contents of core dump file (/proc/vmcore) correctly due to the introduction of KASLR (CONFIG_RANDOMIZE_BASE) in v4.6.

More VMCOREINFO may be added later for makedumpfile command.

---
 arch/arm64/kernel/machine_kexec.c | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm64/kernel/machine_kexec.c +8 -0
index 92e8a92..ac3655f 100644
@@ -22,6 +22,7 @@
 
 #include <asm/cacheflush.h>
 #include <asm/cpu_ops.h>
+#include <asm/memory.h>
 #include <asm/mmu_context.h>
 #include <asm/system_misc.h>
 
@@ -299,3 +300,10 @@ void machine_crash_shutdown(struct pt_regs *regs)
 
 	pr_info("Starting crashdump kernel...\n");
 }
+
+void arch_crash_save_vmcoreinfo(void)
+{
+	/* Please note VMCOREINFO_NUMBER() uses "%d", not "%x" */
+	vmcoreinfo_append_str("NUMBER(kimage_voffset)=0x%llx\n",
+						kimage_voffset);
+}
Signature · 8 lines
2.5.0



_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#18 lore raw

PATCH v17 11/13 arm64: kdump: enable kdump in the arm64 defconfig

In reply to Geoff Levand

From: AKASHI Takahiro <[email protected]>

---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/configs/defconfig +1 -0
index 4ed4756..aa3e1dd 100644
@@ -71,6 +71,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_CMA=y
 CONFIG_XEN=y
 CONFIG_KEXEC=y
+CONFIG_CRASH_DUMP=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_COMPAT=y
 CONFIG_CPU_IDLE=y
Signature · 8 lines
2.5.0



_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#19 lore raw

PATCH v17 12/13 arm64: kdump: update a kernel doc

In reply to Geoff Levand

From: AKASHI Takahiro <[email protected]>

This patch adds arch specific descriptions about kdump usage on arm64 to kdump.txt.

---
 Documentation/kdump/kdump.txt | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
Documentation/kdump/kdump.txt +14 -1
index 88ff63d..5d6da09 100644
@@ -18,7 +18,7 @@ memory image to a dump file on the local disk, or across the network to
 a remote system.
 
 Kdump and kexec are currently supported on the x86, x86_64, ppc64, ia64,
-s390x and arm architectures.
+s390x, arm and arm64 architectures.
 
 When the system kernel boots, it reserves a small section of memory for
 the dump-capture kernel. This ensures that ongoing Direct Memory Access
@@ -249,6 +249,12 @@ Dump-capture kernel config options (Arch Dependent, arm)
 
     AUTO_ZRELADDR=y
 
+Dump-capture kernel config options (Arch Dependent, arm64)
+----------------------------------------------------------
+
+1) Currently, kvm will not be enabled on the dump-capture kernel even
+   if it is configured.
+
 Extended crashkernel syntax
 ===========================
 
@@ -305,6 +311,8 @@ Boot into System Kernel
    kernel will automatically locate the crash kernel image within the
    first 512MB of RAM if X is not given.
 
+   On arm64, use "crashkernel=Y[@X]".  Note that the start address of
+   the kernel, X if explicitly specified, must be aligned to 2MiB (0x200000).
 
 Load the Dump-capture Kernel
 ============================
@@ -327,6 +335,8 @@ For s390x:
 	- Use image or bzImage
 For arm:
 	- Use zImage
+For arm64:
+	- Use vmlinux or Image
 
 If you are using a uncompressed vmlinux image then use following command
 to load dump-capture kernel.
@@ -370,6 +380,9 @@ For s390x:
 For arm:
 	"1 maxcpus=1 reset_devices"
 
+For arm64:
+	"1 maxcpus=1 reset_devices"
+
 Notes on loading the dump-capture kernel:
 
 * By default, the ELF headers are stored in ELF64 format to support
Signature · 8 lines
2.5.0



_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#20 lore raw

PATCH v17 13/13 Documentation: dt: usable-memory and elfcorehdr nodes for arm64 kexec

In reply to Geoff Levand

From: James Morse <[email protected]>

Add documentation for linux,usable-memory and linux,elfcorehdr chosen nodes used by arm64 kexec to decribe the kdump reserved area, and the elfcorehdr's location within it.

---
 Documentation/devicetree/bindings/chosen.txt | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
Documentation/devicetree/bindings/chosen.txt +28 -0
index 6ae9d82..443f88b 100644
@@ -52,3 +52,31 @@ This property is set (currently only on PowerPC, and only needed on
 book3e) by some versions of kexec-tools to tell the new kernel that it
 is being booted by kexec, as the booting environment may differ (e.g.
 a different secondary CPU release mechanism)
+
+linux,usable-memory
+-------------------
+
+This property is set on PowerPC and arm64 by kexec-tools during kdump
+to tell the crash kernel the base address of its reserved area of memory, and
+the size. e.g.
+
+/ {
+	chosen {
+		linux,usable-memory = <0x9 0xf0000000 0x0 0x10000000>;
+	};
+};
+
+linux,elfcorehdr
+----------------
+
+This property is set (currently only on arm64) by kexec-tools during kdump
+to tell the crash kernel the address and size of the elfcorehdr that describes
+the old kernel's memory as an elf file. This memory must reside within the area
+described by 'linux,usable-memory'. e.g.
+
+/ {
+	chosen {
+		linux,usable-memory = <0x9 0xf0000000 0x0 0x10000000>;
+		linux,elfcorehdr = <0x9 0xfffff000 0x0 0x800>;
+	};
+};
Signature · 7 lines
2.5.0


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#21 lore raw
In reply to Geoff Levand
Quoted 7 lines · Geoff Levand

This series adds the core support for kexec re-boot and kdump on ARM64. This version of the series combines Takahiro's kdump patches with my kexec patches. Please consider all patches for inclusion.

Takahiro has done some extensive testing for this version with various configurations af endian, image format, memory options and layouts, etc.

Quoted 8 lines

To load a second stage kernel and execute a kexec re-boot or to work with kdump on ARM64 systems a series of patches to kexec-tools [2], which have not yet been merged upstream, are needed. Please update to the latest if you have been using an older version.

To examine vmcore (/proc/vmcore), you should use
- gdb v7.7 or later
- crash v7.1.1 or later

If KASLR (CONFIG_RANDOMIZE_BASE) is activated at runtime, those tools won't work at this moment. For crash utility, we need to apply the following patch:

[3] https://www.redhat.com/archives/crash-utility/2016-May/msg00078.html

Quoted 8 lines

[1] https://git.kernel.org/cgit/linux/kernel/git/geoff/linux-kexec.git
[2] https://git.kernel.org/cgit/linux/kernel/git/geoff/kexec-tools.git

Changes for v17 (June 3, 2016, 25m):

o Rebase to Linux-4.7-rc1.
o Added one VMCOREINFO parameter to vmcore for crash utility.
o Added a check for CPUs stuck in kernel.

For completeness, apart from some minor/cosmetic changes,
o Re-implemented cpu_soft_restart() to be executed only in hyp-stub.
o Added some kernel documentation about added device tree properties. (contributed by James)

Thanks,
-Takahiro AKASHI

Quoted 193 lines

Changes for v16 (Apr 14, 2016, 23m):

o Rebase to Linux-4.6-rc3.
o Don't try to explicitly enter EL2 at machine_kexec() when VHE in use
o Add unreachable() in case of ipi_cpu_crash_stop()
o Add more "#ifdef" to eliminate code unused when !CONFIG_KEXEC_CORE
o Fix a build error around ipi_cpu_crash_stop() when !CONFIG_HOTPLUG_CPU
o Revert "arm64: Add new hcall HVC_CALL_FUNC"
o Revert "Convert hcalls to use HVC immediate value"
(replaced by James' "hyp/kvm: Extend hyp-stub API to allow function calls
at EL2")

Modified by James:
o Add missing icache maintenance + isb to __kvm_hyp_reset()
o Rework kvm cpu hotplug for VHE

Added by James:
o arm64: head.S: el2_setup() to accept sctlr_el1 as an argument
o arm64: hyp/kvm: Extend hyp-stub API to allow function calls at EL2
o arm64: kvm: Move lr save/restore from do_el2_call into EL1
o arm64: kvm: Move the do_el2_call macro to a header file

Changes for v15 (Mar 14, 2016, 22m):

o Rebase to Linux-4.5.
o Remove DEBUG conditional in 'Add pr_debug output'.

Changes for v14 (Mar 4, 2016, 22m):

o Rebase to Linux-4.5-rc6.
o Rename setup_mm_for_reboot to cpu_install_idmap.
o kdump: leave non-boot cpus online at crash dump
As we don't have to make non-boot (crashed) cpus offline at crash dump, this patch adds a variant of smp_send_stop().
o kdump: use a new device-tree property, "linux,elfcorehdr", instead of traditional "elfcorehdr=" kernel parameter
o limit memory regions based on DT property, "usable-memory", instead of "mem=" kernel parameter
o kdump: fix a build error when !CONFIG_KEXEC_CORE
o kvm: use generic kvm_call_hyp() interface instead of kvm_cpu_reset()
o kvm: initialize only a primary cpu at init_hyp_mode()

Changes for v13 (Jan 15, 2016, 20m):

o Rebase to Linux-4.4.
o Remove align directive from cpu_reset.c.
o Use inline C wrapper for cpu_soft_restart.
o Revert the new image d-cache flush changes of v10.
o Add SCTLR cleanup patch.
o Change pr_devel to pr_debug.
o Call flush_icache_range() for reboot_code_buffer.
o Add .ltorg directive to arm64_relocate_new_kernel.
o Make new asm macro copy_page.
o Change cache maintenence from inner-shareable to non-shareable.
o Rename KEXEC_ARCH_ARM64 to KEXEC_ARCH_AARCH64.

o arm64: kvm: allows kvm cpu hotplug
- remove some garbage code from kvm_host.h
o arm64: kdump: reserve memory for crash dump kernel
- change CONFIG_KEXEC to CONFIG_KEXEC_CORE
- don't panic on crash kernel alloc failure
(thanks to Mark Salter, RH)
o arm64: kdump: implement machine_crash_shutdown()
- change "boot/non-boot cpu" to "crashing/non-crashing cpu"
- introduce is_in_crash_kexec() for readability
- re-introduce machine_kexec_mask_interrupts(), as arch/arm has, to discard unexpected interrupts
- call crash_save_cpu() before making cpus offline to avoid a possible race (thanks to Pratyush Anand/Mark Salter, RH)
o arm64: kdump: update a kernel doc
- clarify that we support "Image" format as well as vmlinux in kdump.txt
o arm64: kdump: relax BUG_ON() if more than one cpus are still active
- change a warning message at the failure of shooting down non-crahsing cpus

Changes for v12 (Nov 24, 2015, 18m):

o No changes, rebase to Linux-4.4-rc2.

Changes for v11 (Nov 6, 2015, 18m):

o Rebase to Linux-4.3.
o Move the new image d-cache flush from arm64_relocate_new_kernel to machine_kexec.
o Pass values to arm64_relocate_new_kernel in registers, not in global variables.
o Fixups to setting the sctlr_el1 and sctlr_el2 flags.

Changes for v10 (Oct 18, 2015, 17m):

o Rebase to Linux-4.3-rc6.
o Move tcr_set_idmap_t0sz to assembler.h.
o Add back simplified cpu_reset routines.
o Combine kexec + kdump patches.

Changes for v9 (Apr 7, 2015, 11m):

o Use new upstream flag IND_FLAGS.

Changes for v8 (Mar 19, 2015, 10m):

o Rebase to Linux-4.0-rc4.
o Re-boot using purgatory only.

Changes for v7 (Jan 16, 2015, 8m):

o Rebase to Linux-3.19-rc4.
o Change from ESR_EL2_ to ESR_ELx_.
o Remove work-arounds for EFI systems.

Changes for v6 (Dec 2, 2014, 7m):

o Rebase to Linux-3.18-rc2

Changes for v5 (Nov 16, 2014, 6m):

Changes for v4 (Oct 3, 2014, 5m):

Changes for v3 (Sept 23, 2014, 4m):

Changes for v2 (Sep 9, 2014, 4m):

o Rebase to Linux-3.17-rc4.
o Move macros from proc-macros.S to assembler.h.
o Convert hcalls to use ISS field.
o Add new hcall HVC_CALL_FUNC.
o Add EL2 switch to soft_restart.

First submission v1 (May 13, 2014):

o Based on Linux-3.15-rc4.

-Geoff

The following changes since commit 1a695a905c18548062509178b98bc91e67510864:

Linux 4.7-rc1 (2016-05-29 09:29:24 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/geoff/linux-kexec.git kexec-v17

for you to fetch changes up to 89f1e3dfe16477c732dac8f407300039c0947568:

Documentation: dt: usable-memory and elfcorehdr nodes for arm64 kexec (2016-06-03 10:12:45 -0700)

----------------------------------------------------------------
AKASHI Takahiro (7):
arm64: kdump: reserve memory for crash dump kernel
arm64: limit memory regions based on DT property, usable-memory
arm64: kdump: implement machine_crash_shutdown()
arm64: kdump: add kdump support
arm64: kdump: add VMCOREINFO for user-space coredump tools
arm64: kdump: enable kdump in the arm64 defconfig
arm64: kdump: update a kernel doc

Geoff Levand (4):
arm64: Add back cpu reset routines arm64/kexec: Add core kexec support arm64/kexec: Add pr_debug output arm64/kexec: Enable kexec in the arm64 defconfig

James Morse (2):
arm64: Add cpus_are_stuck_in_kernel
Documentation: dt: usable-memory and elfcorehdr nodes for arm64 kexec

 Documentation/devicetree/bindings/chosen.txt |  28 +++
 Documentation/kdump/kdump.txt                |  15 +-
 arch/arm64/Kconfig                           |  21 ++
 arch/arm64/configs/defconfig                 |   2 +
 arch/arm64/include/asm/hardirq.h             |   2 +-
 arch/arm64/include/asm/kexec.h               |  87 ++++++++
 arch/arm64/include/asm/smp.h                 |  14 ++
 arch/arm64/include/asm/virt.h                |   5 +
 arch/arm64/kernel/Makefile                   |   3 +
 arch/arm64/kernel/cpu-reset.S                |  54 +++++
 arch/arm64/kernel/cpu-reset.h                |  29 +++
 arch/arm64/kernel/crash_dump.c               |  71 ++++++
 arch/arm64/kernel/hyp-stub.S                 |  11 +-
 arch/arm64/kernel/machine_kexec.c            | 309 +++++++++++++++++++++++++++
 arch/arm64/kernel/relocate_kernel.S          | 131 ++++++++++++
 arch/arm64/kernel/setup.c                    |   7 +-
 arch/arm64/kernel/smp.c                      |  66 ++++++
 arch/arm64/mm/init.c                         | 154 +++++++++++++
 include/uapi/linux/kexec.h                   |   1 +
 19 files changed, 1006 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm64/include/asm/kexec.h
 create mode 100644 arch/arm64/kernel/cpu-reset.S
 create mode 100644 arch/arm64/kernel/cpu-reset.h
 create mode 100644 arch/arm64/kernel/crash_dump.c
 create mode 100644 arch/arm64/kernel/machine_kexec.c
 create mode 100644 arch/arm64/kernel/relocate_kernel.S
Signature · 1 line
2.5.0
Signature · 7 lines
Thanks,
-Takahiro AKASHI

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#22 lore raw
Quoted 27 lines · AKASHI Takahiro
Quoted 7 lines · Geoff Levand

This series adds the core support for kexec re-boot and kdump on ARM64. This version of the series combines Takahiro's kdump patches with my kexec patches. Please consider all patches for inclusion.

Takahiro has done some extensive testing for this version with various configurations af endian, image format, memory options and layouts, etc.

Quoted 8 lines

To load a second stage kernel and execute a kexec re-boot or to work with kdump on ARM64 systems a series of patches to kexec-tools [2], which have not yet been merged upstream, are needed. Please update to the latest if you have been using an older version.

To examine vmcore (/proc/vmcore), you should use
- gdb v7.7 or later
- crash v7.1.1 or later

If KASLR (CONFIG_RANDOMIZE_BASE) is activated at runtime, those tools won't work at this moment. For crash utility, we need to apply the following patch:

[3] https://www.redhat.com/archives/crash-utility/2016-May/msg00078.html

Quoted 5 lines

[1] https://git.kernel.org/cgit/linux/kernel/git/geoff/linux-kexec.git
[2] https://git.kernel.org/cgit/linux/kernel/git/geoff/kexec-tools.git

Changes for v17 (June 3, 2016, 25m):

Quoted 8 lines
Quoted 3 lines

o Rebase to Linux-4.7-rc1.
o Added one VMCOREINFO parameter to vmcore for crash utility.
o Added a check for CPUs stuck in kernel.

For completeness, apart from some minor/cosmetic changes,
o Re-implemented cpu_soft_restart() to be executed only in hyp-stub.
o Added some kernel documentation about added device tree properties. (contributed by James)

and
o Fixed a returned value of pstate in crash_setup_regs(). Now return a faked pstate since we have no way to get the current pstate.

Quoted 193 lines

Thanks,
-Takahiro AKASHI

Quoted 190 lines

Changes for v16 (Apr 14, 2016, 23m):

o Rebase to Linux-4.6-rc3.
o Don't try to explicitly enter EL2 at machine_kexec() when VHE in use
o Add unreachable() in case of ipi_cpu_crash_stop()
o Add more "#ifdef" to eliminate code unused when !CONFIG_KEXEC_CORE
o Fix a build error around ipi_cpu_crash_stop() when !CONFIG_HOTPLUG_CPU
o Revert "arm64: Add new hcall HVC_CALL_FUNC"
o Revert "Convert hcalls to use HVC immediate value"
(replaced by James' "hyp/kvm: Extend hyp-stub API to allow function calls
at EL2")

Modified by James:
o Add missing icache maintenance + isb to __kvm_hyp_reset()
o Rework kvm cpu hotplug for VHE

Added by James:
o arm64: head.S: el2_setup() to accept sctlr_el1 as an argument
o arm64: hyp/kvm: Extend hyp-stub API to allow function calls at EL2
o arm64: kvm: Move lr save/restore from do_el2_call into EL1
o arm64: kvm: Move the do_el2_call macro to a header file

Changes for v15 (Mar 14, 2016, 22m):

o Rebase to Linux-4.5.
o Remove DEBUG conditional in 'Add pr_debug output'.

Changes for v14 (Mar 4, 2016, 22m):

o Rebase to Linux-4.5-rc6.
o Rename setup_mm_for_reboot to cpu_install_idmap.
o kdump: leave non-boot cpus online at crash dump
As we don't have to make non-boot (crashed) cpus offline at crash dump, this patch adds a variant of smp_send_stop().
o kdump: use a new device-tree property, "linux,elfcorehdr", instead of traditional "elfcorehdr=" kernel parameter
o limit memory regions based on DT property, "usable-memory", instead of "mem=" kernel parameter
o kdump: fix a build error when !CONFIG_KEXEC_CORE
o kvm: use generic kvm_call_hyp() interface instead of kvm_cpu_reset()
o kvm: initialize only a primary cpu at init_hyp_mode()

Changes for v13 (Jan 15, 2016, 20m):

o Rebase to Linux-4.4.
o Remove align directive from cpu_reset.c.
o Use inline C wrapper for cpu_soft_restart.
o Revert the new image d-cache flush changes of v10.
o Add SCTLR cleanup patch.
o Change pr_devel to pr_debug.
o Call flush_icache_range() for reboot_code_buffer.
o Add .ltorg directive to arm64_relocate_new_kernel.
o Make new asm macro copy_page.
o Change cache maintenence from inner-shareable to non-shareable.
o Rename KEXEC_ARCH_ARM64 to KEXEC_ARCH_AARCH64.

o arm64: kvm: allows kvm cpu hotplug
- remove some garbage code from kvm_host.h
o arm64: kdump: reserve memory for crash dump kernel
- change CONFIG_KEXEC to CONFIG_KEXEC_CORE
- don't panic on crash kernel alloc failure
(thanks to Mark Salter, RH)
o arm64: kdump: implement machine_crash_shutdown()
- change "boot/non-boot cpu" to "crashing/non-crashing cpu"
- introduce is_in_crash_kexec() for readability
- re-introduce machine_kexec_mask_interrupts(), as arch/arm has, to discard unexpected interrupts
- call crash_save_cpu() before making cpus offline to avoid a possible race (thanks to Pratyush Anand/Mark Salter, RH)
o arm64: kdump: update a kernel doc
- clarify that we support "Image" format as well as vmlinux in kdump.txt
o arm64: kdump: relax BUG_ON() if more than one cpus are still active
- change a warning message at the failure of shooting down non-crahsing cpus

Changes for v12 (Nov 24, 2015, 18m):

o No changes, rebase to Linux-4.4-rc2.

Changes for v11 (Nov 6, 2015, 18m):

o Rebase to Linux-4.3.
o Move the new image d-cache flush from arm64_relocate_new_kernel to machine_kexec.
o Pass values to arm64_relocate_new_kernel in registers, not in global variables.
o Fixups to setting the sctlr_el1 and sctlr_el2 flags.

Changes for v10 (Oct 18, 2015, 17m):

o Rebase to Linux-4.3-rc6.
o Move tcr_set_idmap_t0sz to assembler.h.
o Add back simplified cpu_reset routines.
o Combine kexec + kdump patches.

Changes for v9 (Apr 7, 2015, 11m):

o Use new upstream flag IND_FLAGS.

Changes for v8 (Mar 19, 2015, 10m):

o Rebase to Linux-4.0-rc4.
o Re-boot using purgatory only.

Changes for v7 (Jan 16, 2015, 8m):

o Rebase to Linux-3.19-rc4.
o Change from ESR_EL2_ to ESR_ELx_.
o Remove work-arounds for EFI systems.

Changes for v6 (Dec 2, 2014, 7m):

o Rebase to Linux-3.18-rc2

Changes for v5 (Nov 16, 2014, 6m):

Changes for v4 (Oct 3, 2014, 5m):

Changes for v3 (Sept 23, 2014, 4m):

Changes for v2 (Sep 9, 2014, 4m):

o Rebase to Linux-3.17-rc4.
o Move macros from proc-macros.S to assembler.h.
o Convert hcalls to use ISS field.
o Add new hcall HVC_CALL_FUNC.
o Add EL2 switch to soft_restart.

First submission v1 (May 13, 2014):

o Based on Linux-3.15-rc4.

-Geoff

The following changes since commit 1a695a905c18548062509178b98bc91e67510864:

Linux 4.7-rc1 (2016-05-29 09:29:24 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/geoff/linux-kexec.git kexec-v17

for you to fetch changes up to 89f1e3dfe16477c732dac8f407300039c0947568:

Documentation: dt: usable-memory and elfcorehdr nodes for arm64 kexec (2016-06-03 10:12:45 -0700)

----------------------------------------------------------------
AKASHI Takahiro (7):
arm64: kdump: reserve memory for crash dump kernel
arm64: limit memory regions based on DT property, usable-memory
arm64: kdump: implement machine_crash_shutdown()
arm64: kdump: add kdump support
arm64: kdump: add VMCOREINFO for user-space coredump tools
arm64: kdump: enable kdump in the arm64 defconfig
arm64: kdump: update a kernel doc

Geoff Levand (4):
arm64: Add back cpu reset routines arm64/kexec: Add core kexec support arm64/kexec: Add pr_debug output arm64/kexec: Enable kexec in the arm64 defconfig

James Morse (2):
arm64: Add cpus_are_stuck_in_kernel
Documentation: dt: usable-memory and elfcorehdr nodes for arm64 kexec

 Documentation/devicetree/bindings/chosen.txt |  28 +++
 Documentation/kdump/kdump.txt                |  15 +-
 arch/arm64/Kconfig                           |  21 ++
 arch/arm64/configs/defconfig                 |   2 +
 arch/arm64/include/asm/hardirq.h             |   2 +-
 arch/arm64/include/asm/kexec.h               |  87 ++++++++
 arch/arm64/include/asm/smp.h                 |  14 ++
 arch/arm64/include/asm/virt.h                |   5 +
 arch/arm64/kernel/Makefile                   |   3 +
 arch/arm64/kernel/cpu-reset.S                |  54 +++++
 arch/arm64/kernel/cpu-reset.h                |  29 +++
 arch/arm64/kernel/crash_dump.c               |  71 ++++++
 arch/arm64/kernel/hyp-stub.S                 |  11 +-
 arch/arm64/kernel/machine_kexec.c            | 309 +++++++++++++++++++++++++++
 arch/arm64/kernel/relocate_kernel.S          | 131 ++++++++++++
 arch/arm64/kernel/setup.c                    |   7 +-
 arch/arm64/kernel/smp.c                      |  66 ++++++
 arch/arm64/mm/init.c                         | 154 +++++++++++++
 include/uapi/linux/kexec.h                   |   1 +
 19 files changed, 1006 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm64/include/asm/kexec.h
 create mode 100644 arch/arm64/kernel/cpu-reset.S
 create mode 100644 arch/arm64/kernel/cpu-reset.h
 create mode 100644 arch/arm64/kernel/crash_dump.c
 create mode 100644 arch/arm64/kernel/machine_kexec.c
 create mode 100644 arch/arm64/kernel/relocate_kernel.S
Quoted 7 lines
Quoted 3 lines
Signature · 1 line
2.5.0
Signature · 2 lines
Thanks,
-Takahiro AKASHI

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

Reviewed-by on v17 1/13
#2 lore raw

Re: [PATCH v17 01/13] arm64: Add back cpu reset routines

In reply to Geoff Levand

Hi Geoff,

Quoted 27 lines · Geoff Levand

Commit 68234df4ea7939f98431aa81113fbdce10c4a84b (arm64: kill flush_cache_all()) removed the global arm64 routines cpu_reset() and cpu_soft_restart() needed by the arm64 kexec and kdump support. Add simplified versions of those two routines back with some changes needed for kexec in the new files cpu_reset.S, and cpu_reset.h.

When a CPU is reset it needs to be put into the exception level it had when it entered the kernel. Update cpu_soft_restart() to accept an argument which signals if the reset address needs to be entered at EL1 or EL2, and add a new hypercall HVC_SOFT_RESTART which is used for the EL2 switch.

arch/arm64/kernel/cpu-reset.S new file +7 -0
new file mode 100644
index 0000000..c321957
 
+ENTRY(__cpu_soft_restart)
+	/* Clear sctlr_el1 flags. */
+	mrs	x12, sctlr_el1
+	ldr	x13, =SCTLR_ELx_FLAGS
+	bic	x12, x12, x13
+	msr	sctlr_el1, x12
+	isb

arch/arm64/kernel/cpu-reset.S line 51

Quoted 10 lines
arch/arm64/kernel/cpu-reset.S new file +10 -0
+
+	cbz	x0, 1f				// el2_switch?
+	mov	x0, #HVC_SOFT_RESTART
+	hvc	#0				// no return
+
+1:	mov	x18, x1				// entry
+	mov	x0, x2				// arg0
+	mov	x1, x3				// arg1
+	mov	x2, x4				// arg2
+	ret	x18

Why ret not br?

Quoted 20 lines
arch/arm64/kernel/cpu-reset.S new file +3 -0
+ENDPROC(__cpu_soft_restart)
+
+.popsection
arch/arm64/kernel/cpu-reset.h new file +11 -0
new file mode 100644
index 0000000..5a5ea0a
@@ -0,0 +1,29 @@
+/*
+ * CPU reset routines
+ *
+ * Copyright (C) 2015 Huawei Futurewei Technologies.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _ARM64_CPU_RESET_H

arch/arm64/kernel/cpu-reset.h line 21

Quoted 10 lines
arch/arm64/kernel/cpu-reset.h new file +10 -0
+#define _ARM64_CPU_RESET_H
+
+#include <asm/virt.h>
+
+void __cpu_soft_restart(unsigned long el2_switch, unsigned long entry,
+	unsigned long arg0, unsigned long arg1, unsigned long arg2);
+
+static inline void __noreturn cpu_soft_restart(unsigned long el2_switch,
+	unsigned long entry, unsigned long arg0, unsigned long arg1,
+	unsigned long arg2)

What is the last arg for? machine_kexec() passes zero, but arm64_relocate_new_kernel() never reads this value..

arch/arm64/kernel/cpu-reset.h line 25

Quoted 4 lines
arch/arm64/kernel/cpu-reset.h new file +4 -0
+{
+	typeof(__cpu_soft_restart) *restart;
+	restart = (void *)virt_to_phys(__cpu_soft_restart);
+	restart(el2_switch, entry, arg0, arg1, arg2);

This confuses me each time I see it, I think it would be clearer if the 'cpu_install_idmap()' call were moved into this function. Any other user of this function would need to do the same.

By the end of the series, the caller of this has:

Quoted 1 line

is_kernel_in_hyp_mode() ? 0 : (in_crash_kexec ? 0 : is_hyp_mode_available())

which is difficult to read, I had to write out the values to work it out.

I thinks it makes more sense to move the hyp-aware logic into this cpu_soft_restart(), obviously kdump still needs a 'skip el2 jump' flag.

Quoted 9 lines
arch/arm64/kernel/cpu-reset.h new file +4 -0
+	unreachable();
+}
+
+#endif
arch/arm64/kernel/hyp-stub.S +0 -0
index 8727f44..a129e57 100644

arch/arm64/kernel/hyp-stub.S el1_sync: · line 80

Quoted 10 lines
arch/arm64/kernel/hyp-stub.S +7 -0
@@ -71,8 +71,17 @@ el1_sync:
 	msr	vbar_el2, x1
 	b	9f
 
+2:	cmp	x0, #HVC_SOFT_RESTART
+	b.ne	3f
+	mov	x0, x2
+	mov	x2, x4
+	mov	x4, x1
+	mov	x1, x3
+	blr	x4

blr not branch? If we ever did return from here, wouldn't we run the 'entry' function again at EL1?

arch/arm64/kernel/hyp-stub.S el1_sync: · line 87

Quoted 9 lines
arch/arm64/kernel/hyp-stub.S +3 -1
+	b	9f
+
 	/* Someone called kvm_call_hyp() against the hyp-stub... */
-2:	mov     x0, #ARM_EXCEPTION_HYP_GONE
+3:	mov	x0, #ARM_EXCEPTION_HYP_GONE
 
 9:	eret
 ENDPROC(el1_sync)

For what its worth:

Thanks,

James

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#5 lore raw

Re: [PATCH v17 02/13] arm64: Add cpus_are_stuck_in_kernel

In reply to Geoff Levand

Hi Geoff,

Quoted 7 lines · Geoff Levand

From: James Morse <[email protected]>

kernel/smp.c has a fancy counter that keeps track of the number of CPUs it marked as not-present and left in cpu_park_loop(). If there are any CPUs spinning in here, kexec will release them once the memory is re-used by the new kernel.

Quoted 7 lines

We can't return an error once we reach machine_kexec(), so as a sanity check we forbid kexec images to be loaded if there are already cpus stuck in the kernel, or we have multiple cpus and no way of disabling them.

[Split off from a larger patch]

Post-split, the second paragraph of the commit message is out of place, and doesn't describe what the patch does. Can I suggest replacing it with:

Quoted 1 line

Provide a function to expose whether this counter is non-zero, so we can use >

this when loading a new kexec image, and when calling machine_kexec().

Thanks,

James

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#15 lore raw

Re: [PATCH v17 10/13] arm64: kdump: add VMCOREINFO for user-space coredump tools

In reply to Geoff Levand
Quoted 8 lines · Geoff Levand

From: AKASHI Takahiro <[email protected]>

For the current crash utility, we need to know, at least, a value of "kimage_voffset" to handle the contents of core dump file (/proc/vmcore) correctly due to the introduction of KASLR (CONFIG_RANDOMIZE_BASE) in v4.6.

More VMCOREINFO may be added later for makedumpfile command.
---

Missing Signed-off-by: ?

Suzuki
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

#16 lore raw

Re: [PATCH v17 10/13] arm64: kdump: add VMCOREINFO for user-space coredump tools

Quoted 7 lines · Suzuki K Poulose
Quoted 6 lines · Geoff Levand

From: AKASHI Takahiro <[email protected]>

For the current crash utility, we need to know, at least, a value of "kimage_voffset" to handle the contents of core dump file (/proc/vmcore) correctly due to the introduction of KASLR (CONFIG_RANDOMIZE_BASE) in v4.6.

Quoted 8 lines
Quoted 2 lines

More VMCOREINFO may be added later for makedumpfile command.
---

Missing Signed-off-by: ?

Suzuki
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

Please ignore the disclaimer message above

Suzuki

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#3 lore raw

Re: [PATCH v17 01/13] arm64: Add back cpu reset routines

In reply to James Morse
Quoted 34 lines · James Morse

Hi Geoff,

Quoted 31 lines · Geoff Levand

Commit 68234df4ea7939f98431aa81113fbdce10c4a84b (arm64: kill flush_cache_all()) removed the global arm64 routines cpu_reset() and cpu_soft_restart() needed by the arm64 kexec and kdump support. Add simplified versions of those two routines back with some changes needed for kexec in the new files cpu_reset.S, and cpu_reset.h.

When a CPU is reset it needs to be put into the exception level it had when it entered the kernel. Update cpu_soft_restart() to accept an argument which signals if the reset address needs to be entered at EL1 or EL2, and add a new hypercall HVC_SOFT_RESTART which is used for the EL2 switch.

arch/arm64/kernel/cpu-reset.S new file +11 -0
new file mode 100644
index 0000000..c321957
 
+ENTRY(__cpu_soft_restart)
+> > 	> > /* Clear sctlr_el1 flags. */
+> > 	> > mrs> > 	> > x12, sctlr_el1
+> > 	> > ldr> > 	> > x13, =SCTLR_ELx_FLAGS
+> > 	> > bic> > 	> > x12, x12, x13
+> > 	> > msr> > 	> > sctlr_el1, x12
+> > 	> > isb
+
+> > 	> > cbz> > 	> > x0, 1f> > 	> > 	> > 	> > 	> > // el2_switch?
+> > 	> > mov> > 	> > x0, #HVC_SOFT_RESTART
+> > 	> > hvc> > 	> > #0> > 	> > 	> > 	> > 	> > // no return
Quoted 8 lines
Quoted 6 lines

+
+1:> > > > mov> > > > x18, x1> > > > > > > > > > // entry
+> > > > mov> > > > x0, x2> > > > > > > > > > // arg0
+> > > > mov> > > > x1, x3> > > > > > > > > > // arg1
+> > > > mov> > > > x2, x4> > > > > > > > > > // arg2
+> > > > ret> > > > x18

Why ret not br?

Sure.

Quoted 27 lines
Quoted 27 lines
arch/arm64/kernel/cpu-reset.S new file +3 -0
+ENDPROC(__cpu_soft_restart)
+
+.popsection
arch/arm64/kernel/cpu-reset.h new file +16 -0
new file mode 100644
index 0000000..5a5ea0a
@@ -0,0 +1,29 @@
+/*
+ * CPU reset routines
+ *
+ * Copyright (C) 2015 Huawei Futurewei Technologies.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _ARM64_CPU_RESET_H
+#define _ARM64_CPU_RESET_H
+
+#include 
+
+void __cpu_soft_restart(unsigned long el2_switch, unsigned long entry,
Quoted 8 lines

arch/arm64/kernel/cpu-reset.h line 21

Quoted 5 lines
arch/arm64/kernel/cpu-reset.h new file +5 -0
+> > 	> > unsigned long arg0, unsigned long arg1, unsigned long arg2);
+
+static inline void __noreturn cpu_soft_restart(unsigned long el2_switch,
+> > 	> > unsigned long entry, unsigned long arg0, unsigned long arg1,
+> > 	> > unsigned long arg2)

What is the last arg for? machine_kexec() passes zero, but arm64_relocate_new_kernel() never reads this value..

cpu_soft_restart is a generic routine, and I thought 3 args would be good. It also allows for passing something extra to arm64_relocate_new_kernel when debugging.

Quoted 8 lines

arch/arm64/kernel/cpu-reset.h line 25

Quoted 4 lines
arch/arm64/kernel/cpu-reset.h new file +4 -0
+{
+> > 	> > typeof(__cpu_soft_restart) *restart;
+> > 	> > restart = (void *)virt_to_phys(__cpu_soft_restart);
+> > 	> > restart(el2_switch, entry, arg0, arg1, arg2);

This confuses me each time I see it, I think it would be clearer if the 'cpu_install_idmap()' call were moved into this function. Any other user of this function would need to do the same.

Sure.

Quoted 8 lines

By the end of the series, the caller of this has:

Quoted 1 line

is_kernel_in_hyp_mode() ? 0 : (in_crash_kexec ? 0 : is_hyp_mode_available())

which is difficult to read, I had to write out the values to work it out.

I thinks it makes more sense to move the hyp-aware logic into this cpu_soft_restart(), obviously kdump still needs a 'skip el2 jump' flag.

I'll try it.

Quoted 12 lines
arch/arm64/kernel/cpu-reset.h new file +1 -0
+	unreachable();
Quoted 11 lines
arch/arm64/kernel/cpu-reset.h new file +3 -0
+}
+
+#endif
arch/arm64/kernel/hyp-stub.S +0 -0
index 8727f44..a129e57 100644
@@ -71,8 +71,17 @@ el1_sync:
 > > 	> > msr> > 	> > vbar_el2, x1
 > > 	> > b> > 	> > 9f
 
Quoted 10 lines

arch/arm64/kernel/hyp-stub.S el1_sync: · line 80

Quoted 7 lines
arch/arm64/kernel/hyp-stub.S +7 -0
+2:> > 	> > cmp> > 	> > x0, #HVC_SOFT_RESTART
+> > 	> > b.ne> > 	> > 3f
+> > 	> > mov> > 	> > x0, x2
+> > 	> > mov> > 	> > x2, x4
+> > 	> > mov> > 	> > x4, x1
+> > 	> > mov> > 	> > x1, x3
+> > 	> > blr> > 	> > x4

blr not branch? If we ever did return from here, wouldn't we run the 'entry' function again at EL1?

Yes, this should not return.

Quoted 7 lines
Quoted 7 lines
arch/arm64/kernel/hyp-stub.S +3 -1
+> > 	> > b> > 	> > 9f
+
 > > 	> > /* Someone called kvm_call_hyp() against the hyp-stub... */
-2:> > 	> > mov     x0, #ARM_EXCEPTION_HYP_GONE
+3:> > 	> > mov> > 	> > x0, #ARM_EXCEPTION_HYP_GONE
 
Quoted 7 lines

arch/arm64/kernel/hyp-stub.S el1_sync: · line 87

Quoted 3 lines
arch/arm64/kernel/hyp-stub.S +0 -0
 9:> > 	> > eret
 ENDPROC(el1_sync)

For what its worth:

Thanks for the comments.

-Geoff

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#17 lore raw

Re: [PATCH v17 10/13] arm64: kdump: add VMCOREINFO for user-space coredump tools

In reply to Suzuki K Poulose
Quoted 11 lines · Suzuki K Poulose
Quoted 8 lines · Geoff Levand

From: AKASHI Takahiro <[email protected]>

For the current crash utility, we need to know, at least, a value of "kimage_voffset" to handle the contents of core dump file (/proc/vmcore) correctly due to the introduction of KASLR (CONFIG_RANDOMIZE_BASE) in v4.6.

More VMCOREINFO may be added later for makedumpfile command.
---

Missing Signed-off-by: ?

Thank you for pointing this out.
I didn't run checkpatch.pl for this version.

-Takahiro AKASHI

Quoted 3 lines

Suzuki
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec