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

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

KVM: ppc: Refactor powerpc.c to relocate 440-specific code 



This introduces a set of core-provided hooks. For 440, some of these are
implemented by booke.c, with the rest in (the new) 44x.c.

Note that these hooks are link-time, not run-time. Since it is not possible to
build a single kernel for both e500 and 440 (for example), using function
pointers would only add overhead.

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

arch/powerpc/include/asm/kvm_host.h

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ struct kvmppc_44x_tlbe { 
struct kvm_arch {

};



/* XXX Can't include mmu-44x.h because it redefines struct mm_context. */

#define PPC44x_TLB_SIZE 64



struct kvm_vcpu_arch {

	/* Unmodified copy of the guest's TLB. */

	struct kvmppc_44x_tlbe guest_tlb[PPC44x_TLB_SIZE];

arch/powerpc/include/asm/kvm_ppc.h

+17 −17
Original line number Diff line number Diff line
@@ -61,23 +61,6 @@ extern void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn, 
extern void kvmppc_mmu_priv_switch(struct kvm_vcpu *vcpu, int usermode);

extern void kvmppc_mmu_switch_pid(struct kvm_vcpu *vcpu, u32 pid);



/* XXX Book E specific */

extern void kvmppc_tlbe_set_modified(struct kvm_vcpu *vcpu, unsigned int i);



extern void kvmppc_check_and_deliver_interrupts(struct kvm_vcpu *vcpu);



static inline void kvmppc_queue_exception(struct kvm_vcpu *vcpu, int exception)

{

	unsigned int priority = exception_priority[exception];

	set_bit(priority, &vcpu->arch.pending_exceptions);

}



static inline void kvmppc_clear_exception(struct kvm_vcpu *vcpu, int exception)

{

	unsigned int priority = exception_priority[exception];

	clear_bit(priority, &vcpu->arch.pending_exceptions);

}



/* Helper function for "full" MSR writes. No need to call this if only EE is

 * changing. */

static inline void kvmppc_set_msr(struct kvm_vcpu *vcpu, u32 new_msr)
@@ -99,6 +82,23 @@ static inline void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 new_pid) 
	}

}



/* Core-specific hooks */



extern int kvmppc_core_check_processor_compat(void);



extern void kvmppc_core_vcpu_load(struct kvm_vcpu *vcpu, int cpu);

extern void kvmppc_core_vcpu_put(struct kvm_vcpu *vcpu);



extern void kvmppc_core_load_guest_debugstate(struct kvm_vcpu *vcpu);

extern void kvmppc_core_load_host_debugstate(struct kvm_vcpu *vcpu);



extern void kvmppc_core_deliver_interrupts(struct kvm_vcpu *vcpu);

extern int kvmppc_core_pending_dec(struct kvm_vcpu *vcpu);

extern void kvmppc_core_queue_program(struct kvm_vcpu *vcpu);

extern void kvmppc_core_queue_dec(struct kvm_vcpu *vcpu);

extern void kvmppc_core_queue_external(struct kvm_vcpu *vcpu,

                                       struct kvm_interrupt *irq);



extern void kvmppc_core_destroy_mmu(struct kvm_vcpu *vcpu);



#endif /* __POWERPC_KVM_PPC_H__ */

arch/powerpc/kvm/44x.c

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

 *

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

 */



#include <linux/kvm_host.h>

#include <asm/reg.h>

#include <asm/cputable.h>

#include <asm/tlbflush.h>



#include "44x_tlb.h"



/* Note: clearing MSR[DE] just means that the debug interrupt will not be

 * delivered *immediately*. Instead, it simply sets the appropriate DBSR bits.

 * If those DBSR bits are still set when MSR[DE] is re-enabled, the interrupt

 * will be delivered as an "imprecise debug event" (which is indicated by

 * DBSR[IDE].

 */

static void kvm44x_disable_debug_interrupts(void)

{

	mtmsr(mfmsr() & ~MSR_DE);

}



void kvmppc_core_load_host_debugstate(struct kvm_vcpu *vcpu)

{

	kvm44x_disable_debug_interrupts();



	mtspr(SPRN_IAC1, vcpu->arch.host_iac[0]);

	mtspr(SPRN_IAC2, vcpu->arch.host_iac[1]);

	mtspr(SPRN_IAC3, vcpu->arch.host_iac[2]);

	mtspr(SPRN_IAC4, vcpu->arch.host_iac[3]);

	mtspr(SPRN_DBCR1, vcpu->arch.host_dbcr1);

	mtspr(SPRN_DBCR2, vcpu->arch.host_dbcr2);

	mtspr(SPRN_DBCR0, vcpu->arch.host_dbcr0);

	mtmsr(vcpu->arch.host_msr);

}



