Commit d9fbd03d authored by Hollis Blanchard's avatar Hollis Blanchard Committed by Avi Kivity
Browse files

KVM: ppc: combine booke_guest.c and booke_host.c 



The division was somewhat artificial and cumbersome, and had no functional
benefit anyways: we can only guests built for the real host processor.

Signed-off-by: default avatarHollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 0f55dc48

arch/powerpc/kvm/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ config KVM 
	select PREEMPT_NOTIFIERS

	select ANON_INODES

	# We can only run on Book E hosts so far

	select KVM_BOOKE_HOST

	select KVM_BOOKE

	---help---

	  Support hosting virtualized guest machines. You will also

	  need to select one or more of the processor modules below.
@@ -30,8 +30,8 @@ config KVM 


	  If unsure, say N.



config KVM_BOOKE_HOST

	bool "KVM host support for Book E PowerPC processors"

config KVM_BOOKE

	bool "KVM support for Book E PowerPC processors"

	depends on KVM && 44x

	---help---

	  Provides host support for KVM on Book E PowerPC processors. Currently

arch/powerpc/kvm/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ common-objs-y = $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o) 


common-objs-$(CONFIG_KVM_TRACE)  += $(addprefix ../../../virt/kvm/, kvm_trace.o)



kvm-objs := $(common-objs-y) powerpc.o emulate.o booke_guest.o

kvm-objs := $(common-objs-y) powerpc.o emulate.o

obj-$(CONFIG_KVM) += kvm.o



AFLAGS_booke_interrupts.o := -I$(obj)



kvm-booke-host-objs := booke_host.o booke_interrupts.o 44x_tlb.o

obj-$(CONFIG_KVM_BOOKE_HOST) += kvm-booke-host.o
 
kvm-booke-objs := booke.o booke_interrupts.o 44x_tlb.o

obj-$(CONFIG_KVM_BOOKE) += kvm-booke.o

arch/powerpc/kvm/booke_guest.c→arch/powerpc/kvm/booke.c

+60 −0
Original line number Diff line number Diff line
@@ -27,9 +27,12 @@ 
#include <asm/cputable.h>

#include <asm/uaccess.h>

#include <asm/kvm_ppc.h>

#include <asm/cacheflush.h>



#include "44x_tlb.h"



unsigned long kvmppc_booke_handlers;



#define VM_STAT(x) offsetof(struct kvm, stat.x), KVM_STAT_VM

#define VCPU_STAT(x) offsetof(struct kvm_vcpu, stat.x), KVM_STAT_VCPU
@@ -577,3 +580,60 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, 


	return 0;

}



static int kvmppc_booke_init(void)

{

	unsigned long ivor[16];

	unsigned long max_ivor = 0;

	int i;



	/* We install our own exception handlers by hijacking IVPR. IVPR must

	 * be 16-bit aligned, so we need a 64KB allocation. */

	kvmppc_booke_handlers = __get_free_pages(GFP_KERNEL | __GFP_ZERO,

	                                         VCPU_SIZE_ORDER);

	if (!kvmppc_booke_handlers)

		return -ENOMEM;



	/* XXX make sure our handlers are smaller than Linux's */



	/* Copy our interrupt handlers to match host IVORs. That way we don't

	 * have to swap the IVORs on every guest/host transition. */

	ivor[0] = mfspr(SPRN_IVOR0);

	ivor[1] = mfspr(SPRN_IVOR1);

	ivor[2] = mfspr(SPRN_IVOR2);

	ivor[3] = mfspr(SPRN_IVOR3);

	ivor[4] = mfspr(SPRN_IVOR4);

	ivor[5] = mfspr(SPRN_IVOR5);

	ivor[6] = mfspr(SPRN_IVOR6);

	ivor[7] = mfspr(SPRN_IVOR7);

	ivor[8] = mfspr(SPRN_IVOR8);

	ivor[9] = mfspr(SPRN_IVOR9);

	ivor[10] = mfspr(SPRN_IVOR10);

	ivor[11] = mfspr(SPRN_IVOR11);

	ivor[12] = mfspr(SPRN_IVOR12);

	ivor[13] = mfspr(SPRN_IVOR13);

	ivor[14] = mfspr(SPRN_IVOR14);

	ivor[15] = mfspr(SPRN_IVOR15);



	for (i = 0; i < 16; i++) {

		if (ivor[i] > max_ivor)

			max_ivor = ivor[i];



		memcpy((void *)kvmppc_booke_handlers + ivor[i],

		       kvmppc_handlers_start + i * kvmppc_handler_len,

		       kvmppc_handler_len);

	}

	flush_icache_range(kvmppc_booke_handlers,

	                   kvmppc_booke_handlers + max_ivor + kvmppc_handler_len);



	return kvm_init(NULL, sizeof(struct kvm_vcpu), THIS_MODULE);

}



