KVM: MMU: change tracepoints arguments to kvm_page_fault

Pass struct kvm_page_fault to tracepoints instead of extracting the
arguments from the struct.  This also lets the kvm_mmu_spte_requested
tracepoint pick the gfn directly from fault->gfn, instead of using
the address.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 7491dc685842cfab08cacff7b3c33c42f7e8fc99..5ba0a844f5760f0744777c323eed1eb38a7ea42c 100644 (file)
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -2986,7 +2986,7 @@ static int __direct_map(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault)
 
        kvm_mmu_hugepage_adjust(vcpu, fault);
 
-       trace_kvm_mmu_spte_requested(fault->addr, fault->goal_level, fault->pfn);
+       trace_kvm_mmu_spte_requested(fault);
        for_each_shadow_entry(vcpu, fault->addr, it) {
                /*
                 * We cannot overwrite existing page tables with an NX
@@ -3276,7 +3276,7 @@ static int fast_page_fault(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault)
 
        } while (true);
 
-       trace_fast_page_fault(vcpu, fault->addr, fault->error_code, sptep, spte, ret);
+       trace_fast_page_fault(vcpu, fault, sptep, spte, ret);
        walk_shadow_page_lockless_end(vcpu);
 
        return ret;

diff --git a/arch/x86/kvm/mmu/mmutrace.h b/arch/x86/kvm/mmu/mmutrace.h
index 2924a4081a19a7dd2d9785b43041a32d05229369..b8151bbca36a91940528c0325d21a7c0abfff9a5 100644 (file)
--- a/arch/x86/kvm/mmu/mmutrace.h
+++ b/arch/x86/kvm/mmu/mmutrace.h
@@ -252,9 +252,9 @@ TRACE_EVENT(
 
 TRACE_EVENT(
        fast_page_fault,
-       TP_PROTO(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u32 error_code,
+       TP_PROTO(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault,
                 u64 *sptep, u64 old_spte, int ret),
-       TP_ARGS(vcpu, cr2_or_gpa, error_code, sptep, old_spte, ret),
+       TP_ARGS(vcpu, fault, sptep, old_spte, ret),
 
        TP_STRUCT__entry(
                __field(int, vcpu_id)
@@ -268,8 +268,8 @@ TRACE_EVENT(
 
        TP_fast_assign(
                __entry->vcpu_id = vcpu->vcpu_id;
-               __entry->cr2_or_gpa = cr2_or_gpa;
-               __entry->error_code = error_code;
+               __entry->cr2_or_gpa = fault->addr;
+               __entry->error_code = fault->error_code;
                __entry->sptep = sptep;
                __entry->old_spte = old_spte;
                __entry->new_spte = *sptep;
@@ -367,8 +367,8 @@ TRACE_EVENT(
 
 TRACE_EVENT(
        kvm_mmu_spte_requested,
-       TP_PROTO(gpa_t addr, int level, kvm_pfn_t pfn),
-       TP_ARGS(addr, level, pfn),
+       TP_PROTO(struct kvm_page_fault *fault),
+       TP_ARGS(fault),
 
        TP_STRUCT__entry(
                __field(u64, gfn)
@@ -377,9 +377,9 @@ TRACE_EVENT(
        ),
 
        TP_fast_assign(
-               __entry->gfn = addr >> PAGE_SHIFT;
-               __entry->pfn = pfn | (__entry->gfn & (KVM_PAGES_PER_HPAGE(level) - 1));
-               __entry->level = level;
+               __entry->gfn = fault->gfn;
+               __entry->pfn = fault->pfn | (fault->gfn & (KVM_PAGES_PER_HPAGE(fault->goal_level) - 1));
+               __entry->level = fault->goal_level;
        ),
 
        TP_printk("gfn %llx pfn %llx level %d",

diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h
index 4a263f4511a5d05450150456af76d25abd64fe6a..6bc0dbc0bafff0d2ec37fd450b7342d04605d306 100644 (file)
--- a/arch/x86/kvm/mmu/paging_tmpl.h
+++ b/arch/x86/kvm/mmu/paging_tmpl.h
@@ -730,7 +730,7 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault,
 
        kvm_mmu_hugepage_adjust(vcpu, fault);
 
-       trace_kvm_mmu_spte_requested(fault->addr, gw->level, fault->pfn);
+       trace_kvm_mmu_spte_requested(fault);
 
        for (; shadow_walk_okay(&it); shadow_walk_next(&it)) {
                clear_sp_write_flooding_count(it.sptep);

diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c
index 737af596adaf1d5442c662436e792119c4fdb77e..3bf85a8c7d15667c559d5d6c2a1b4bac3582414b 100644 (file)
--- a/arch/x86/kvm/mmu/tdp_mmu.c
+++ b/arch/x86/kvm/mmu/tdp_mmu.c
@@ -995,7 +995,7 @@ int kvm_tdp_mmu_map(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault)
 
        kvm_mmu_hugepage_adjust(vcpu, fault);
 
-       trace_kvm_mmu_spte_requested(fault->addr, fault->goal_level, fault->pfn);
+       trace_kvm_mmu_spte_requested(fault);
 
        rcu_read_lock();