Commit 14a3c4f4 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini

KVM: x86/mmu: Revert "Revert "KVM: MMU: add tracepoint for kvm_mmu_invalidate_all_pages""

Now that the fast invalidate mechanism has been reintroduced, restore
the tracepoint associated with said mechanism.

Note, the name of the tracepoint deviates from the original tracepoint
so as to match KVM's current nomenclature.

This reverts commit 42560fb1.
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent dd6223c7
...@@ -5743,6 +5743,7 @@ static void kvm_zap_obsolete_pages(struct kvm *kvm) ...@@ -5743,6 +5743,7 @@ static void kvm_zap_obsolete_pages(struct kvm *kvm)
static void kvm_mmu_zap_all_fast(struct kvm *kvm) static void kvm_mmu_zap_all_fast(struct kvm *kvm)
{ {
spin_lock(&kvm->mmu_lock); spin_lock(&kvm->mmu_lock);
trace_kvm_mmu_zap_all_fast(kvm);
kvm->arch.mmu_valid_gen++; kvm->arch.mmu_valid_gen++;
kvm_zap_obsolete_pages(kvm); kvm_zap_obsolete_pages(kvm);
......
...@@ -282,6 +282,27 @@ TRACE_EVENT( ...@@ -282,6 +282,27 @@ TRACE_EVENT(
) )
); );
TRACE_EVENT(
kvm_mmu_zap_all_fast,
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( TRACE_EVENT(
check_mmio_spte, check_mmio_spte,
TP_PROTO(u64 spte, unsigned int kvm_gen, unsigned int spte_gen), TP_PROTO(u64 spte, unsigned int kvm_gen, unsigned int spte_gen),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment