Commit 7e90c8e5 authored by Christoffer Dall's avatar Christoffer Dall Committed by Christoffer Dall
Browse files

KVM: arm/arm64: Get rid of kvm_timer_flush_hwstate 



Now when both the vtimer and the ptimer when using both the in-kernel
vgic emulation and a userspace IRQ chip are driven by the timer signals
and at the vcpu load/put boundaries, instead of recomputing the timer
state at every entry/exit to/from the guest, we can get entirely rid of
the flush hwstate function.

Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent bbdd52cf

include/kvm/arm_arch_timer.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,6 @@ int kvm_timer_hyp_init(void); 
int kvm_timer_enable(struct kvm_vcpu *vcpu);

int kvm_timer_enable(struct kvm_vcpu *vcpu);

int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu);

int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu);

void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu);

void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu);

void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu);

void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu);

void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu);

bool kvm_timer_should_notify_user(struct kvm_vcpu *vcpu);

bool kvm_timer_should_notify_user(struct kvm_vcpu *vcpu);

void kvm_timer_update_run(struct kvm_vcpu *vcpu);

void kvm_timer_update_run(struct kvm_vcpu *vcpu);

virt/kvm/arm/arch_timer.c

+0 −24
Original line number Original line Diff line number Diff line
@@ -305,12 +305,6 @@ static void kvm_timer_update_state(struct kvm_vcpu *vcpu) 
	struct arch_timer_context *vtimer = vcpu_vtimer(vcpu);

	struct arch_timer_context *vtimer = vcpu_vtimer(vcpu);

	struct arch_timer_context *ptimer = vcpu_ptimer(vcpu);

	struct arch_timer_context *ptimer = vcpu_ptimer(vcpu);





	/*

	 * If userspace modified the timer registers via SET_ONE_REG before

	 * the vgic was initialized, we mustn't set the vtimer->irq.level value

	 * because the guest would never see the interrupt.  Instead wait

	 * until we call this function from kvm_timer_flush_hwstate.

	 */

	if (unlikely(!timer->enabled))

	if (unlikely(!timer->enabled))

		return;

		return;
@@ -489,24 +483,6 @@ bool kvm_timer_should_notify_user(struct kvm_vcpu *vcpu) 
	       ptimer->irq.level != plevel;

	       ptimer->irq.level != plevel;

}

}





/**

 * kvm_timer_flush_hwstate - prepare timers before running the vcpu

 * @vcpu: The vcpu pointer

 *

 * Check if the virtual timer has expired while we were running in the host,

 * and inject an interrupt if that was the case, making sure the timer is

 * masked or disabled on the host so that we keep executing.  Also schedule a

 * software timer for the physical timer if it is enabled.

 */

void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu)

{

	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;

	struct arch_timer_context *ptimer = vcpu_ptimer(vcpu);



	if (unlikely(!timer->enabled))

		return;

}



void kvm_timer_vcpu_put(struct kvm_vcpu *vcpu)

void kvm_timer_vcpu_put(struct kvm_vcpu *vcpu)

{

{

	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;

	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;

virt/kvm/arm/arm.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -656,7 +656,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 




		local_irq_disable();

		local_irq_disable();





		kvm_timer_flush_hwstate(vcpu);

		kvm_vgic_flush_hwstate(vcpu);

		kvm_vgic_flush_hwstate(vcpu);





		/*

		/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE