Commit f0066d94 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 536f0e6a

arch/x86/kvm/mmu/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

arch/x86/kvm/mmu/mmutrace.h

+9 −9
Original line number Diff line number Diff line
@@ -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",

arch/x86/kvm/mmu/paging_tmpl.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/x86/kvm/mmu/tdp_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -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();