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

KVM: ppc: change kvmppc_mmu_map() parameters 



Passing just the TLB index will ease an e500 implementation.

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

arch/powerpc/include/asm/kvm_ppc.h

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ extern void kvmppc_emulate_dec(struct kvm_vcpu *vcpu); 
/* Core-specific hooks */



extern void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gpa_t gpaddr,

                           u64 asid, u32 flags, u32 max_bytes,

                           unsigned int gtlb_idx);

extern void kvmppc_mmu_priv_switch(struct kvm_vcpu *vcpu, int usermode);

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

arch/powerpc/kvm/44x_tlb.c

+7 −8
Original line number Diff line number Diff line
@@ -269,15 +269,19 @@ void kvmppc_mmu_destroy(struct kvm_vcpu *vcpu) 
 * Caller must ensure that the specified guest TLB entry is safe to insert into

 * the shadow TLB.

 */

void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gpa_t gpaddr, u64 asid,

                    u32 flags, u32 max_bytes, unsigned int gtlb_index)

void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gpa_t gpaddr,

                    unsigned int gtlb_index)

{

	struct kvmppc_44x_tlbe stlbe;

	struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);

	struct kvmppc_44x_tlbe *gtlbe = &vcpu_44x->guest_tlb[gtlb_index];

	struct kvmppc_44x_shadow_ref *ref;

	struct page *new_page;

	hpa_t hpaddr;

	gfn_t gfn;

	u32 asid = gtlbe->tid;

	u32 flags = gtlbe->word2;

	u32 max_bytes = get_tlb_bytes(gtlbe);

	unsigned int victim;



	/* Select TLB entry to clobber. Indirectly guard against races with the TLB
@@ -448,10 +452,8 @@ int kvmppc_44x_emul_tlbwe(struct kvm_vcpu *vcpu, u8 ra, u8 rs, u8 ws) 
	}



	if (tlbe_is_host_safe(vcpu, tlbe)) {

		u64 asid;

		gva_t eaddr;

		gpa_t gpaddr;

		u32 flags;

		u32 bytes;



		eaddr = get_tlb_eaddr(tlbe);
@@ -462,10 +464,7 @@ int kvmppc_44x_emul_tlbwe(struct kvm_vcpu *vcpu, u8 ra, u8 rs, u8 ws) 
		eaddr &= ~(bytes - 1);

		gpaddr &= ~(bytes - 1);



		asid = (tlbe->word0 & PPC44x_TLB_TS) | tlbe->tid;

		flags = tlbe->word2 & 0xffff;



		kvmppc_mmu_map(vcpu, eaddr, gpaddr, asid, flags, bytes, gtlb_index);

		kvmppc_mmu_map(vcpu, eaddr, gpaddr, gtlb_index);

	}



	KVMTRACE_5D(GTLB_WRITE, vcpu, gtlb_index, tlbe->tid, tlbe->word0,

arch/powerpc/kvm/booke.c

+2 −4
Original line number Diff line number Diff line
@@ -316,8 +316,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, 
			 * b) the guest used a large mapping which we're faking

			 * Either way, we need to satisfy the fault without

			 * invoking the guest. */

			kvmppc_mmu_map(vcpu, eaddr, gpaddr, gtlbe->tid,

			               gtlbe->word2, get_tlb_bytes(gtlbe), gtlb_index);

			kvmppc_mmu_map(vcpu, eaddr, gpaddr, gtlb_index);

			kvmppc_account_exit(vcpu, DTLB_VIRT_MISS_EXITS);

			r = RESUME_GUEST;

		} else {
@@ -364,8 +363,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, 
			 * b) the guest used a large mapping which we're faking

			 * Either way, we need to satisfy the fault without

			 * invoking the guest. */

			kvmppc_mmu_map(vcpu, eaddr, gpaddr, gtlbe->tid,

			               gtlbe->word2, get_tlb_bytes(gtlbe), gtlb_index);

			kvmppc_mmu_map(vcpu, eaddr, gpaddr, gtlb_index);

		} else {

			/* Guest mapped and leaped at non-RAM! */

			kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_MACHINE_CHECK);