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

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

KVM: ppc: create struct kvm_vcpu_44x and introduce container_of() accessor 



This patch doesn't yet move all 44x-specific data into the new structure, but
is the first step down that path. In the future we may also want to create a
struct kvm_vcpu_booke.

Based on patch from Liu Yu <yu.liu@freescale.com>.

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

arch/powerpc/include/asm/kvm_44x.h

0 → 100644
+47 −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>

 */



#ifndef __ASM_44X_H__

#define __ASM_44X_H__



#include <linux/kvm_host.h>



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

#define PPC44x_TLB_SIZE 64



struct kvmppc_vcpu_44x {

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

	struct kvmppc_44x_tlbe guest_tlb[PPC44x_TLB_SIZE];

	/* TLB that's actually used when the guest is running. */

	struct kvmppc_44x_tlbe shadow_tlb[PPC44x_TLB_SIZE];

	/* Pages which are referenced in the shadow TLB. */

	struct page *shadow_pages[PPC44x_TLB_SIZE];



	/* Track which TLB entries we've modified in the current exit. */

	u8 shadow_tlb_mod[PPC44x_TLB_SIZE];



	struct kvm_vcpu vcpu;

};



static inline struct kvmppc_vcpu_44x *to_44x(struct kvm_vcpu *vcpu)

{

	return container_of(vcpu, struct kvmppc_vcpu_44x, vcpu);

}



#endif /* __ASM_44X_H__ */

arch/powerpc/include/asm/kvm_host.h

+0 −13
Original line number Diff line number Diff line
@@ -74,20 +74,7 @@ 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];

	/* TLB that's actually used when the guest is running. */

	struct kvmppc_44x_tlbe shadow_tlb[PPC44x_TLB_SIZE];

	/* Pages which are referenced in the shadow TLB. */

	struct page *shadow_pages[PPC44x_TLB_SIZE];



	/* Track which TLB entries we've modified in the current exit. */

	u8 shadow_tlb_mod[PPC44x_TLB_SIZE];



	u32 host_stack;

	u32 host_pid;

	u32 host_dbcr0;

arch/powerpc/include/asm/kvm_ppc.h

+6 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ extern void kvmppc_mmu_switch_pid(struct kvm_vcpu *vcpu, u32 pid); 


/* Core-specific hooks */



extern struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm,

                                                unsigned int id);

extern void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu);

extern int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu);

extern int kvmppc_core_check_processor_compat(void);

extern int kvmppc_core_vcpu_translate(struct kvm_vcpu *vcpu,
@@ -85,6 +88,9 @@ extern int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu, 
extern int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs);

extern int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt);



extern int kvmppc_booke_init(void);

extern void kvmppc_booke_exit(void);



extern void kvmppc_core_destroy_mmu(struct kvm_vcpu *vcpu);



#endif /* __POWERPC_KVM_PPC_H__ */

arch/powerpc/kernel/asm-offsets.c

+9 −5
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ 
#include <linux/mm.h>

#include <linux/suspend.h>

#include <linux/hrtimer.h>

#ifdef CONFIG_KVM

#include <linux/kvm_host.h>

#endif

#ifdef CONFIG_PPC64

#include <linux/time.h>

#include <linux/hardirq.h>
@@ -51,6 +48,9 @@ 
#ifdef CONFIG_PPC_ISERIES

#include <asm/iseries/alpaca.h>

#endif

#ifdef CONFIG_KVM

#include <asm/kvm_44x.h>

#endif



#if defined(CONFIG_BOOKE) || defined(CONFIG_40x)