static void __exit kvmppc_booke_exit(void)

{

	free_pages(kvmppc_booke_handlers, VCPU_SIZE_ORDER);

	kvm_exit();

}



module_init(kvmppc_booke_init)

module_exit(kvmppc_booke_exit)

arch/powerpc/kvm/booke_host.c

deleted100644 → 0
+0 −83
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 IBM Corp. 2008

 *

 * Authors: Hollis Blanchard <hollisb@us.ibm.com>

 */



#include <linux/errno.h>

#include <linux/kvm_host.h>

#include <linux/module.h>

#include <asm/cacheflush.h>

#include <asm/kvm_ppc.h>



unsigned long kvmppc_booke_handlers;



static int kvmppc_booke_init(void)

{

	unsigned long ivor[16];

	unsigned long max_ivor = 0;

	int i;



	/* We install our own exception handlers by hijacking IVPR. IVPR must

	 * be 16-bit aligned, so we need a 64KB allocation. */

	kvmppc_booke_handlers = __get_free_pages(GFP_KERNEL | __GFP_ZERO,

	                                         VCPU_SIZE_ORDER);

	if (!kvmppc_booke_handlers)

		return -ENOMEM;



	/* XXX make sure our handlers are smaller than Linux's */



	/* Copy our interrupt handlers to match host IVORs. That way we don't

	 * have to swap the IVORs on every guest/host transition. */

	ivor[0] = mfspr(SPRN_IVOR0);

	ivor[1] = mfspr(SPRN_IVOR1);

	ivor[2] = mfspr(SPRN_IVOR2);

	ivor[3] = mfspr(SPRN_IVOR3);

	ivor[4] = mfspr(SPRN_IVOR4);

	ivor[5] = mfspr(SPRN_IVOR5);

	ivor[6] = mfspr(SPRN_IVOR6);

	ivor[7] = mfspr(SPRN_IVOR7);

	ivor[8] = mfspr(SPRN_IVOR8);

	ivor[9] = mfspr(SPRN_IVOR9);

	ivor[10] = mfspr(SPRN_IVOR10);

	ivor[11] = mfspr(SPRN_IVOR11);

	ivor[12] = mfspr(SPRN_IVOR12);

	ivor[13] = mfspr(SPRN_IVOR13);

	ivor[14] = mfspr(SPRN_IVOR14);

	ivor[15] = mfspr(SPRN_IVOR15);



	for (i = 0; i < 16; i++) {

		if (ivor[i] > max_ivor)

			max_ivor = ivor[i];



		memcpy((void *)kvmppc_booke_handlers + ivor[i],

		       kvmppc_handlers_start + i * kvmppc_handler_len,

		       kvmppc_handler_len);

	}

	flush_icache_range(kvmppc_booke_handlers,

	                   kvmppc_booke_handlers + max_ivor + kvmppc_handler_len);



	return kvm_init(NULL, sizeof(struct kvm_vcpu), THIS_MODULE);

}



static void __exit kvmppc_booke_exit(void)

{

	free_pages(kvmppc_booke_handlers, VCPU_SIZE_ORDER);

	kvm_exit();

}



module_init(kvmppc_booke_init)

module_exit(kvmppc_booke_exit)