KVM: PPC: epapr: Factor out the epapr init
Subsystems (3)
PATCH 1/4 KVM: PPC: epapr: Factor out the epapr init
From: Liu Yu-B13201 <[email protected]>
from the kvm guest paravirt init code.
Signed-off-by Liu Yu <[email protected]>
Signed-off-by Stuart Yoder <[email protected]>
--- arch/powerpc/include/asm/epapr_hcalls.h | 2 + arch/powerpc/kernel/Makefile | 1 + arch/powerpc/kernel/epapr_hcalls.S | 25 +++++++++++++++ arch/powerpc/kernel/epapr_paravirt.c | 52 +++++++++++++++++++++++++++++++ arch/powerpc/kernel/kvm.c | 28 ++--------------- arch/powerpc/kernel/kvm_emul.S | 10 ------ arch/powerpc/platforms/Kconfig | 9 +++++ 7 files changed, 92 insertions(+), 35 deletions(-) create mode 100644 arch/powerpc/kernel/epapr_hcalls.S create mode 100644 arch/powerpc/kernel/epapr_paravirt.c
arch/powerpc/include/asm/epapr_hcalls.h +2 -0
@@ -148,6 +148,8 @@#define EV_HCALL_CLOBBERS2 EV_HCALL_CLOBBERS3, "r5"#define EV_HCALL_CLOBBERS1 EV_HCALL_CLOBBERS2, "r4" +extern bool epapr_paravirt_enabled; +extern u32 epapr_hypercall_start[];/* * We use "uintptr_t" to define a register because it's guaranteed to be a
arch/powerpc/kernel/Makefile +1 -0
@@ -134,6 +134,7 @@ ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC),) obj-y += ppc_save_regs.o endif +obj-$(CONFIG_EPAPR_PARAVIRT) += epapr_paravirt.o epapr_hcalls.o obj-$(CONFIG_KVM_GUEST) += kvm.o kvm_emul.o # Disable GCOV in odd or sensitive code
arch/powerpc/kernel/epapr_hcalls.S new file +25 -0
@@ -0,0 +1,25 @@ +/* + * Copyright (C) 2012 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ + +#include <linux/threads.h> +#include <asm/reg.h> +#include <asm/page.h> +#include <asm/cputable.h> +#include <asm/thread_info.h> +#include <asm/ppc_asm.h> +#include <asm/asm-offsets.h> + +/* Hypercall entry point. Will be patched with device tree instructions. */ +.global epapr_hypercall_start +epapr_hypercall_start: + li r3, -1 + nop + nop + nop + blr
arch/powerpc/kernel/epapr_paravirt.c new file +52 -0
52 lines not on this page · raw message
arch/powerpc/kernel/kvm.c +3 -25
@@ -30,6 +30,7 @@#include <asm/cacheflush.h> #include <asm/disassemble.h> #include <asm/ppc-opcode.h> +#include <asm/epapr_hcalls.h> #include <asm/machdep.h> #include <asm/mpic.h>
@@ -739,7 +740,7 @@ unsigned long kvm_hypercall(unsigned long *in, unsigned long register r11 asm("r11") = nr;unsigned long register r12 asm("r12" ); - asmvolatile ("bl kvm_hypercall_start" + asmvolatile ("bl epapr_hypercall_start" :"=r" (r0),"=r" (r3),"=r" (r4),"=r" (r5),"=r" (r6),"=r" (r7),"=r" (r8),"=r" (r9),"=r" (r10),"=r" (r11), "=r"(r12)
@@ -760,29 +761,6 @@ unsigned long kvm_hypercall(unsigned long *in, }EXPORT_SYMBOL_GPL (kvm_hypercall); -static int kvm_para_setup (void ) -{ -extern u32 kvm_hypercall_start; -struct device_node *hyper_node; -u32 *insts; -int len, i; - - hyper_node =of_find_node_by_path ("/hypervisor" ); -if (!hyper_node) -return -1 ; - - insts = (u32 *)of_get_property (hyper_node,"hcall-instructions" , &len); -if (len %4 ) -return -1 ; -if (len > (4 *4 )) -return -1 ; - -for (i =0 ; i < (len /4 ); i++) -kvm_patch_ins (&(&kvm_hypercall_start)[i], insts[i]); - -return 0 ; -} -static __init void kvm_free_tmp (void ) {unsigned long start, end;
@@ -811,7 +789,7 @@ static int __init kvm_guest_init(void)if (!kvm_para_available ()) goto free_tmp; -if (kvm_para_setup ()) +if (!epapr_paravirt_enabled) goto free_tmp;if (kvm_para_has_feature (KVM_FEATURE_MAGIC_PAGE ))
arch/powerpc/kernel/kvm_emul.S +0 -10
@@ -24,16 +24,6 @@ #include <asm/page.h> #include <asm/asm-offsets.h> -/* Hypercall entry point. Will be patched with device tree instructions. */ - -.global kvm_hypercall_start -kvm_hypercall_start: - li r3, -1 - nop - nop - nop - blr - #define KVM_MAGIC_PAGE (-4096) #ifdef CONFIG_64BIT
arch/powerpc/platforms/Kconfig +9 -0
@@ -25,6 +25,7 @@ source "arch/powerpc/platforms/wsp/Kconfig" config KVM_GUEST bool "KVM Guest support" default n + select EPAPR_PARAVIRT ---help--- This option enables various optimizations for running under the KVM hypervisor. Overhead for the kernel when not running inside KVM should
@@ -32,6 +33,14 @@ config KVM_GUEST In case of doubt, say Y +config EPAPR_PARAVIRT + bool "ePAPR para-virtualization support" + default n + help + Enables ePAPR para-virtualization support for guests. + + In case of doubt, say Y + config PPC_NATIVE bool depends on 6xx || PPC64
Signature · 1 line
1.7.3.4