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 35006126f024f68727c67001b9cb703c38f69268.

[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: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index cb9fd69d26326c7a3ab8036ffbf7c077fc49054e..df4025e6f1e17444421c3dd26441c86aa23174e7 100644 (file)
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -5916,7 +5916,6 @@ restart:
 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);

diff --git a/arch/x86/kvm/mmutrace.h b/arch/x86/kvm/mmutrace.h
index c73bf4e4988cb5c84065dd324b50b93cbe12c2e1..cac88910b3103bb4ea731c5681978929627ccc53 100644 (file)
--- a/arch/x86/kvm/mmutrace.h
+++ b/arch/x86/kvm/mmutrace.h
@@ -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),