#include "head_booke.h"
@@ -359,10 +359,14 @@ int main(void) 
#ifdef CONFIG_KVM

	DEFINE(TLBE_BYTES, sizeof(struct kvmppc_44x_tlbe));



	DEFINE(VCPU_TO_44X, offsetof(struct kvmppc_vcpu_44x, vcpu));

	DEFINE(VCPU44x_SHADOW_TLB,

	       offsetof(struct kvmppc_vcpu_44x, shadow_tlb));

	DEFINE(VCPU44x_SHADOW_MOD,

	       offsetof(struct kvmppc_vcpu_44x, shadow_tlb_mod));



	DEFINE(VCPU_HOST_STACK, offsetof(struct kvm_vcpu, arch.host_stack));

	DEFINE(VCPU_HOST_PID, offsetof(struct kvm_vcpu, arch.host_pid));

	DEFINE(VCPU_SHADOW_TLB, offsetof(struct kvm_vcpu, arch.shadow_tlb));

	DEFINE(VCPU_SHADOW_MOD, offsetof(struct kvm_vcpu, arch.shadow_tlb_mod));

	DEFINE(VCPU_GPRS, offsetof(struct kvm_vcpu, arch.gpr));

	DEFINE(VCPU_LR, offsetof(struct kvm_vcpu, arch.lr));

	DEFINE(VCPU_CR, offsetof(struct kvm_vcpu, arch.cr));

arch/powerpc/kvm/44x.c

+60 −2
Original line number Diff line number Diff line
@@ -18,9 +18,13 @@ 
 */



#include <linux/kvm_host.h>

#include <linux/err.h>



#include <asm/reg.h>

#include <asm/cputable.h>

#include <asm/tlbflush.h>

#include <asm/kvm_44x.h>

#include <asm/kvm_ppc.h>



#include "44x_tlb.h"
@@ -124,7 +128,8 @@ int kvmppc_core_check_processor_compat(void) 


int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu)

{

	struct kvmppc_44x_tlbe *tlbe = &vcpu->arch.guest_tlb[0];

	struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);

	struct kvmppc_44x_tlbe *tlbe = &vcpu_44x->guest_tlb[0];



	tlbe->tid = 0;

	tlbe->word0 = PPC44x_TLB_16M | PPC44x_TLB_VALID;
@@ -150,6 +155,7 @@ int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu) 
int kvmppc_core_vcpu_translate(struct kvm_vcpu *vcpu,

                               struct kvm_translation *tr)

{

	struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);

	struct kvmppc_44x_tlbe *gtlbe;

	int index;

	gva_t eaddr;
@@ -166,7 +172,7 @@ int kvmppc_core_vcpu_translate(struct kvm_vcpu *vcpu, 
		return 0;

	}



	gtlbe = &vcpu->arch.guest_tlb[index];

	gtlbe = &vcpu_44x->guest_tlb[index];



	tr->physical_address = tlb_xlate(gtlbe, eaddr);

	/* XXX what does "writeable" and "usermode" even mean? */
@@ -174,3 +180,55 @@ int kvmppc_core_vcpu_translate(struct kvm_vcpu *vcpu, 


	return 0;

}



struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)

{

	struct kvmppc_vcpu_44x *vcpu_44x;

	struct kvm_vcpu *vcpu;

	int err;



	vcpu_44x = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL);

	if (!vcpu_44x) {

		err = -ENOMEM;

		goto out;

	}



	vcpu = &vcpu_44x->vcpu;

	err = kvm_vcpu_init(vcpu, kvm, id);

	if (err)

		goto free_vcpu;



	return vcpu;



free_vcpu:

	kmem_cache_free(kvm_vcpu_cache, vcpu_44x);

out:

	return ERR_PTR(err);

}



void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu)

{

	struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);



	kvm_vcpu_uninit(vcpu);

	kmem_cache_free(kvm_vcpu_cache, vcpu_44x);

}



static int kvmppc_44x_init(void)

{

	int r;



	r = kvmppc_booke_init();

	if (r)

		return r;



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

}



static void kvmppc_44x_exit(void)

{

	kvmppc_booke_exit();

}



module_init(kvmppc_44x_init);

module_exit(kvmppc_44x_exit);