Merge branch 'clockevents/3.13-fixes' of git://git.linaro.org/people/daniel.lezcano...

[~andy/linux] / arch / x86 / kvm / mmutrace.h

diff --git a/arch/x86/kvm/mmutrace.h b/arch/x86/kvm/mmutrace.h
index 697f46664990d823fd99533f9cda005cc0596d55..9d2e0ffcb190989b52b89b8d42be561d8165e911 100644 (file)
--- a/arch/x86/kvm/mmutrace.h
+++ b/arch/x86/kvm/mmutrace.h
@@ -199,23 +199,25 @@ DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_prepare_zap_page,
 
 TRACE_EVENT(
        mark_mmio_spte,
-       TP_PROTO(u64 *sptep, gfn_t gfn, unsigned access),
-       TP_ARGS(sptep, gfn, access),
+       TP_PROTO(u64 *sptep, gfn_t gfn, unsigned access, unsigned int gen),
+       TP_ARGS(sptep, gfn, access, gen),
 
        TP_STRUCT__entry(
                __field(void *, sptep)
                __field(gfn_t, gfn)
                __field(unsigned, access)
+               __field(unsigned int, gen)
        ),
 
        TP_fast_assign(
                __entry->sptep = sptep;
                __entry->gfn = gfn;
                __entry->access = access;
+               __entry->gen = gen;
        ),
 
-       TP_printk("sptep:%p gfn %llx access %x", __entry->sptep, __entry->gfn,
-                 __entry->access)
+       TP_printk("sptep:%p gfn %llx access %x gen %x", __entry->sptep,
+                 __entry->gfn, __entry->access, __entry->gen)
 );
 
 TRACE_EVENT(
@@ -276,6 +278,50 @@ TRACE_EVENT(
                  __spte_satisfied(old_spte), __spte_satisfied(new_spte)
        )
 );
+
+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),
+       TP_ARGS(spte, kvm_gen, spte_gen),
+
+       TP_STRUCT__entry(
+               __field(unsigned int, kvm_gen)
+               __field(unsigned int, spte_gen)
+               __field(u64, spte)
+       ),
+
+       TP_fast_assign(
+               __entry->kvm_gen = kvm_gen;
+               __entry->spte_gen = spte_gen;
+               __entry->spte = spte;
+       ),
+
+       TP_printk("spte %llx kvm_gen %x spte-gen %x valid %d", __entry->spte,
+                 __entry->kvm_gen, __entry->spte_gen,
+                 __entry->kvm_gen == __entry->spte_gen
+       )
+);
 #endif /* _TRACE_KVMMMU_H */
 
 #undef TRACE_INCLUDE_PATH