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

Commit 42560fb1 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

Revert "KVM: MMU: add tracepoint for kvm_mmu_invalidate_all_pages" 

...as part of removing x86 KVM's fast invalidate mechanism, i.e. this
is one part of a revert all patches from the series that introduced the
mechanism[1].

This reverts commit 35006126.

[1] https://lkml.kernel.org/r/1369960590-14138-1-git-send-email-xiaoguangrong@linux.vnet.ibm.com



Cc: Xiao Guangrong <guangrong.xiao@gmail.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 43d2b14b

arch/x86/kvm/mmu.c

+0 −1
Original line number Diff line number Diff line
@@ -5916,7 +5916,6 @@ static void kvm_zap_obsolete_pages(struct kvm *kvm) 
void kvm_mmu_invalidate_zap_all_pages(struct kvm *kvm)

{

	spin_lock(&kvm->mmu_lock);

	trace_kvm_mmu_invalidate_zap_all_pages(kvm);

	kvm->arch.mmu_valid_gen++;



	kvm_zap_obsolete_pages(kvm);

arch/x86/kvm/mmutrace.h

+0 −21
Original line number Diff line number Diff line
@@ -282,27 +282,6 @@ TRACE_EVENT( 
	)

);



TRACE_EVENT(

	kvm_mmu_invalidate_zap_all_pages,

	TP_PROTO(struct kvm *kvm),

	TP_ARGS(kvm),



	TP_STRUCT__entry(

		__field(unsigned long, mmu_valid_gen)

		__field(unsigned int, mmu_used_pages)

	),



	TP_fast_assign(

		__entry->mmu_valid_gen = kvm->arch.mmu_valid_gen;

		__entry->mmu_used_pages = kvm->arch.n_used_mmu_pages;

	),



	TP_printk("kvm-mmu-valid-gen %lx used_pages %x",

		  __entry->mmu_valid_gen, __entry->mmu_used_pages

	)

);





TRACE_EVENT(

	check_mmio_spte,

	TP_PROTO(u64 spte, unsigned int kvm_gen, unsigned int spte_gen),