| Message ID | 1415989719.15847.121.camel@smoke (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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
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; }
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(+)