void kvmppc_core_load_guest_debugstate(struct kvm_vcpu *vcpu)

{

	struct kvm_guest_debug *dbg = &vcpu->guest_debug;

	u32 dbcr0 = 0;



	vcpu->arch.host_msr = mfmsr();

	kvm44x_disable_debug_interrupts();



	/* Save host debug register state. */

	vcpu->arch.host_iac[0] = mfspr(SPRN_IAC1);

	vcpu->arch.host_iac[1] = mfspr(SPRN_IAC2);

	vcpu->arch.host_iac[2] = mfspr(SPRN_IAC3);

	vcpu->arch.host_iac[3] = mfspr(SPRN_IAC4);

	vcpu->arch.host_dbcr0 = mfspr(SPRN_DBCR0);

	vcpu->arch.host_dbcr1 = mfspr(SPRN_DBCR1);

	vcpu->arch.host_dbcr2 = mfspr(SPRN_DBCR2);



	/* set registers up for guest */



	if (dbg->bp[0]) {

		mtspr(SPRN_IAC1, dbg->bp[0]);

		dbcr0 |= DBCR0_IAC1 | DBCR0_IDM;

	}

	if (dbg->bp[1]) {

		mtspr(SPRN_IAC2, dbg->bp[1]);

		dbcr0 |= DBCR0_IAC2 | DBCR0_IDM;

	}

	if (dbg->bp[2]) {

		mtspr(SPRN_IAC3, dbg->bp[2]);

		dbcr0 |= DBCR0_IAC3 | DBCR0_IDM;

	}

	if (dbg->bp[3]) {

		mtspr(SPRN_IAC4, dbg->bp[3]);

		dbcr0 |= DBCR0_IAC4 | DBCR0_IDM;

	}



	mtspr(SPRN_DBCR0, dbcr0);

	mtspr(SPRN_DBCR1, 0);

	mtspr(SPRN_DBCR2, 0);

}



void kvmppc_core_vcpu_load(struct kvm_vcpu *vcpu, int cpu)

{

	int i;



	/* Mark every guest entry in the shadow TLB entry modified, so that they

	 * will all be reloaded on the next vcpu run (instead of being

	 * demand-faulted). */

	for (i = 0; i <= tlb_44x_hwater; i++)

		kvmppc_tlbe_set_modified(vcpu, i);

}



void kvmppc_core_vcpu_put(struct kvm_vcpu *vcpu)

{

	/* Don't leave guest TLB entries resident when being de-scheduled. */

	/* XXX It would be nice to differentiate between heavyweight exit and

	 * sched_out here, since we could avoid the TLB flush for heavyweight

	 * exits. */

	_tlbia();

}



int kvmppc_core_check_processor_compat(void)

{

	int r;



	if (strcmp(cur_cpu_spec->platform, "ppc440") == 0)

		r = 0;

	else

		r = -ENOTSUPP;



	return r;

}

arch/powerpc/kvm/44x_tlb.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ extern struct kvmppc_44x_tlbe *kvmppc_44x_dtlb_search(struct kvm_vcpu *vcpu, 
                                                      gva_t eaddr);

extern struct kvmppc_44x_tlbe *kvmppc_44x_itlb_search(struct kvm_vcpu *vcpu,

                                                      gva_t eaddr);

extern void kvmppc_tlbe_set_modified(struct kvm_vcpu *vcpu, unsigned int i);



/* TLB helper functions */

static inline unsigned int get_tlb_size(const struct kvmppc_44x_tlbe *tlbe)

arch/powerpc/kvm/Kconfig

+4 −7
Original line number Diff line number Diff line
@@ -16,11 +16,9 @@ if VIRTUALIZATION 


config KVM

	bool "Kernel-based Virtual Machine (KVM) support"

	depends on 44x && EXPERIMENTAL

	depends on EXPERIMENTAL

	select PREEMPT_NOTIFIERS

	select ANON_INODES

	# We can only run on Book E hosts so far

	select KVM_BOOKE

	---help---

	  Support hosting virtualized guest machines. You will also

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


	  If unsure, say N.



config KVM_BOOKE

	bool "KVM support for Book E PowerPC processors"

config KVM_440

	bool "KVM support for PowerPC 440 processors"

	depends on KVM && 44x

	---help---

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

	  this works on 440 processors only.

	  KVM can run unmodified 440 guest kernels on 440 host processors.



config KVM_TRACE

	bool "KVM trace support"