Commit b57de4ff authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Simplify kvm_cpu_has_pending_timer() 



kvm_cpu_has_pending_timer() ends up checking all the possible
timers for a wake-up cause. However, we already check for
pending interrupts whenever we try to wake-up a vcpu, including
the timer interrupts.

Obviously, doing the same work twice is once too many. Reduce
this helper to almost nothing, but keep it around, as we are
going to make use of it soon.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220419182755.601427-4-maz@kernel.org
parent 7d26b051

arch/arm64/kvm/arch_timer.c

+2 −8
Original line number Diff line number Diff line
@@ -350,15 +350,9 @@ static bool kvm_timer_should_fire(struct arch_timer_context *timer_ctx) 
	return cval <= now;

}



bool kvm_timer_is_pending(struct kvm_vcpu *vcpu)

int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)

{

	struct timer_map map;



	get_timer_map(vcpu, &map);



	return kvm_timer_should_fire(map.direct_vtimer) ||

	       kvm_timer_should_fire(map.direct_ptimer) ||

	       kvm_timer_should_fire(map.emul_ptimer);

	return 0;

}



/*

arch/arm64/kvm/arm.c

+0 −5
Original line number Diff line number Diff line
@@ -356,11 +356,6 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) 
	kvm_arm_vcpu_destroy(vcpu);

}



int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)

{

	return kvm_timer_is_pending(vcpu);

}



void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu)

{

include/kvm/arm_arch_timer.h

+0 −2
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ int kvm_arm_timer_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr); 
int kvm_arm_timer_get_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr);

int kvm_arm_timer_has_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr);



bool kvm_timer_is_pending(struct kvm_vcpu *vcpu);



u64 kvm_phys_timer_read(void);



void kvm_timer_vcpu_load(struct kvm_vcpu *vcpu);