* [PATCH 1/8] arm64: Convert hcalls to use ISS field
2014-11-14 1:22 [PATCH 0/8] arm64 kexec kernel patches V6 Geoff Levand
@ 2014-11-14 1:22 ` Geoff Levand
2014-11-14 1:22 ` [PATCH 2/8] arm64: Add new hcall HVC_CALL_FUNC Geoff Levand
` (7 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Geoff Levand @ 2014-11-14 1:22 UTC (permalink / raw)
To: linux-arm-kernel
To allow for additional hcalls to be defined and to make the arm64 hcall API
more consistent across exception vector routines, change the hcall implementations
to use the ISS field of the ESR_EL2 register to specify the hcall type.
The existing arm64 hcall implementations are limited in that they only allow
for two distinct hcalls; with the x0 register either zero, or not zero. Also,
the API of the hyp-stub exception vector routines and the KVM exception vector
routines differ; hyp-stub uses a non-zero value in x0 to implement
__hyp_set_vectors, whereas KVM uses it to implement kvm_call_hyp.
Define three new preprocessor macros HVC_GET_VECTORS, HVC_SET_VECTORS and
HVC_CALL_HYP and to be used as hcall type specifiers and convert the
existing __hyp_get_vectors(), __hyp_set_vectors() and kvm_call_hyp() routines
to use these new macros when executing an HVC call. Also change the
corresponding hyp-stub and KVM el1_sync exception vector routines to use these
new macros.
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
arch/arm64/include/asm/virt.h | 20 ++++++++++++++++++++
arch/arm64/kernel/hyp-stub.S | 34 ++++++++++++++++++++++------------
arch/arm64/kvm/hyp.S | 18 +++++++++++-------
3 files changed, 53 insertions(+), 19 deletions(-)
diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h
index 7a5df52..99c319c 100644
--- a/arch/arm64/include/asm/virt.h
+++ b/arch/arm64/include/asm/virt.h
@@ -21,6 +21,26 @@
#define BOOT_CPU_MODE_EL1 (0xe11)
#define BOOT_CPU_MODE_EL2 (0xe12)
+/*
+ * HVC_GET_VECTORS - Return the value of the vbar_el2 register.
+ */
+
+#define HVC_GET_VECTORS 1
+
+/*
+ * HVC_SET_VECTORS - Set the value of the vbar_el2 register.
+ *
+ * @x0: Physical address of the new vector table.
+ */
+
+#define HVC_SET_VECTORS 2
+
+/*
+ * HVC_CALL_HYP - Execute a hyp routine.
+ */
+
+#define HVC_CALL_HYP 3
+
#ifndef __ASSEMBLY__
/*
diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S
index a272f33..9ce8746 100644
--- a/arch/arm64/kernel/hyp-stub.S
+++ b/arch/arm64/kernel/hyp-stub.S
@@ -22,6 +22,7 @@
#include <linux/irqchip/arm-gic-v3.h>
#include <asm/assembler.h>
+#include <asm/kvm_arm.h>
#include <asm/ptrace.h>
#include <asm/virt.h>
@@ -53,14 +54,22 @@ ENDPROC(__hyp_stub_vectors)
.align 11
el1_sync:
- mrs x1, esr_el2
- lsr x1, x1, #26
- cmp x1, #0x16
- b.ne 2f // Not an HVC trap
- cbz x0, 1f
- msr vbar_el2, x0 // Set vbar_el2
+ mrs x18, esr_el2
+ lsr x17, x18, #ESR_EL2_EC_SHIFT
+ and x18, x18, #ESR_EL2_ISS
+
+ cmp x17, #ESR_EL2_EC_HVC64
+ b.ne 2f // Not an HVC trap
+
+ cmp x18, #HVC_GET_VECTORS
+ b.ne 1f
+ mrs x0, vbar_el2
b 2f
-1: mrs x0, vbar_el2 // Return vbar_el2
+
+1: cmp x18, #HVC_SET_VECTORS
+ b.ne 2f
+ msr vbar_el2, x0
+
2: eret
ENDPROC(el1_sync)
@@ -100,11 +109,12 @@ ENDPROC(\label)
* initialisation entry point.
*/
-ENTRY(__hyp_get_vectors)
- mov x0, xzr
- // fall through
ENTRY(__hyp_set_vectors)
- hvc #0
+ hvc #HVC_SET_VECTORS
ret
-ENDPROC(__hyp_get_vectors)
ENDPROC(__hyp_set_vectors)
+
+ENTRY(__hyp_get_vectors)
+ hvc #HVC_GET_VECTORS
+ ret
+ENDPROC(__hyp_get_vectors)
diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S
index fbe909f..6d4e186 100644
--- a/arch/arm64/kvm/hyp.S
+++ b/arch/arm64/kvm/hyp.S
@@ -26,6 +26,7 @@
#include <asm/kvm_asm.h>
#include <asm/kvm_arm.h>
#include <asm/kvm_mmu.h>
+#include <asm/virt.h>
#define CPU_GP_REG_OFFSET(x) (CPU_GP_REGS + x)
#define CPU_XREG_OFFSET(x) CPU_GP_REG_OFFSET(CPU_USER_PT_REGS + 8*x)
@@ -1105,12 +1106,9 @@ __hyp_panic_str:
* in Hyp mode (see init_hyp_mode in arch/arm/kvm/arm.c). Return values are
* passed in r0 and r1.
*
- * A function pointer with a value of 0 has a special meaning, and is
- * used to implement __hyp_get_vectors in the same way as in
- * arch/arm64/kernel/hyp_stub.S.
*/
ENTRY(kvm_call_hyp)
- hvc #0
+ hvc #HVC_CALL_HYP
ret
ENDPROC(kvm_call_hyp)
@@ -1140,6 +1138,7 @@ el1_sync: // Guest trapped into EL2
push x2, x3
mrs x1, esr_el2
+ and x0, x1, #ESR_EL2_ISS
lsr x2, x1, #ESR_EL2_EC_SHIFT
cmp x2, #ESR_EL2_EC_HVC64
@@ -1149,15 +1148,19 @@ el1_sync: // Guest trapped into EL2
cbnz x3, el1_trap // called HVC
/* Here, we're pretty sure the host called HVC. */
+ mov x18, x0
pop x2, x3
pop x0, x1
- /* Check for __hyp_get_vectors */
- cbnz x0, 1f
+ cmp x18, #HVC_GET_VECTORS
+ b.ne 1f
mrs x0, vbar_el2
b 2f
-1: push lr, xzr
+1: cmp x18, #HVC_CALL_HYP
+ b.ne 2f
+
+ push lr, xzr
/*
* Compute the function address in EL2, and shuffle the parameters.
@@ -1170,6 +1173,7 @@ el1_sync: // Guest trapped into EL2
blr lr
pop lr, xzr
+
2: eret
el1_trap:
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 2/8] arm64: Add new hcall HVC_CALL_FUNC
2014-11-14 1:22 [PATCH 0/8] arm64 kexec kernel patches V6 Geoff Levand
2014-11-14 1:22 ` [PATCH 1/8] arm64: Convert hcalls to use ISS field Geoff Levand
@ 2014-11-14 1:22 ` Geoff Levand
2014-11-14 1:22 ` [PATCH 6/8] arm64/kexec: Add pr_devel output Geoff Levand
` (6 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Geoff Levand @ 2014-11-14 1:22 UTC (permalink / raw)
To: linux-arm-kernel
Add the new hcall HVC_CALL_FUNC that allows execution of a function at EL2.
During CPU reset the CPU must be brought to the exception level it had on
entry to the kernel. The HVC_CALL_FUNC hcall will provide the mechanism
needed for this exception level switch.
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
arch/arm64/include/asm/virt.h | 13 +++++++++++++
arch/arm64/kernel/hyp-stub.S | 17 ++++++++++++++---
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h
index 99c319c..055e8d8 100644
--- a/arch/arm64/include/asm/virt.h
+++ b/arch/arm64/include/asm/virt.h
@@ -41,6 +41,19 @@
#define HVC_CALL_HYP 3
+/*
+ * HVC_CALL_FUNC - Execute a function at EL2.
+ *
+ * @x0: Physical address of the funtion to be executed.
+ * @x1: Passed as the first argument to the function.
+ * @x2: Passed as the second argument to the function.
+ * @x3: Passed as the third argument to the function.
+ *
+ * The called function must preserve the contents of register x18.
+ */
+
+#define HVC_CALL_FUNC 4
+
#ifndef __ASSEMBLY__
/*
diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S
index 9ce8746..719c726 100644
--- a/arch/arm64/kernel/hyp-stub.S
+++ b/arch/arm64/kernel/hyp-stub.S
@@ -66,9 +66,20 @@ el1_sync:
mrs x0, vbar_el2
b 2f
-1: cmp x18, #HVC_SET_VECTORS
- b.ne 2f
- msr vbar_el2, x0
+1: cmp x18, #HVC_SET_VECTORS
+ b.ne 1f
+ msr vbar_el2, x0
+ b 2f
+
+1: cmp x18, #HVC_CALL_FUNC
+ b.ne 2f
+ mov x18, lr
+ mov lr, x0
+ mov x0, x1
+ mov x1, x2
+ mov x2, x3
+ blr lr
+ mov lr, x18
2: eret
ENDPROC(el1_sync)
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 6/8] arm64/kexec: Add pr_devel output
2014-11-14 1:22 [PATCH 0/8] arm64 kexec kernel patches V6 Geoff Levand
2014-11-14 1:22 ` [PATCH 1/8] arm64: Convert hcalls to use ISS field Geoff Levand
2014-11-14 1:22 ` [PATCH 2/8] arm64: Add new hcall HVC_CALL_FUNC Geoff Levand
@ 2014-11-14 1:22 ` Geoff Levand
2014-11-14 21:12 ` [PATCH v2 " Geoff Levand
2014-11-14 1:22 ` [PATCH 5/8] arm64/kexec: Add core kexec support Geoff Levand
` (5 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Geoff Levand @ 2014-11-14 1:22 UTC (permalink / raw)
To: linux-arm-kernel
To aid in debugging kexec problems or when adding new functionality to kexec add
a new routine kexec_image_info() and several inline pr_devel statements.
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
arch/arm64/kernel/machine_kexec.c | 55 +++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index b0e5d76..775bcc3 100644
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -35,6 +35,38 @@ static bool kexec_is_dtb(const void *dtb)
}
/**
+ * 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 *image)
+{
+ unsigned long i;
+
+#if !defined(DEBUG)
+ return;
+#endif
+ pr_devel("%s:%d:\n", func, line);
+ pr_devel(" kexec image info:\n");
+ pr_devel(" type: %d\n", image->type);
+ pr_devel(" start: %lx\n", image->start);
+ pr_devel(" head: %lx\n", image->head);
+ pr_devel(" nr_segments: %lu\n", image->nr_segments);
+
+ for (i = 0; i < image->nr_segments; i++) {
+ pr_devel(" segment[%lu]: %016lx - %016lx, "
+ "%lx bytes, %lu pages%s\n",
+ i,
+ image->segment[i].mem,
+ image->segment[i].mem + image->segment[i].memsz,
+ image->segment[i].memsz,
+ image->segment[i].memsz / PAGE_SIZE,
+ (kexec_is_dtb(image->segment[i].buf) ?
+ ", dtb segment" : ""));
+ }
+}
+
+/**
* kexec_find_dtb_seg - Helper routine to find the dtb segment.
*/
static const struct kexec_segment *kexec_find_dtb_seg(
@@ -67,6 +99,8 @@ int machine_kexec_prepare(struct kimage *image)
arm64_kexec_dtb_addr = dtb_seg ? dtb_seg->mem : 0;
arm64_kexec_kimage_start = image->start;
+ kexec_image_info(image);
+
return 0;
}
@@ -121,6 +155,27 @@ void machine_kexec(struct kimage *image)
reboot_code_buffer_phys = page_to_phys(image->control_code_page);
reboot_code_buffer = phys_to_virt(reboot_code_buffer_phys);
+ kexec_image_info(image);
+
+ pr_devel("%s:%d: control_code_page: %p\n", __func__, __LINE__,
+ image->control_code_page);
+ pr_devel("%s:%d: reboot_code_buffer_phys: %pa\n", __func__, __LINE__,
+ &reboot_code_buffer_phys);
+ pr_devel("%s:%d: reboot_code_buffer: %p\n", __func__, __LINE__,
+ reboot_code_buffer);
+ pr_devel("%s:%d: relocate_new_kernel: %p\n", __func__, __LINE__,
+ relocate_new_kernel);
+ pr_devel("%s:%d: relocate_new_kernel_size: 0x%lx(%lu) bytes\n",
+ __func__, __LINE__, relocate_new_kernel_size,
+ relocate_new_kernel_size);
+
+ pr_devel("%s:%d: kexec_dtb_addr: %lx\n", __func__, __LINE__,
+ arm64_kexec_dtb_addr);
+ pr_devel("%s:%d: kexec_kimage_head: %lx\n", __func__, __LINE__,
+ arm64_kexec_kimage_head);
+ pr_devel("%s:%d: kexec_kimage_start: %lx\n", __func__, __LINE__,
+ arm64_kexec_kimage_start);
+
/*
* Copy relocate_new_kernel to the reboot_code_buffer for use
* after the kernel is shut down.
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 6/8] arm64/kexec: Add pr_devel output
2014-11-14 1:22 ` [PATCH 6/8] arm64/kexec: Add pr_devel output Geoff Levand
@ 2014-11-14 21:12 ` Geoff Levand
0 siblings, 0 replies; 18+ messages in thread
From: Geoff Levand @ 2014-11-14 21:12 UTC (permalink / raw)
To: linux-arm-kernel
To aid in debugging kexec problems or when adding new functionality to kexec add
a new routine kexec_image_info() and several inline pr_devel statements.
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
v2: Format fixes - thanks Sergei
arch/arm64/kernel/machine_kexec.c | 54 +++++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index b0e5d76..3d84759 100644
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -35,6 +35,37 @@ static bool kexec_is_dtb(const void *dtb)
}
/**
+ * 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 *image)
+{
+ unsigned long i;
+
+#if !defined(DEBUG)
+ return;
+#endif
+ pr_devel("%s:%d:\n", func, line);
+ pr_devel(" kexec image info:\n");
+ pr_devel(" type: %d\n", image->type);
+ pr_devel(" start: %lx\n", image->start);
+ pr_devel(" head: %lx\n", image->head);
+ pr_devel(" nr_segments: %lu\n", image->nr_segments);
+
+ for (i = 0; i < image->nr_segments; i++) {
+ pr_devel(" segment[%lu]: %016lx - %016lx, %lx bytes, %lu pages%s\n",
+ i,
+ image->segment[i].mem,
+ image->segment[i].mem + image->segment[i].memsz,
+ image->segment[i].memsz,
+ image->segment[i].memsz / PAGE_SIZE,
+ (kexec_is_dtb(image->segment[i].buf) ?
+ ", dtb segment" : ""));
+ }
+}
+
+/**
* kexec_find_dtb_seg - Helper routine to find the dtb segment.
*/
static const struct kexec_segment *kexec_find_dtb_seg(
@@ -67,6 +98,8 @@ int machine_kexec_prepare(struct kimage *image)
arm64_kexec_dtb_addr = dtb_seg ? dtb_seg->mem : 0;
arm64_kexec_kimage_start = image->start;
+ kexec_image_info(image);
+
return 0;
}
@@ -121,6 +154,27 @@ void machine_kexec(struct kimage *image)
reboot_code_buffer_phys = page_to_phys(image->control_code_page);
reboot_code_buffer = phys_to_virt(reboot_code_buffer_phys);
+ kexec_image_info(image);
+
+ pr_devel("%s:%d: control_code_page: %p\n", __func__, __LINE__,
+ image->control_code_page);
+ pr_devel("%s:%d: reboot_code_buffer_phys: %pa\n", __func__, __LINE__,
+ &reboot_code_buffer_phys);
+ pr_devel("%s:%d: reboot_code_buffer: %p\n", __func__, __LINE__,
+ reboot_code_buffer);
+ pr_devel("%s:%d: relocate_new_kernel: %p\n", __func__, __LINE__,
+ relocate_new_kernel);
+ pr_devel("%s:%d: relocate_new_kernel_size: 0x%lx(%lu) bytes\n",
+ __func__, __LINE__, relocate_new_kernel_size,
+ relocate_new_kernel_size);
+
+ pr_devel("%s:%d: kexec_dtb_addr: %lx\n", __func__, __LINE__,
+ arm64_kexec_dtb_addr);
+ pr_devel("%s:%d: kexec_kimage_head: %lx\n", __func__, __LINE__,
+ arm64_kexec_kimage_head);
+ pr_devel("%s:%d: kexec_kimage_start: %lx\n", __func__, __LINE__,
+ arm64_kexec_kimage_start);
+
/*
* Copy relocate_new_kernel to the reboot_code_buffer for use
* after the kernel is shut down.
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 5/8] arm64/kexec: Add core kexec support
2014-11-14 1:22 [PATCH 0/8] arm64 kexec kernel patches V6 Geoff Levand
` (2 preceding siblings ...)
2014-11-14 1:22 ` [PATCH 6/8] arm64/kexec: Add pr_devel output Geoff Levand
@ 2014-11-14 1:22 ` Geoff Levand
2014-11-14 1:22 ` [PATCH 8/8] arm64/kexec: Enable kexec in the arm64 defconfig Geoff Levand
` (4 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Geoff Levand @ 2014-11-14 1:22 UTC (permalink / raw)
To: linux-arm-kernel
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.
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
arch/arm64/Kconfig | 9 ++
arch/arm64/include/asm/kexec.h | 47 +++++++++++
arch/arm64/kernel/Makefile | 1 +
arch/arm64/kernel/machine_kexec.c | 155 ++++++++++++++++++++++++++++++++++
arch/arm64/kernel/relocate_kernel.S | 160 ++++++++++++++++++++++++++++++++++++
include/uapi/linux/kexec.h | 1 +
6 files changed, 373 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
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 1e0e467..36b7c54 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -347,6 +347,15 @@ config ARCH_HAS_CACHE_LINE_SIZE
source "mm/Kconfig"
+config KEXEC
+ depends on (!SMP || PM_SLEEP_SMP)
+ 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
diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
new file mode 100644
index 0000000..e7bd7ab
--- /dev/null
+++ b/arch/arm64/include/asm/kexec.h
@@ -0,0 +1,47 @@
+/*
+ * kexec for arm64
+ *
+ * Copyright (C) Linaro.
+ *
+ * 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.
+ */
+
+#if !defined(_ARM64_KEXEC_H)
+#define _ARM64_KEXEC_H
+
+/* Maximum physical address we can use pages from */
+
+#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
+
+/* Maximum address we can reach in physical address mode */
+
+#define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)
+
+/* Maximum address we can use for the control code buffer */
+
+#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL)
+
+#define KEXEC_CONTROL_PAGE_SIZE 4096
+
+#define KEXEC_ARCH KEXEC_ARCH_ARM64
+
+#if !defined(__ASSEMBLY__)
+
+/**
+ * crash_setup_regs() - save registers for the panic kernel
+ *
+ * @newregs: registers are saved here
+ * @oldregs: registers to be saved (may be %NULL)
+ */
+
+static inline void crash_setup_regs(struct pt_regs *newregs,
+ struct pt_regs *oldregs)
+{
+ /* Empty routine needed to avoid build errors. */
+}
+
+#endif /* !defined(__ASSEMBLY__) */
+
+#endif
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index 5bd029b..49de6f8 100644
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@ -31,6 +31,7 @@ arm64-obj-$(CONFIG_JUMP_LABEL) += jump_label.o
arm64-obj-$(CONFIG_KGDB) += kgdb.o
arm64-obj-$(CONFIG_EFI) += efi.o efi-stub.o efi-entry.o
arm64-obj-$(CONFIG_PCI) += pci.o
+arm64-obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
obj-y += $(arm64-obj-y) vdso/
obj-m += $(arm64-obj-m)
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
new file mode 100644
index 0000000..b0e5d76
--- /dev/null
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -0,0 +1,155 @@
+/*
+ * kexec for arm64
+ *
+ * Copyright (C) Linaro.
+ *
+ * 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.
+ */
+
+#include <linux/kexec.h>
+#include <linux/of_fdt.h>
+#include <linux/slab.h>
+#include <linux/uaccess.h>
+
+#include <asm/cacheflush.h>
+#include <asm/system_misc.h>
+
+/* Global variables for the relocate_kernel routine. */
+extern const unsigned char relocate_new_kernel[];
+extern const unsigned long relocate_new_kernel_size;
+extern unsigned long arm64_kexec_dtb_addr;
+extern unsigned long arm64_kexec_kimage_head;
+extern unsigned long arm64_kexec_kimage_start;
+
+/**
+ * kexec_is_dtb - Helper routine to check the device tree header signature.
+ */
+static bool kexec_is_dtb(const void *dtb)
+{
+ __be32 magic;
+
+ return get_user(magic, (__be32 *)dtb) ? false :
+ (be32_to_cpu(magic) == OF_DT_HEADER);
+}
+
+/**
+ * kexec_find_dtb_seg - Helper routine to find the dtb segment.
+ */
+static const struct kexec_segment *kexec_find_dtb_seg(
+ const struct kimage *image)
+{
+ int i;
+
+ for (i = 0; i < image->nr_segments; i++) {
+ if (kexec_is_dtb(image->segment[i].buf))
+ return &image->segment[i];
+ }
+
+ return NULL;
+}
+
+void machine_kexec_cleanup(struct kimage *image)
+{
+ /* Empty routine needed to avoid build errors. */
+}
+
+/**
+ * machine_kexec_prepare - Prepare for a kexec reboot.
+ *
+ * Called from the core kexec code when a kernel image is loaded.
+ */
+int machine_kexec_prepare(struct kimage *image)
+{
+ const struct kexec_segment *dtb_seg = kexec_find_dtb_seg(image);
+
+ arm64_kexec_dtb_addr = dtb_seg ? dtb_seg->mem : 0;
+ arm64_kexec_kimage_start = image->start;
+
+ return 0;
+}
+
+/**
+ * kexec_list_flush - Helper to flush the kimage list to PoC.
+ */
+static void kexec_list_flush(unsigned long kimage_head)
+{
+ void *dest;
+ unsigned long *entry;
+
+ for (entry = &kimage_head, dest = NULL; ; entry++) {
+ unsigned int flag = *entry &
+ (IND_DESTINATION | IND_INDIRECTION | IND_DONE |
+ IND_SOURCE);
+ void *addr = phys_to_virt(*entry & PAGE_MASK);
+
+ switch (flag) {
+ case IND_INDIRECTION:
+ entry = (unsigned long *)addr - 1;
+ __flush_dcache_area(addr, PAGE_SIZE);
+ break;
+ case IND_DESTINATION:
+ dest = addr;
+ break;
+ case IND_SOURCE:
+ __flush_dcache_area(addr, PAGE_SIZE);
+ dest += PAGE_SIZE;
+ break;
+ case IND_DONE:
+ return;
+ default:
+ BUG();
+ }
+ }
+}
+
+/**
+ * machine_kexec - Do the kexec reboot.
+ *
+ * Called from the core kexec code for a sys_reboot with LINUX_REBOOT_CMD_KEXEC.
+ */
+void machine_kexec(struct kimage *image)
+{
+ phys_addr_t reboot_code_buffer_phys;
+ void *reboot_code_buffer;
+
+ BUG_ON(num_online_cpus() > 1);
+
+ arm64_kexec_kimage_head = image->head;
+
+ reboot_code_buffer_phys = page_to_phys(image->control_code_page);
+ reboot_code_buffer = phys_to_virt(reboot_code_buffer_phys);
+
+ /*
+ * Copy relocate_new_kernel to the reboot_code_buffer for use
+ * after the kernel is shut down.
+ */
+ memcpy(reboot_code_buffer, relocate_new_kernel,
+ relocate_new_kernel_size);
+
+ /* Flush the reboot_code_buffer in preparation for its execution. */
+ __flush_dcache_area(reboot_code_buffer, relocate_new_kernel_size);
+
+ /* Flush the kimage list. */
+ kexec_list_flush(image->head);
+
+ pr_info("Bye!\n");
+
+ /* Disable all DAIF exceptions. */
+ asm volatile ("msr daifset, #0xf" : : : "memory");
+
+ /*
+ * soft_restart() will shutdown the MMU, disable data caches, then
+ * transfer control to the reboot_code_buffer which contains a copy of
+ * the relocate_new_kernel routine. relocate_new_kernel will use
+ * physical addressing to relocate the new kernel to its final position
+ * and then will transfer control to the entry point of the new kernel.
+ */
+ soft_restart(reboot_code_buffer_phys);
+}
+
+void machine_crash_shutdown(struct pt_regs *regs)
+{
+ /* Empty routine needed to avoid build errors. */
+}
diff --git a/arch/arm64/kernel/relocate_kernel.S b/arch/arm64/kernel/relocate_kernel.S
new file mode 100644
index 0000000..1c1514d
--- /dev/null
+++ b/arch/arm64/kernel/relocate_kernel.S
@@ -0,0 +1,160 @@
+/*
+ * kexec for arm64
+ *
+ * Copyright (C) Linaro.
+ *
+ * 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.
+ */
+
+#include <asm/assembler.h>
+#include <asm/kexec.h>
+#include <asm/memory.h>
+#include <asm/page.h>
+#include <asm/proc-macros.S>
+
+/* The list entry flags. */
+
+#define IND_DESTINATION_BIT 0
+#define IND_INDIRECTION_BIT 1
+#define IND_DONE_BIT 2
+#define IND_SOURCE_BIT 3
+
+/*
+ * relocate_new_kernel - Put a 2nd stage kernel image in place and boot it.
+ *
+ * The memory that the old kernel occupies may be overwritten when coping the
+ * new image to its final location. To assure that the relocate_new_kernel
+ * routine which does that copy is not overwritten all code and data needed
+ * by relocate_new_kernel must be between the symbols relocate_new_kernel and
+ * relocate_new_kernel_end. The machine_kexec() routine will copy
+ * relocate_new_kernel to the kexec control_code_page, a special page which
+ * has been set up to be preserved during the copy operation.
+ */
+.globl relocate_new_kernel
+relocate_new_kernel:
+
+ /* Setup the list loop variables. */
+ ldr x18, arm64_kexec_kimage_head /* x18 = list entry */
+ dcache_line_size x17, x0 /* x17 = dcache line size */
+ mov x16, xzr /* x16 = segment start */
+ mov x15, xzr /* x15 = entry ptr */
+ mov x14, xzr /* x14 = copy dest */
+
+ /* Check if the new image needs relocation. */
+ cbz x18, .Ldone
+ tbnz x18, IND_DONE_BIT, .Ldone
+
+.Lloop:
+ and x13, x18, PAGE_MASK /* x13 = addr */
+
+ /* Test the entry flags. */
+.Ltest_source:
+ tbz x18, IND_SOURCE_BIT, .Ltest_indirection
+
+ mov x20, x14 /* x20 = copy dest */
+ mov x21, x13 /* x21 = copy src */
+
+ /* Invalidate dest page to PoC. */
+ mov x0, x20
+ add x19, x0, #PAGE_SIZE
+ sub x1, x17, #1
+ bic x0, x0, x1
+1: dc ivac, x0
+ add x0, x0, x17
+ cmp x0, x19
+ b.lo 1b
+ dsb sy
+
+ /* Copy page. */
+1: ldp x22, x23, [x21]
+ ldp x24, x25, [x21, #16]
+ ldp x26, x27, [x21, #32]
+ ldp x28, x29, [x21, #48]
+ add x21, x21, #64
+ stnp x22, x23, [x20]
+ stnp x24, x25, [x20, #16]
+ stnp x26, x27, [x20, #32]
+ stnp x28, x29, [x20, #48]
+ add x20, x20, #64
+ tst x21, #(PAGE_SIZE - 1)
+ b.ne 1b
+
+ /* dest += PAGE_SIZE */
+ add x14, x14, PAGE_SIZE
+ b .Lnext
+
+.Ltest_indirection:
+ tbz x18, IND_INDIRECTION_BIT, .Ltest_destination
+
+ /* ptr = addr */
+ mov x15, x13
+ b .Lnext
+
+.Ltest_destination:
+ tbz x18, IND_DESTINATION_BIT, .Lnext
+
+ mov x16, x13
+
+ /* dest = addr */
+ mov x14, x13
+
+.Lnext:
+ /* entry = *ptr++ */
+ ldr x18, [x15], #8
+
+ /* while (!(entry & DONE)) */
+ tbz x18, IND_DONE_BIT, .Lloop
+
+.Ldone:
+ dsb sy
+ isb
+ ic ialluis
+ dsb sy
+ isb
+
+ /* Start new image. */
+ ldr x4, arm64_kexec_kimage_start
+ ldr x0, arm64_kexec_dtb_addr
+ mov x1, xzr
+ mov x2, xzr
+ mov x3, xzr
+ br x4
+
+.align 3 /* To keep the 64-bit values below naturally aligned. */
+
+/* The machine_kexec routines set these variables. */
+
+/*
+ * arm64_kexec_kimage_start - Copy of image->start, the entry point of the new
+ * image.
+ */
+.globl arm64_kexec_kimage_start
+arm64_kexec_kimage_start:
+ .quad 0x0
+
+/*
+ * arm64_kexec_dtb_addr - Physical address of a device tree.
+ */
+.globl arm64_kexec_dtb_addr
+arm64_kexec_dtb_addr:
+ .quad 0x0
+
+/*
+ * arm64_kexec_kimage_head - Copy of image->head, the list of kimage entries.
+ */
+.globl arm64_kexec_kimage_head
+arm64_kexec_kimage_head:
+ .quad 0x0
+
+.Lrelocate_new_kernel_end:
+
+/*
+ * relocate_new_kernel_size - Number of bytes to copy to the control_code_page.
+ */
+.globl relocate_new_kernel_size
+relocate_new_kernel_size:
+ .quad .Lrelocate_new_kernel_end - relocate_new_kernel
+
+.org KEXEC_CONTROL_PAGE_SIZE
diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h
index 6925f5b..04626b9 100644
--- a/include/uapi/linux/kexec.h
+++ b/include/uapi/linux/kexec.h
@@ -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_ARM64 (183 << 16)
/* The artificial cap on the number of segments passed to kexec_load. */
#define KEXEC_SEGMENT_MAX 16
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 8/8] arm64/kexec: Enable kexec in the arm64 defconfig
2014-11-14 1:22 [PATCH 0/8] arm64 kexec kernel patches V6 Geoff Levand
` (3 preceding siblings ...)
2014-11-14 1:22 ` [PATCH 5/8] arm64/kexec: Add core kexec support Geoff Levand
@ 2014-11-14 1:22 ` Geoff Levand
2014-11-14 1:22 ` [PATCH 4/8] arm64: Move proc-macros.S to include/asm Geoff Levand
` (3 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Geoff Levand @ 2014-11-14 1:22 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
arch/arm64/configs/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 4ce602c..6a8f02a 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -40,6 +40,7 @@ CONFIG_PREEMPT=y
CONFIG_KSM=y
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_CMA=y
+CONFIG_KEXEC=y
CONFIG_CMDLINE="console=ttyAMA0"
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_COMPAT=y
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 4/8] arm64: Move proc-macros.S to include/asm
2014-11-14 1:22 [PATCH 0/8] arm64 kexec kernel patches V6 Geoff Levand
` (4 preceding siblings ...)
2014-11-14 1:22 ` [PATCH 8/8] arm64/kexec: Enable kexec in the arm64 defconfig Geoff Levand
@ 2014-11-14 1:22 ` Geoff Levand
2014-11-14 1:22 ` [PATCH 7/8] arm64/kexec: Add checks for KVM and EFI Geoff Levand
` (2 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Geoff Levand @ 2014-11-14 1:22 UTC (permalink / raw)
To: linux-arm-kernel
To allow the assembler macros defined in proc-macros.S to be used outside
the mm code move the proc-macros.S file from arch/arm64/mm/ to
arch/arm64/include/asm/ and fix up any preprocessor includes to use the new
file location.
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
arch/arm64/include/asm/proc-macros.S | 54 ++++++++++++++++++++++++++++++++++++
arch/arm64/mm/cache.S | 3 +-
arch/arm64/mm/proc-macros.S | 54 ------------------------------------
arch/arm64/mm/proc.S | 3 +-
4 files changed, 56 insertions(+), 58 deletions(-)
create mode 100644 arch/arm64/include/asm/proc-macros.S
delete mode 100644 arch/arm64/mm/proc-macros.S
diff --git a/arch/arm64/include/asm/proc-macros.S b/arch/arm64/include/asm/proc-macros.S
new file mode 100644
index 0000000..005d29e
--- /dev/null
+++ b/arch/arm64/include/asm/proc-macros.S
@@ -0,0 +1,54 @@
+/*
+ * Based on arch/arm/mm/proc-macros.S
+ *
+ * Copyright (C) 2012 ARM Ltd.
+ *
+ * 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.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <asm/asm-offsets.h>
+#include <asm/thread_info.h>
+
+/*
+ * vma_vm_mm - get mm pointer from vma pointer (vma->vm_mm)
+ */
+ .macro vma_vm_mm, rd, rn
+ ldr \rd, [\rn, #VMA_VM_MM]
+ .endm
+
+/*
+ * mmid - get context id from mm pointer (mm->context.id)
+ */
+ .macro mmid, rd, rn
+ ldr \rd, [\rn, #MM_CONTEXT_ID]
+ .endm
+
+/*
+ * dcache_line_size - get the minimum D-cache line size from the CTR register.
+ */
+ .macro dcache_line_size, reg, tmp
+ mrs \tmp, ctr_el0 // read CTR
+ ubfm \tmp, \tmp, #16, #19 // cache line size encoding
+ mov \reg, #4 // bytes per word
+ lsl \reg, \reg, \tmp // actual cache line size
+ .endm
+
+/*
+ * icache_line_size - get the minimum I-cache line size from the CTR register.
+ */
+ .macro icache_line_size, reg, tmp
+ mrs \tmp, ctr_el0 // read CTR
+ and \tmp, \tmp, #0xf // cache line size encoding
+ mov \reg, #4 // bytes per word
+ lsl \reg, \reg, \tmp // actual cache line size
+ .endm
diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S
index 2366383..4e811a4 100644
--- a/arch/arm64/mm/cache.S
+++ b/arch/arm64/mm/cache.S
@@ -20,8 +20,7 @@
#include <linux/linkage.h>
#include <linux/init.h>
#include <asm/assembler.h>
-
-#include "proc-macros.S"
+#include <asm/proc-macros.S>
/*
* __flush_dcache_all()
diff --git a/arch/arm64/mm/proc-macros.S b/arch/arm64/mm/proc-macros.S
deleted file mode 100644
index 005d29e..0000000
--- a/arch/arm64/mm/proc-macros.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Based on arch/arm/mm/proc-macros.S
- *
- * Copyright (C) 2012 ARM Ltd.
- *
- * 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.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include <asm/asm-offsets.h>
-#include <asm/thread_info.h>
-
-/*
- * vma_vm_mm - get mm pointer from vma pointer (vma->vm_mm)
- */
- .macro vma_vm_mm, rd, rn
- ldr \rd, [\rn, #VMA_VM_MM]
- .endm
-
-/*
- * mmid - get context id from mm pointer (mm->context.id)
- */
- .macro mmid, rd, rn
- ldr \rd, [\rn, #MM_CONTEXT_ID]
- .endm
-
-/*
- * dcache_line_size - get the minimum D-cache line size from the CTR register.
- */
- .macro dcache_line_size, reg, tmp
- mrs \tmp, ctr_el0 // read CTR
- ubfm \tmp, \tmp, #16, #19 // cache line size encoding
- mov \reg, #4 // bytes per word
- lsl \reg, \reg, \tmp // actual cache line size
- .endm
-
-/*
- * icache_line_size - get the minimum I-cache line size from the CTR register.
- */
- .macro icache_line_size, reg, tmp
- mrs \tmp, ctr_el0 // read CTR
- and \tmp, \tmp, #0xf // cache line size encoding
- mov \reg, #4 // bytes per word
- lsl \reg, \reg, \tmp // actual cache line size
- .endm
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index 7467199..b767032 100644
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -25,10 +25,9 @@
#include <asm/hwcap.h>
#include <asm/pgtable-hwdef.h>
#include <asm/pgtable.h>
+#include <asm/proc-macros.S>
#include <asm/virt.h>
-#include "proc-macros.S"
-
#ifdef CONFIG_ARM64_64K_PAGES
#define TCR_TG_FLAGS TCR_TG0_64K | TCR_TG1_64K
#else
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 7/8] arm64/kexec: Add checks for KVM and EFI
2014-11-14 1:22 [PATCH 0/8] arm64 kexec kernel patches V6 Geoff Levand
` (5 preceding siblings ...)
2014-11-14 1:22 ` [PATCH 4/8] arm64: Move proc-macros.S to include/asm Geoff Levand
@ 2014-11-14 1:22 ` Geoff Levand
2014-11-14 14:42 ` Sergei Shtylyov
2014-11-14 21:08 ` [PATCH v3 " Geoff Levand
2014-11-14 1:22 ` [PATCH 3/8] arm64: Add EL2 switch to soft_restart Geoff Levand
2014-11-27 6:19 ` [PATCH 0/8] arm64 kexec kernel patches V6 Dave Young
8 siblings, 2 replies; 18+ messages in thread
From: Geoff Levand @ 2014-11-14 1:22 UTC (permalink / raw)
To: linux-arm-kernel
Add runtime checks that fail the arm64 kexec syscall for situations that would
result in system instability do to problems in the KVM and EFI kernel support.
These checks should be removed when the KVM and EFI problems are fixed.
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
arch/arm64/kernel/machine_kexec.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index 775bcc3..5b62bd1f 100644
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -16,6 +16,12 @@
#include <asm/cacheflush.h>
#include <asm/system_misc.h>
+/* TODO: Remove this include when KVM can support a kexc reboot. */
+#include <asm/virt.h>
+
+/* TODO: Remove this include when EFI can support a kexc reboot. */
+#include <linux/efi.h>
+
/* Global variables for the relocate_kernel routine. */
extern const unsigned char relocate_new_kernel[];
extern const unsigned long relocate_new_kernel_size;
@@ -101,6 +107,22 @@ int machine_kexec_prepare(struct kimage *image)
kexec_image_info(image);
+ /* TODO: Remove this message when KVM can support a kexc reboot. */
+ if (IS_ENABLED(CONFIG_KVM) && is_hyp_mode_available()) {
+ pr_err("%s: Your kernel is configued with KVM support "
+ "(CONFIG_KVM=y) which currently does not allow for "
+ "kexec re-boot.\n", __func__);
+ return -ENOSYS;
+ }
+
+ /* TODO: Remove this message when EFI can support a kexc reboot. */
+ if (efi_enabled(EFI_BOOT)) {
+ pr_err("%s: Your kernel is using the Extensible Firmware "
+ "Interface (EFI) which currently does not allow for "
+ "kexec re-boot.\n", __func__);
+ return -ENOSYS;
+ }
+
return 0;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 7/8] arm64/kexec: Add checks for KVM and EFI
2014-11-14 1:22 ` [PATCH 7/8] arm64/kexec: Add checks for KVM and EFI Geoff Levand
@ 2014-11-14 14:42 ` Sergei Shtylyov
2014-11-14 18:28 ` [PATCH v2 " Geoff Levand
2014-11-14 21:08 ` [PATCH v3 " Geoff Levand
1 sibling, 1 reply; 18+ messages in thread
From: Sergei Shtylyov @ 2014-11-14 14:42 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 11/14/2014 4:22 AM, Geoff Levand wrote:
> Add runtime checks that fail the arm64 kexec syscall for situations that would
> result in system instability do to problems in the KVM and EFI kernel support.
> These checks should be removed when the KVM and EFI problems are fixed.
> Signed-off-by: Geoff Levand <geoff@infradead.org>
> ---
> arch/arm64/kernel/machine_kexec.c | 22 ++++++++++++++++++++++
> 1 file changed, 22 insertions(+)
> diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
> index 775bcc3..5b62bd1f 100644
> --- a/arch/arm64/kernel/machine_kexec.c
> +++ b/arch/arm64/kernel/machine_kexec.c
> @@ -16,6 +16,12 @@
> #include <asm/cacheflush.h>
> #include <asm/system_misc.h>
> +/* TODO: Remove this include when KVM can support a kexc reboot. */
s/kexc/kexec/ here and below.
> +#include <asm/virt.h>
> +
> +/* TODO: Remove this include when EFI can support a kexc reboot. */
> +#include <linux/efi.h>
> +
> /* Global variables for the relocate_kernel routine. */
> extern const unsigned char relocate_new_kernel[];
> extern const unsigned long relocate_new_kernel_size;
> @@ -101,6 +107,22 @@ int machine_kexec_prepare(struct kimage *image)
>
> kexec_image_info(image);
>
> + /* TODO: Remove this message when KVM can support a kexc reboot. */
> + if (IS_ENABLED(CONFIG_KVM) && is_hyp_mode_available()) {
> + pr_err("%s: Your kernel is configued with KVM support "
Configured.
> + "(CONFIG_KVM=y) which currently does not allow for "
> + "kexec re-boot.\n", __func__);
> + return -ENOSYS;
> + }
> +
> + /* TODO: Remove this message when EFI can support a kexc reboot. */
> + if (efi_enabled(EFI_BOOT)) {
> + pr_err("%s: Your kernel is using the Extensible Firmware "
> + "Interface (EFI) which currently does not allow for "
> + "kexec re-boot.\n", __func__);
> + return -ENOSYS;
> + }
> +
> return 0;
> }
WBR, Sergei
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v2 7/8] arm64/kexec: Add checks for KVM and EFI
2014-11-14 14:42 ` Sergei Shtylyov
@ 2014-11-14 18:28 ` Geoff Levand
2014-11-14 18:40 ` Sergei Shtylyov
0 siblings, 1 reply; 18+ messages in thread
From: Geoff Levand @ 2014-11-14 18:28 UTC (permalink / raw)
To: linux-arm-kernel
Add runtime checks that fail the arm64 kexec syscall for situations that would
result in system instability do to problems in the KVM and EFI kernel support.
These checks should be removed when the KVM and EFI problems are fixed.
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
v2: Typo fixes.
arch/arm64/kernel/machine_kexec.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index 775bcc3..faeb4f1 100644
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -16,6 +16,12 @@
#include <asm/cacheflush.h>
#include <asm/system_misc.h>
+/* TODO: Remove this include when KVM can support a kexec reboot. */
+#include <asm/virt.h>
+
+/* TODO: Remove this include when EFI can support a kexec reboot. */
+#include <linux/efi.h>
+
/* Global variables for the relocate_kernel routine. */
extern const unsigned char relocate_new_kernel[];
extern const unsigned long relocate_new_kernel_size;
@@ -101,6 +107,22 @@ int machine_kexec_prepare(struct kimage *image)
kexec_image_info(image);
+ /* TODO: Remove this message when KVM can support a kexec reboot. */
+ if (IS_ENABLED(CONFIG_KVM) && is_hyp_mode_available()) {
+ pr_err("%s: Your kernel is configured with KVM support "
+ "(CONFIG_KVM=y) which currently does not allow for "
+ "kexec re-boot.\n", __func__);
+ return -ENOSYS;
+ }
+
+ /* TODO: Remove this message when EFI can support a kexec reboot. */
+ if (efi_enabled(EFI_BOOT)) {
+ pr_err("%s: Your kernel is using the Extensible Firmware "
+ "Interface (EFI) which currently does not allow for "
+ "kexec re-boot.\n", __func__);
+ return -ENOSYS;
+ }
+
return 0;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 7/8] arm64/kexec: Add checks for KVM and EFI
2014-11-14 18:28 ` [PATCH v2 " Geoff Levand
@ 2014-11-14 18:40 ` Sergei Shtylyov
0 siblings, 0 replies; 18+ messages in thread
From: Sergei Shtylyov @ 2014-11-14 18:40 UTC (permalink / raw)
To: linux-arm-kernel
On 11/14/2014 09:28 PM, Geoff Levand wrote:
> Add runtime checks that fail the arm64 kexec syscall for situations that would
> result in system instability do to problems in the KVM and EFI kernel support.
> These checks should be removed when the KVM and EFI problems are fixed.
> Signed-off-by: Geoff Levand <geoff@infradead.org>
> ---
> v2: Typo fixes.
> arch/arm64/kernel/machine_kexec.c | 22 ++++++++++++++++++++++
> 1 file changed, 22 insertions(+)
> diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
> index 775bcc3..faeb4f1 100644
> --- a/arch/arm64/kernel/machine_kexec.c
> +++ b/arch/arm64/kernel/machine_kexec.c
[...]
> @@ -101,6 +107,22 @@ int machine_kexec_prepare(struct kimage *image)
>
> kexec_image_info(image);
>
> + /* TODO: Remove this message when KVM can support a kexec reboot. */
> + if (IS_ENABLED(CONFIG_KVM) && is_hyp_mode_available()) {
> + pr_err("%s: Your kernel is configured with KVM support "
> + "(CONFIG_KVM=y) which currently does not allow for "
> + "kexec re-boot.\n", __func__);
Er, failed to notice the first time: you do not need to break up the
message. This helps finding the messages in the kernel code. If you would have
run the patch thru scripst/checkpatch.pl you would have gotten the actual
warnings about that...
[...]
WBR, Sergei
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v3 7/8] arm64/kexec: Add checks for KVM and EFI
2014-11-14 1:22 ` [PATCH 7/8] arm64/kexec: Add checks for KVM and EFI Geoff Levand
2014-11-14 14:42 ` Sergei Shtylyov
@ 2014-11-14 21:08 ` Geoff Levand
1 sibling, 0 replies; 18+ messages in thread
From: Geoff Levand @ 2014-11-14 21:08 UTC (permalink / raw)
To: linux-arm-kernel
Add runtime checks that fail the arm64 kexec syscall for situations that would
result in system instability do to problems in the KVM and EFI kernel support.
These checks should be removed when the KVM and EFI problems are fixed.
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
v2: Typo fixes.
v3: Format fixes.
arch/arm64/kernel/machine_kexec.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index 3d84759..e7f036e 100644
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -16,6 +16,12 @@
#include <asm/cacheflush.h>
#include <asm/system_misc.h>
+/* TODO: Remove this include when KVM can support a kexec reboot. */
+#include <asm/virt.h>
+
+/* TODO: Remove this include when EFI can support a kexec reboot. */
+#include <linux/efi.h>
+
/* Global variables for the relocate_kernel routine. */
extern const unsigned char relocate_new_kernel[];
extern const unsigned long relocate_new_kernel_size;
@@ -100,6 +106,20 @@ int machine_kexec_prepare(struct kimage *image)
kexec_image_info(image);
+ /* TODO: Remove this message when KVM can support a kexec reboot. */
+ if (IS_ENABLED(CONFIG_KVM) && is_hyp_mode_available()) {
+ pr_err("%s: Your kernel is configured with KVM support (CONFIG_KVM=y) which currently does not allow for kexec re-boot.\n",
+ __func__);
+ return -ENOSYS;
+ }
+
+ /* TODO: Remove this message when EFI can support a kexec reboot. */
+ if (efi_enabled(EFI_BOOT)) {
+ pr_err("%s: Your kernel is using the Extensible Firmware Interface (EFI) which currently does not allow for kexec re-boot.\n",
+ __func__);
+ return -ENOSYS;
+ }
+
return 0;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 3/8] arm64: Add EL2 switch to soft_restart
2014-11-14 1:22 [PATCH 0/8] arm64 kexec kernel patches V6 Geoff Levand
` (6 preceding siblings ...)
2014-11-14 1:22 ` [PATCH 7/8] arm64/kexec: Add checks for KVM and EFI Geoff Levand
@ 2014-11-14 1:22 ` Geoff Levand
2014-11-27 6:19 ` [PATCH 0/8] arm64 kexec kernel patches V6 Dave Young
8 siblings, 0 replies; 18+ messages in thread
From: Geoff Levand @ 2014-11-14 1:22 UTC (permalink / raw)
To: linux-arm-kernel
When a CPU is reset it needs to be put into the exception level it had when it
entered the kernel. Update cpu_reset() to accept an argument el2_switch which
signals cpu_reset() to enter the soft reset address at EL2. If el2_switch is
not set the soft reset address will be entered at EL1.
Update cpu_soft_restart() and soft_restart() to pass the return of
is_hyp_mode_available() as the el2_switch value to cpu_reset(). Also update the
comments of cpu_reset(), cpu_soft_restart() and soft_restart() to reflect this
change.
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
arch/arm64/include/asm/proc-fns.h | 4 ++--
arch/arm64/kernel/process.c | 10 ++++++++-
arch/arm64/mm/proc.S | 47 +++++++++++++++++++++++++++++----------
3 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/arch/arm64/include/asm/proc-fns.h b/arch/arm64/include/asm/proc-fns.h
index 9a8fd84..339394d 100644
--- a/arch/arm64/include/asm/proc-fns.h
+++ b/arch/arm64/include/asm/proc-fns.h
@@ -32,8 +32,8 @@ extern void cpu_cache_off(void);
extern void cpu_do_idle(void);
extern void cpu_do_switch_mm(unsigned long pgd_phys, struct mm_struct *mm);
extern void cpu_reset(unsigned long addr) __attribute__((noreturn));
-void cpu_soft_restart(phys_addr_t cpu_reset,
- unsigned long addr) __attribute__((noreturn));
+void cpu_soft_restart(phys_addr_t cpu_reset, unsigned long el2_switch,
+ unsigned long addr) __attribute__((noreturn));
extern void cpu_do_suspend(struct cpu_suspend_ctx *ptr);
extern u64 cpu_do_resume(phys_addr_t ptr, u64 idmap_ttbr);
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index fde9923..371bbf1 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -50,6 +50,7 @@
#include <asm/mmu_context.h>
#include <asm/processor.h>
#include <asm/stacktrace.h>
+#include <asm/virt.h>
#ifdef CONFIG_CC_STACKPROTECTOR
#include <linux/stackprotector.h>
@@ -60,7 +61,14 @@ EXPORT_SYMBOL(__stack_chk_guard);
void soft_restart(unsigned long addr)
{
setup_mm_for_reboot();
- cpu_soft_restart(virt_to_phys(cpu_reset), addr);
+
+ /* TODO: Remove this conditional when KVM can support CPU restart. */
+ if (IS_ENABLED(CONFIG_KVM))
+ cpu_soft_restart(virt_to_phys(cpu_reset), 0, addr);
+ else
+ cpu_soft_restart(virt_to_phys(cpu_reset),
+ is_hyp_mode_available(), addr);
+
/* Should never get here */
BUG();
}
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index 4e778b1..7467199 100644
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -25,6 +25,7 @@
#include <asm/hwcap.h>
#include <asm/pgtable-hwdef.h>
#include <asm/pgtable.h>
+#include <asm/virt.h>
#include "proc-macros.S"
@@ -59,27 +60,48 @@ ENTRY(cpu_cache_off)
ENDPROC(cpu_cache_off)
/*
- * cpu_reset(loc)
+ * cpu_reset(el2_switch, loc) - Helper for cpu_soft_restart.
*
- * Perform a soft reset of the system. Put the CPU into the same state
- * as it would be if it had been reset, and branch to what would be the
- * reset vector. It must be executed with the flat identity mapping.
+ * @cpu_reset: Physical address of the cpu_reset routine.
+ * @el2_switch: Flag to indicate a swich to EL2 is needed.
+ * @addr: Location to jump to for soft reset.
*
- * - loc - location to jump to for soft reset
+ * Put the CPU into the same state as it would be if it had been reset, and
+ * branch to what would be the reset vector. It must be executed with the
+ * flat identity mapping.
*/
+
.align 5
+
ENTRY(cpu_reset)
- mrs x1, sctlr_el1
- bic x1, x1, #1
- msr sctlr_el1, x1 // disable the MMU
+ mrs x2, sctlr_el1
+ bic x2, x2, #1
+ msr sctlr_el1, x2 // disable the MMU
isb
- ret x0
+
+ cbz x0, 1f // el2_switch?
+ mov x0, x1
+ mov x1, xzr
+ mov x2, xzr
+ mov x3, xzr
+ hvc #HVC_CALL_FUNC // no return
+
+1: ret x1
ENDPROC(cpu_reset)
+/*
+ * cpu_soft_restart(cpu_reset, el2_switch, addr) - Perform a cpu soft reset.
+ *
+ * @cpu_reset: Physical address of the cpu_reset routine.
+ * @el2_switch: Flag to indicate a swich to EL2 is needed, passed to cpu_reset.
+ * @addr: Location to jump to for soft reset, passed to cpu_reset.
+ *
+ */
+
ENTRY(cpu_soft_restart)
- /* Save address of cpu_reset() and reset address */
- mov x19, x0
- mov x20, x1
+ mov x19, x0 // cpu_reset
+ mov x20, x1 // el2_switch
+ mov x21, x2 // addr
/* Turn D-cache off */
bl cpu_cache_off
@@ -88,6 +110,7 @@ ENTRY(cpu_soft_restart)
bl flush_cache_all
mov x0, x20
+ mov x1, x21
ret x19
ENDPROC(cpu_soft_restart)
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 0/8] arm64 kexec kernel patches V6
2014-11-14 1:22 [PATCH 0/8] arm64 kexec kernel patches V6 Geoff Levand
` (7 preceding siblings ...)
2014-11-14 1:22 ` [PATCH 3/8] arm64: Add EL2 switch to soft_restart Geoff Levand
@ 2014-11-27 6:19 ` Dave Young
2014-11-28 6:56 ` Dave Young
2014-12-02 20:22 ` Geoff Levand
8 siblings, 2 replies; 18+ messages in thread
From: Dave Young @ 2014-11-27 6:19 UTC (permalink / raw)
To: linux-arm-kernel
Geoff,
Is there any Linaro card for the KVM soft restart issue?
Ccing Andrew Jones since he might be interested in KVM issues.
On 11/14/14 at 01:22am, Geoff Levand wrote:
> Hi All,
>
> This series adds the core support for kexec re-boots on arm64. I have tested
> with the ARM VE fast model, the ARM Base model and the ARM Foundation
> model with various kernel config options for both the first and second stage
> kernels.
>
> To load a second stage kernel and execute a kexec re-boot on arm64 my patches to
> kexec-tools [2], which have not yet been merged upstream, are needed.
>
> Patches 1-3 rework the arm64 hcall mechanism to give the arm64 soft_restart()
> routine the ability to switch exception levels from EL1 to EL2 for kernels that
> were entered in EL2.
>
> Patch 4 moves proc-macros.S from arm64/mm to arm64/include/asm so that the
> dcache_line_size macro it defines can be uesd by kexec's relocate kernel
> routine.
>
> Patches 5-8 add the actual kexec support.
>
> Please consider all patches for inclusion. Any comments or suggestions on how
> to improve are welcome.
>
> [1] https://git.linaro.org/people/geoff.levand/linux-kexec.git
> [2] https://git.linaro.org/people/geoff.levand/kexec-tools.git
>
> Several things are known to have problems on kexec re-boot:
>
> spin-table
> ----------
>
> PROBLEM: The spin-table enable method does not implement all the methods needed
> for CPU hot-plug, so the first stage kernel cannot be shutdown properly.
>
> WORK-AROUND: Upgrade to system firmware that provides PSCI enable method
> support, OR build the first stage kernel with CONFIG_SMP=n, OR pass 'maxcpus=1'
> on the first stage kernel command line.
>
> FIX: Upgrade system firmware to provide PSCI enable method support or add
> missing spin-table support to the kernel.
>
> KVM
> ---
>
> PROBLEM: KVM acquires hypervisor resources on startup, but does not free those
> resources on shutdown, so the first stage kernel cannot be shutdown properly.
>
> WORK-AROUND: Build the first stage kernel with CONFIG_KVM=n.
>
> FIX: Fix KVM to support soft_restart(). KVM needs to restore default exception
> vectors, etc.
>
> UEFI
> ----
>
> PROBLEM: UEFI does not manage its runtime services virtual mappings in a way
> that is compatible with a kexec re-boot, so the second stage kernel hangs on
> boot-up.
>
> WORK-AROUND: Disable UEFI in firmware, OR use EFI uboot emulation if provided
> by your firmware.
>
> FIX: Fix kernel to manage UEFI virtual mappings properly.
>
> /memreserve/
> ----------
>
> PROBLEM: The use of device tree /memreserve/ entries is not compatible with
> kexec re-boot. The second stage kernel will use the reserved regions and the
> system will become unstable.
>
> WORK-AROUND: Pass a user specified DTB using the kexec --dtb option.
>
> FIX: Convert device tree source files (.dts) and/or bootloaders to use device
> tree reserved-memory nodes to specify reserved memory or provide an in kernel
> mechanism to export the /memreserve/ entries to user space.
>
> ACPI
> ----
>
> PROBLEM: The kernel for ACPI based systems does not export a device tree to the
> standard user space location of 'proc/device-tree'. Current applications
> expect to access device tree information from this standard location.
>
> WORK-AROUND: Disable ACPI in firmware, OR pass 'acpi=off' on the first stage
> kernel command line, OR pass a user specified DTB using the kexec --dtb option.
>
> FIX: Fix ACPI kernel support to export device tree information suitable for a
> kexec re-boot, and if this information is exported to somewhere other than
> 'proc/device-tree' update existing kexec user applications to use this new
> interface.
>
> ----------------------------------------------------------------
> The following changes since commit 302cd37c417d59549d073a8986fd028998409cb9:
>
> arm64: kvm: eliminate literal pool entries (2014-11-07 15:04:54 +0000)
>
> are available in the git repository at:
>
> git://git.linaro.org/people/geoff.levand/linux-kexec.git kexec-v6
>
> for you to fetch changes up to 3fc5a4ba22342ccd8e7e5a09620b00f4b81667a6:
>
> arm64/kexec: Enable kexec in the arm64 defconfig (2014-11-13 16:52:16 -0800)
>
> ----------------------------------------------------------------
> Geoff Levand (8):
> arm64: Convert hcalls to use ISS field
> arm64: Add new hcall HVC_CALL_FUNC
> arm64: Add EL2 switch to soft_restart
> arm64: Move proc-macros.S to include/asm
> arm64/kexec: Add core kexec support
> arm64/kexec: Add pr_devel output
> arm64/kexec: Add checks for KVM and EFI
> arm64/kexec: Enable kexec in the arm64 defconfig
>
> arch/arm64/Kconfig | 9 ++
> arch/arm64/configs/defconfig | 1 +
> arch/arm64/include/asm/kexec.h | 47 ++++++
> arch/arm64/include/asm/proc-fns.h | 4 +-
> arch/arm64/{mm => include/asm}/proc-macros.S | 0
> arch/arm64/include/asm/virt.h | 33 ++++
> arch/arm64/kernel/Makefile | 1 +
> arch/arm64/kernel/hyp-stub.S | 45 ++++--
> arch/arm64/kernel/machine_kexec.c | 232 +++++++++++++++++++++++++++
> arch/arm64/kernel/process.c | 10 +-
> arch/arm64/kernel/relocate_kernel.S | 160 ++++++++++++++++++
> arch/arm64/kvm/hyp.S | 18 ++-
> arch/arm64/mm/cache.S | 3 +-
> arch/arm64/mm/proc.S | 50 ++++--
> include/uapi/linux/kexec.h | 1 +
> 15 files changed, 576 insertions(+), 38 deletions(-)
> create mode 100644 arch/arm64/include/asm/kexec.h
> rename arch/arm64/{mm => include/asm}/proc-macros.S (100%)
> create mode 100644 arch/arm64/kernel/machine_kexec.c
> create mode 100644 arch/arm64/kernel/relocate_kernel.S
>
> --
> 1.9.1
>
>
> _______________________________________________
> kexec mailing list
> kexec at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/kexec
>
>
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 0/8] arm64 kexec kernel patches V6
2014-11-27 6:19 ` [PATCH 0/8] arm64 kexec kernel patches V6 Dave Young
@ 2014-11-28 6:56 ` Dave Young
2014-12-02 20:26 ` Geoff Levand
2014-12-02 20:22 ` Geoff Levand
1 sibling, 1 reply; 18+ messages in thread
From: Dave Young @ 2014-11-28 6:56 UTC (permalink / raw)
To: linux-arm-kernel
On 11/27/14 at 02:19pm, Dave Young wrote:
> Geoff,
>
> Is there any Linaro card for the KVM soft restart issue?
>
> Ccing Andrew Jones since he might be interested in KVM issues.
>
> On 11/14/14 at 01:22am, Geoff Levand wrote:
> > Hi All,
> >
> > This series adds the core support for kexec re-boots on arm64. I have tested
> > with the ARM VE fast model, the ARM Base model and the ARM Foundation
> > model with various kernel config options for both the first and second stage
> > kernels.
> >
> > To load a second stage kernel and execute a kexec re-boot on arm64 my patches to
> > kexec-tools [2], which have not yet been merged upstream, are needed.
> >
> > Patches 1-3 rework the arm64 hcall mechanism to give the arm64 soft_restart()
> > routine the ability to switch exception levels from EL1 to EL2 for kernels that
> > were entered in EL2.
> >
> > Patch 4 moves proc-macros.S from arm64/mm to arm64/include/asm so that the
> > dcache_line_size macro it defines can be uesd by kexec's relocate kernel
> > routine.
> >
> > Patches 5-8 add the actual kexec support.
> >
> > Please consider all patches for inclusion. Any comments or suggestions on how
> > to improve are welcome.
> >
> > [1] https://git.linaro.org/people/geoff.levand/linux-kexec.git
> > [2] https://git.linaro.org/people/geoff.levand/kexec-tools.git
> >
> > Several things are known to have problems on kexec re-boot:
> >
> > spin-table
> > ----------
> >
> > PROBLEM: The spin-table enable method does not implement all the methods needed
> > for CPU hot-plug, so the first stage kernel cannot be shutdown properly.
> >
> > WORK-AROUND: Upgrade to system firmware that provides PSCI enable method
> > support, OR build the first stage kernel with CONFIG_SMP=n, OR pass 'maxcpus=1'
> > on the first stage kernel command line.
> >
> > FIX: Upgrade system firmware to provide PSCI enable method support or add
> > missing spin-table support to the kernel.
> >
> > KVM
> > ---
> >
> > PROBLEM: KVM acquires hypervisor resources on startup, but does not free those
> > resources on shutdown, so the first stage kernel cannot be shutdown properly.
> >
> > WORK-AROUND: Build the first stage kernel with CONFIG_KVM=n.
> >
> > FIX: Fix KVM to support soft_restart(). KVM needs to restore default exception
> > vectors, etc.
> >
> > UEFI
> > ----
> >
> > PROBLEM: UEFI does not manage its runtime services virtual mappings in a way
> > that is compatible with a kexec re-boot, so the second stage kernel hangs on
> > boot-up.
> >
> > WORK-AROUND: Disable UEFI in firmware, OR use EFI uboot emulation if provided
> > by your firmware.
> >
> > FIX: Fix kernel to manage UEFI virtual mappings properly.
> >
> > /memreserve/
> > ----------
> >
> > PROBLEM: The use of device tree /memreserve/ entries is not compatible with
> > kexec re-boot. The second stage kernel will use the reserved regions and the
> > system will become unstable.
> >
> > WORK-AROUND: Pass a user specified DTB using the kexec --dtb option.
> >
> > FIX: Convert device tree source files (.dts) and/or bootloaders to use device
> > tree reserved-memory nodes to specify reserved memory or provide an in kernel
> > mechanism to export the /memreserve/ entries to user space.
> >
> > ACPI
> > ----
> >
> > PROBLEM: The kernel for ACPI based systems does not export a device tree to the
> > standard user space location of 'proc/device-tree'. Current applications
> > expect to access device tree information from this standard location.
> >
> > WORK-AROUND: Disable ACPI in firmware, OR pass 'acpi=off' on the first stage
> > kernel command line, OR pass a user specified DTB using the kexec --dtb option.
> >
> > FIX: Fix ACPI kernel support to export device tree information suitable for a
> > kexec re-boot, and if this information is exported to somewhere other than
> > 'proc/device-tree' update existing kexec user applications to use this new
> > interface.
> >
> > ----------------------------------------------------------------
> > The following changes since commit 302cd37c417d59549d073a8986fd028998409cb9:
> >
> > arm64: kvm: eliminate literal pool entries (2014-11-07 15:04:54 +0000)
> >
> > are available in the git repository at:
> >
> > git://git.linaro.org/people/geoff.levand/linux-kexec.git kexec-v6
> >
Tested your master branch, works for me with below setup:
UEFI boot, CONFIG_KVM=n, maxcpus=1, --lite
But --dtb still does not work if there's no /proc/device-tree, failed as below:
unrecoverable error: could not scan "/proc/device-tree/": No such file or directory.
kexec without --lite also does not work, looks like it hangs after "Bye" ..
Thanks
Dave
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 0/8] arm64 kexec kernel patches V6
2014-11-28 6:56 ` Dave Young
@ 2014-12-02 20:26 ` Geoff Levand
0 siblings, 0 replies; 18+ messages in thread
From: Geoff Levand @ 2014-12-02 20:26 UTC (permalink / raw)
To: linux-arm-kernel
Hi Dave,
On Fri, 2014-11-28 at 14:56 +0800, Dave Young wrote:
> Tested your master branch, works for me with below setup:
> UEFI boot, CONFIG_KVM=n, maxcpus=1, --lite
>
> But --dtb still does not work if there's no /proc/device-tree, failed as below:
> unrecoverable error: could not scan "/proc/device-tree/": No such file or directory.
>
> kexec without --lite also does not work, looks like it hangs after "Bye" ..
I'll be away from the office this week. I'll look into this when I
return.
-Geoff
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 0/8] arm64 kexec kernel patches V6
2014-11-27 6:19 ` [PATCH 0/8] arm64 kexec kernel patches V6 Dave Young
2014-11-28 6:56 ` Dave Young
@ 2014-12-02 20:22 ` Geoff Levand
1 sibling, 0 replies; 18+ messages in thread
From: Geoff Levand @ 2014-12-02 20:22 UTC (permalink / raw)
To: linux-arm-kernel
Hi Dave,
On Thu, 2014-11-27 at 14:19 +0800, Dave Young wrote:
> Is there any Linaro card for the KVM soft restart issue?
https://cards.linaro.org/browse/KWG-611
I have a skeleton patch for the fix that needs to be filled
out in both in the Linaro card and in the commit (arm64/kvm:
Add KVM cpu shutdown) my master branch here:
http://git.linaro.org/people/geoff.levand/linux-kexec.git
-Geoff
^ permalink raw reply [flat|nested] 18+ messages in thread