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

Commit 31711f22 authored by Jerone Young's avatar Jerone Young Committed by Avi Kivity
Browse files

KVM: ppc: adds trace points for ppc tlb activity 



This patch adds trace points to track powerpc TLB activities using the
KVM_TRACE infrastructure.

Signed-off-by: default avatarJerone Young <jyoung5@us.ibm.com>
Signed-off-by: default avatarChristian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 12f67556

arch/powerpc/kvm/44x_tlb.c

+14 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <linux/types.h>

#include <linux/string.h>

#include <linux/kvm.h>

#include <linux/kvm_host.h>

#include <linux/highmem.h>

#include <asm/mmu-44x.h>
@@ -175,6 +176,10 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn, u64 asid, 
	stlbe->word1 = (hpaddr & 0xfffffc00) | ((hpaddr >> 32) & 0xf);

	stlbe->word2 = kvmppc_44x_tlb_shadow_attrib(flags,

	                                            vcpu->arch.msr & MSR_PR);



	KVMTRACE_5D(STLB_WRITE, vcpu, victim,

			stlbe->tid, stlbe->word0, stlbe->word1, stlbe->word2,

			handler);

}



void kvmppc_mmu_invalidate(struct kvm_vcpu *vcpu, gva_t eaddr,
@@ -204,6 +209,9 @@ void kvmppc_mmu_invalidate(struct kvm_vcpu *vcpu, gva_t eaddr, 


		kvmppc_44x_shadow_release(vcpu, i);

		stlbe->word0 = 0;

		KVMTRACE_5D(STLB_INVAL, vcpu, i,

				stlbe->tid, stlbe->word0, stlbe->word1,

				stlbe->word2, handler);

	}

	up_write(&current->mm->mmap_sem);

}
@@ -217,8 +225,13 @@ void kvmppc_mmu_priv_switch(struct kvm_vcpu *vcpu, int usermode) 
	/* XXX Replace loop with fancy data structures. */

	down_write(&current->mm->mmap_sem);

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

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



		kvmppc_44x_shadow_release(vcpu, i);

		vcpu->arch.shadow_tlb[i].word0 = 0;

		stlbe->word0 = 0;

		KVMTRACE_5D(STLB_INVAL, vcpu, i,

				stlbe->tid, stlbe->word0, stlbe->word1,

				stlbe->word2, handler);

	}

	up_write(&current->mm->mmap_sem);

}

arch/powerpc/kvm/emulate.c

+4 −0
Original line number Diff line number Diff line
@@ -170,6 +170,10 @@ static int kvmppc_emul_tlbwe(struct kvm_vcpu *vcpu, u32 inst) 
		kvmppc_mmu_map(vcpu, eaddr, raddr >> PAGE_SHIFT, asid, flags);

	}



	KVMTRACE_5D(GTLB_WRITE, vcpu, index,

			tlbe->tid, tlbe->word0, tlbe->word1, tlbe->word2,

			handler);



	return EMULATE_DONE;

}

include/linux/kvm.h

+3 −0
Original line number Diff line number Diff line
@@ -471,5 +471,8 @@ struct kvm_trace_rec { 
#define KVM_TRC_LMSW             (KVM_TRC_HANDLER + 0x13)

#define KVM_TRC_APIC_ACCESS      (KVM_TRC_HANDLER + 0x14)

#define KVM_TRC_TDP_FAULT        (KVM_TRC_HANDLER + 0x15)

#define KVM_TRC_GTLB_WRITE       (KVM_TRC_HANDLER + 0x16)

#define KVM_TRC_STLB_WRITE       (KVM_TRC_HANDLER + 0x17)

#define KVM_TRC_STLB_INVAL       (KVM_TRC_HANDLER + 0x18)



#endif