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

KVM: ppc: Rename "struct tlbe" to "struct kvmppc_44x_tlbe" 



This will ease ports to other cores.

Also remove unused "struct kvm_tlb" while we're at it.

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

arch/powerpc/include/asm/kvm_host.h

+3 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ struct kvm_vcpu_stat { 
	u32 halt_wakeup;

};



struct tlbe {

struct kvmppc_44x_tlbe {

	u32 tid; /* Only the low 8 bits are used. */

	u32 word0;

	u32 word1;
@@ -76,9 +76,9 @@ struct kvm_arch { 


struct kvm_vcpu_arch {

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

	struct tlbe guest_tlb[PPC44x_TLB_SIZE];

	struct kvmppc_44x_tlbe guest_tlb[PPC44x_TLB_SIZE];

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

	struct tlbe shadow_tlb[PPC44x_TLB_SIZE];

	struct kvmppc_44x_tlbe shadow_tlb[PPC44x_TLB_SIZE];

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

	struct page *shadow_pages[PPC44x_TLB_SIZE];

arch/powerpc/include/asm/kvm_ppc.h

+0 −5
Original line number Diff line number Diff line
@@ -29,11 +29,6 @@ 
#include <linux/kvm_types.h>

#include <linux/kvm_host.h>



struct kvm_tlb {

	struct tlbe guest_tlb[PPC44x_TLB_SIZE];

	struct tlbe shadow_tlb[PPC44x_TLB_SIZE];

};



enum emulation_result {

	EMULATE_DONE,         /* no further processing */

	EMULATE_DO_MMIO,      /* kvm_run filled with MMIO request */

arch/powerpc/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ int main(void) 
	DEFINE(PTE_SIZE, sizeof(pte_t));



#ifdef CONFIG_KVM

	DEFINE(TLBE_BYTES, sizeof(struct tlbe));

	DEFINE(TLBE_BYTES, sizeof(struct kvmppc_44x_tlbe));



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

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

arch/powerpc/kvm/44x_tlb.c

+12 −10
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ int kvmppc_44x_tlb_index(struct kvm_vcpu *vcpu, gva_t eaddr, unsigned int pid, 


	/* XXX Replace loop with fancy data structures. */

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

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

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

		unsigned int tid;



		if (eaddr < get_tlb_eaddr(tlbe))
@@ -111,7 +111,8 @@ int kvmppc_44x_tlb_index(struct kvm_vcpu *vcpu, gva_t eaddr, unsigned int pid, 
	return -1;

}



struct tlbe *kvmppc_44x_itlb_search(struct kvm_vcpu *vcpu, gva_t eaddr)

struct kvmppc_44x_tlbe *kvmppc_44x_itlb_search(struct kvm_vcpu *vcpu,

                                               gva_t eaddr)

{

	unsigned int as = !!(vcpu->arch.msr & MSR_IS);

	unsigned int index;
@@ -122,7 +123,8 @@ struct tlbe *kvmppc_44x_itlb_search(struct kvm_vcpu *vcpu, gva_t eaddr) 
	return &vcpu->arch.guest_tlb[index];

}



struct tlbe *kvmppc_44x_dtlb_search(struct kvm_vcpu *vcpu, gva_t eaddr)

struct kvmppc_44x_tlbe *kvmppc_44x_dtlb_search(struct kvm_vcpu *vcpu,

                                               gva_t eaddr)

{

	unsigned int as = !!(vcpu->arch.msr & MSR_DS);

	unsigned int index;
@@ -133,7 +135,7 @@ struct tlbe *kvmppc_44x_dtlb_search(struct kvm_vcpu *vcpu, gva_t eaddr) 
	return &vcpu->arch.guest_tlb[index];

}



static int kvmppc_44x_tlbe_is_writable(struct tlbe *tlbe)

static int kvmppc_44x_tlbe_is_writable(struct kvmppc_44x_tlbe *tlbe)

{

	return tlbe->word2 & (PPC44x_TLB_SW|PPC44x_TLB_UW);

}
@@ -141,7 +143,7 @@ static int kvmppc_44x_tlbe_is_writable(struct tlbe *tlbe) 
static void kvmppc_44x_shadow_release(struct kvm_vcpu *vcpu,

                                      unsigned int index)

{

	struct tlbe *stlbe = &vcpu->arch.shadow_tlb[index];

	struct kvmppc_44x_tlbe *stlbe = &vcpu->arch.shadow_tlb[index];

	struct page *page = vcpu->arch.shadow_pages[index];



	if (get_tlb_v(stlbe)) {
@@ -171,7 +173,7 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn, u64 asid, 
                    u32 flags)

{

	struct page *new_page;

	struct tlbe *stlbe;

	struct kvmppc_44x_tlbe *stlbe;

	hpa_t hpaddr;

	unsigned int victim;
@@ -227,7 +229,7 @@ static void kvmppc_mmu_invalidate(struct kvm_vcpu *vcpu, gva_t eaddr, 


	/* XXX Replace loop with fancy data structures. */

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

		struct tlbe *stlbe = &vcpu->arch.shadow_tlb[i];

		struct kvmppc_44x_tlbe *stlbe = &vcpu->arch.shadow_tlb[i];

		unsigned int tid;



		if (!get_tlb_v(stlbe))
@@ -262,7 +264,7 @@ void kvmppc_mmu_priv_switch(struct kvm_vcpu *vcpu, int usermode) 
	if (vcpu->arch.swap_pid) {

		/* XXX Replace loop with fancy data structures. */

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

			struct tlbe *stlbe = &vcpu->arch.shadow_tlb[i];

			struct kvmppc_44x_tlbe *stlbe = &vcpu->arch.shadow_tlb[i];



			/* Future optimization: clear only userspace mappings. */

			kvmppc_44x_shadow_release(vcpu, i);
@@ -279,7 +281,7 @@ void kvmppc_mmu_priv_switch(struct kvm_vcpu *vcpu, int usermode) 
}



static int tlbe_is_host_safe(const struct kvm_vcpu *vcpu,

                             const struct tlbe *tlbe)

                             const struct kvmppc_44x_tlbe *tlbe)

{

	gpa_t gpa;
@@ -305,7 +307,7 @@ int kvmppc_emul_tlbwe(struct kvm_vcpu *vcpu, u8 ra, u8 rs, u8 ws) 
	u64 raddr;

	u64 asid;

	u32 flags;

	struct tlbe *tlbe;

	struct kvmppc_44x_tlbe *tlbe;

	unsigned int index;



	index = vcpu->arch.gpr[ra];

arch/powerpc/kvm/44x_tlb.h

+13 −11
Original line number Diff line number Diff line
@@ -25,48 +25,50 @@ 


extern int kvmppc_44x_tlb_index(struct kvm_vcpu *vcpu, gva_t eaddr,

                                unsigned int pid, unsigned int as);

extern struct tlbe *kvmppc_44x_dtlb_search(struct kvm_vcpu *vcpu, gva_t eaddr);

extern struct tlbe *kvmppc_44x_itlb_search(struct kvm_vcpu *vcpu, gva_t eaddr);

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



/* TLB helper functions */

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

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

{

	return (tlbe->word0 >> 4) & 0xf;

}



static inline gva_t get_tlb_eaddr(const struct tlbe *tlbe)

static inline gva_t get_tlb_eaddr(const struct kvmppc_44x_tlbe *tlbe)

{

	return tlbe->word0 & 0xfffffc00;

}



static inline gva_t get_tlb_bytes(const struct tlbe *tlbe)

static inline gva_t get_tlb_bytes(const struct kvmppc_44x_tlbe *tlbe)

{

	unsigned int pgsize = get_tlb_size(tlbe);

	return 1 << 10 << (pgsize << 1);

}



static inline gva_t get_tlb_end(const struct tlbe *tlbe)

static inline gva_t get_tlb_end(const struct kvmppc_44x_tlbe *tlbe)

{

	return get_tlb_eaddr(tlbe) + get_tlb_bytes(tlbe) - 1;

}



static inline u64 get_tlb_raddr(const struct tlbe *tlbe)

static inline u64 get_tlb_raddr(const struct kvmppc_44x_tlbe *tlbe)

{

	u64 word1 = tlbe->word1;

	return ((word1 & 0xf) << 32) | (word1 & 0xfffffc00);

}



static inline unsigned int get_tlb_tid(const struct tlbe *tlbe)

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

{

	return tlbe->tid & 0xff;

}



static inline unsigned int get_tlb_ts(const struct tlbe *tlbe)

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

{

	return (tlbe->word0 >> 8) & 0x1;

}



static inline unsigned int get_tlb_v(const struct tlbe *tlbe)

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

{

	return (tlbe->word0 >> 9) & 0x1;

}
@@ -81,7 +83,7 @@ static inline unsigned int get_mmucr_sts(const struct kvm_vcpu *vcpu) 
	return (vcpu->arch.mmucr >> 16) & 0x1;

}



static inline gpa_t tlb_xlate(struct tlbe *tlbe, gva_t eaddr)

static inline gpa_t tlb_xlate(struct kvmppc_44x_tlbe *tlbe, gva_t eaddr)

{

	unsigned int pgmask = get_tlb_bytes(tlbe) - 1;