Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d17051cb authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

KVM: PPC: Generic KVM PV guest support 



We have all the hypervisor pieces in place now, but the guest parts are still
missing.

This patch implements basic awareness of KVM when running Linux as guest. It
doesn't do anything with it yet though.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent ba492962

arch/powerpc/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC),) 
obj-y				+= ppc_save_regs.o

endif



obj-$(CONFIG_KVM_GUEST)		+= kvm.o

obj-$(CONFIG_KVM_GUEST)		+= kvm.o kvm_emul.o



# Disable GCOV in odd or sensitive code

GCOV_PROFILE_prom_init.o := n

arch/powerpc/kernel/asm-offsets.c

+15 −0
Original line number Diff line number Diff line
@@ -465,6 +465,21 @@ int main(void) 
	DEFINE(VCPU_FAULT_ESR, offsetof(struct kvm_vcpu, arch.fault_esr));

#endif /* CONFIG_PPC_BOOK3S */

#endif



#ifdef CONFIG_KVM_GUEST

	DEFINE(KVM_MAGIC_SCRATCH1, offsetof(struct kvm_vcpu_arch_shared,

					    scratch1));

	DEFINE(KVM_MAGIC_SCRATCH2, offsetof(struct kvm_vcpu_arch_shared,

					    scratch2));

	DEFINE(KVM_MAGIC_SCRATCH3, offsetof(struct kvm_vcpu_arch_shared,

					    scratch3));

	DEFINE(KVM_MAGIC_INT, offsetof(struct kvm_vcpu_arch_shared,

				       int_pending));

	DEFINE(KVM_MAGIC_MSR, offsetof(struct kvm_vcpu_arch_shared, msr));

	DEFINE(KVM_MAGIC_CRITICAL, offsetof(struct kvm_vcpu_arch_shared,

					    critical));

#endif



#ifdef CONFIG_44x

	DEFINE(PGD_T_LOG2, PGD_T_LOG2);

	DEFINE(PTE_T_LOG2, PTE_T_LOG2);

arch/powerpc/kernel/kvm.c

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ 
#include <asm/cacheflush.h>

#include <asm/disassemble.h>



#define KVM_MAGIC_PAGE		(-4096L)

#define magic_var(x) KVM_MAGIC_PAGE + offsetof(struct kvm_vcpu_arch_shared, x)



unsigned long kvm_hypercall(unsigned long *in,

			    unsigned long *out,

			    unsigned long nr)

arch/powerpc/kernel/kvm_emul.S

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * 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, write to the Free Software

 * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

 *

 * Copyright SUSE Linux Products GmbH 2010

 *

 * Authors: Alexander Graf <agraf@suse.de>

 */



#include <asm/ppc_asm.h>

#include <asm/kvm_asm.h>

#include <asm/reg.h>

#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)

arch/powerpc/platforms/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -21,6 +21,16 @@ source "arch/powerpc/platforms/44x/Kconfig" 
source "arch/powerpc/platforms/40x/Kconfig"

source "arch/powerpc/platforms/amigaone/Kconfig"



config KVM_GUEST

	bool "KVM Guest support"

	default y

	---help---

	  This option enables various optimizations for running under the KVM

	  hypervisor. Overhead for the kernel when not running inside KVM should

	  be minimal.



	  In case of doubt, say Y



config PPC_NATIVE

	bool

	depends on 6xx || PPC64