Commit 7b517831 authored by Sean Christopherson's avatar Sean Christopherson Committed by Peter Zijlstra
Browse files

KVM: arm64: Convert to the generic perf callbacks 



Drop arm64's version of the callbacks in favor of the callbacks provided
by generic KVM, which are semantically identical.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20211111020738.2512932-15-seanjc@google.com
parent 33271a9e

arch/arm64/kvm/perf.c

+2 −32
Original line number Original line Diff line number Diff line
@@ -13,42 +13,12 @@ 




DEFINE_STATIC_KEY_FALSE(kvm_arm_pmu_available);

DEFINE_STATIC_KEY_FALSE(kvm_arm_pmu_available);





static unsigned int kvm_guest_state(void)

{

	struct kvm_vcpu *vcpu = kvm_get_running_vcpu();

	unsigned int state;



	if (!vcpu)

		return 0;



	state = PERF_GUEST_ACTIVE;

	if (!vcpu_mode_priv(vcpu))

		state |= PERF_GUEST_USER;



	return state;

}



static unsigned long kvm_get_guest_ip(void)

{

	struct kvm_vcpu *vcpu = kvm_get_running_vcpu();



	if (WARN_ON_ONCE(!vcpu))

		return 0;



	return *vcpu_pc(vcpu);

}



static struct perf_guest_info_callbacks kvm_guest_cbs = {

	.state		= kvm_guest_state,

	.get_ip		= kvm_get_guest_ip,

};



void kvm_perf_init(void)

void kvm_perf_init(void)

{

{

	perf_register_guest_info_callbacks(&kvm_guest_cbs);

	kvm_register_perf_callbacks(NULL);

}

}





void kvm_perf_teardown(void)

void kvm_perf_teardown(void)

{

{

	perf_unregister_guest_info_callbacks(&kvm_guest_cbs);

	kvm_unregister_perf_callbacks();

}
 
}