On Thu, Jul 5, 2012 at 12:18 PM, Marc Zyngier <marc.zyngier@xxxxxxx> wrote: > Do the necessary save/restore dance for the timers in the world > switch code. In the process, allow the guest to read the physical > counter, which is useful for its own clock_event_device. > > Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx> > --- > arch/arm/kernel/asm-offsets.c | 8 ++++++++ > arch/arm/kvm/arm.c | 2 ++ > arch/arm/kvm/interrupts.S | 43 +++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 53 insertions(+) > > diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c > index af1b62fc..d79a431 100644 > --- a/arch/arm/kernel/asm-offsets.c > +++ b/arch/arm/kernel/asm-offsets.c > @@ -194,6 +194,14 @@ int main(void) > DEFINE(VCPU_VGIC_APR, offsetof(struct kvm_vcpu, arch.vgic_cpu.vgic_apr)); > DEFINE(VCPU_VGIC_LR, offsetof(struct kvm_vcpu, arch.vgic_cpu.vgic_lr)); > DEFINE(VCPU_VGIC_NR_LR, offsetof(struct kvm_vcpu, arch.vgic_cpu.nr_lr)); > +#ifdef CONFIG_KVM_ARM_TIMER > + DEFINE(VCPU_TIMER_CNTV_CTL, offsetof(struct kvm_vcpu, arch.timer_cpu.cntv_ctl)); > + DEFINE(VCPU_TIMER_CNTV_CVALH, offsetof(struct kvm_vcpu, arch.timer_cpu.cntv_cval_high)); > + DEFINE(VCPU_TIMER_CNTV_CVALL, offsetof(struct kvm_vcpu, arch.timer_cpu.cntv_cval_low)); > + DEFINE(KVM_TIMER_CNTVOFF_H, offsetof(struct kvm, arch.timer.cntvoff32.cntvoff_high)); > + DEFINE(KVM_TIMER_CNTVOFF_L, offsetof(struct kvm, arch.timer.cntvoff32.cntvoff_low)); > + DEFINE(KVM_TIMER_ENABLED, offsetof(struct kvm, arch.timer.enabled)); > +#endif > DEFINE(KVM_VGIC_VCTRL, offsetof(struct kvm, arch.vgic.vctrl_base)); > #endif > DEFINE(KVM_VTTBR, offsetof(struct kvm, arch.vttbr)); > diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c > index 1e94ec1..41cc5ed 100644 > --- a/arch/arm/kvm/arm.c > +++ b/arch/arm/kvm/arm.c > @@ -590,6 +590,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) > update_vttbr(vcpu->kvm); > > kvm_vgic_sync_to_cpu(vcpu); > + kvm_timer_sync_to_cpu(vcpu); > > /* > * Make sure preemption is disabled while calling handle_exit > @@ -640,6 +641,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) > exit_reason = ret; /* 0 == KVM_EXIT_UNKNOWN */ > } > > + kvm_timer_sync_from_cpu(vcpu); > kvm_vgic_sync_from_cpu(vcpu); > } > > diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S > index 1b03b79..6e1e12d 100644 > --- a/arch/arm/kvm/interrupts.S > +++ b/arch/arm/kvm/interrupts.S > @@ -343,10 +343,33 @@ ENDPROC(__kvm_flush_vm_context) > #endif > .endm > > +#ifdef CONFIG_KVM_ARM_TIMER > +#define PL1P_ENABLE 3 > +#define PL1P_DISABLE 2 > +#else > #define PL1P_ENABLE 3 > #define PL1P_DISABLE 3 > +#endif > > .macro save_timer_state vcpup > +#ifdef CONFIG_KVM_ARM_TIMER > + ldr r4, [\vcpup, #VCPU_KVM] > + ldr r2, [r4, #KVM_TIMER_ENABLED] > + cmp r2, #0 > + beq 1f > + > + mrc p15, 0, r2, c14, c3, 1 @ CNTV_CTL > + and r2, #3 > + str r2, [\vcpup, #VCPU_TIMER_CNTV_CTL] > + bic r2, #1 @ Clear ENABLE > + mcr p15, 0, r2, c14, c3, 1 @ CNTV_CTL > + > + mrrc p15, 3, r2, r3, c14 @ CNTV_CVAL > + str r3, [\vcpup, #VCPU_TIMER_CNTV_CVALH] > + str r2, [\vcpup, #VCPU_TIMER_CNTV_CVALL] > + > +1: > +#endif > @ Allow physical timer access for the host > mrc p15, 4, r2, c14, c1, 0 @ CNTHCTL > orr r2, r2, #PL1P_ENABLE > @@ -359,6 +382,26 @@ ENDPROC(__kvm_flush_vm_context) > bic r2, r2, #PL1P_DISABLE > mcr p15, 4, r2, c14, c1, 0 @ CNTHCTL > > +#ifdef CONFIG_KVM_ARM_TIMER > + ldr r4, [\vcpup, #VCPU_KVM] > + ldr r2, [r4, #KVM_TIMER_ENABLED] > + cmp r2, #0 > + beq 1f > + > + ldr r3, [\vcpup, #VCPU_TIMER_CNTV_CVALH] > + ldr r2, [\vcpup, #VCPU_TIMER_CNTV_CVALL] > + mcrr p15, 3, r2, r3, c14 @ CNTV_CVAL > + > + ldr r3, [r4, #KVM_TIMER_CNTVOFF_H] > + ldr r2, [r4, #KVM_TIMER_CNTVOFF_L] > + mcrr p15, 4, r2, r3, c14 @ CNTVOFF > + isb > + > + ldr r2, [\vcpup, #VCPU_TIMER_CNTV_CTL] > + and r2, #3 > + mcr p15, 0, r2, c14, c3, 1 @ CNTV_CTL > +1: > +#endif > isb > .endm > > -- > 1.7.10.3 > > looks good to me _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm
