From: Christoffer Dall <cdall@linaro.org> To: Marc Zyngier <marc.zyngier@arm.com> Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, Will Deacon <will.deacon@arm.com>, Catalin Marinas <catalin.marinas@arm.com> Subject: Re: [PATCH v3 09/20] KVM: arm/arm64: Use separate timer for phys timer emulation Date: Thu, 19 Oct 2017 09:38:09 +0200 [thread overview] Message-ID: <20171019073809.GM8900@cbox> (raw) In-Reply-To: <fd6c92dc-630f-62e6-5a47-f4f2b7638dad@arm.com> On Mon, Oct 09, 2017 at 06:23:45PM +0100, Marc Zyngier wrote: > On 23/09/17 01:41, Christoffer Dall wrote: > > We were using the same hrtimer for emulating the physical timer and for > > making sure a blocking VCPU thread would be eventually woken up. That > > worked fine in the previous arch timer design, but as we are about to > > actually use the soft timer expire function for the physical timer > > emulation, change the logic to use a dedicated hrtimer. > > > > This has the added benefit of not having to cancel any work in the sync > > path, which in turn allows us to run the flush and sync with IRQs > > disabled. > > > > Signed-off-by: Christoffer Dall <cdall@linaro.org> > > --- > > include/kvm/arm_arch_timer.h | 3 +++ > > virt/kvm/arm/arch_timer.c | 18 ++++++++++++++---- > > 2 files changed, 17 insertions(+), 4 deletions(-) > > > > diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h > > index dcbb2e1..16887c0 100644 > > --- a/include/kvm/arm_arch_timer.h > > +++ b/include/kvm/arm_arch_timer.h > > @@ -47,6 +47,9 @@ struct arch_timer_cpu { > > /* Work queued with the above timer expires */ > > struct work_struct expired; > > > > + /* Physical timer emulation */ > > + struct hrtimer phys_timer; > > + > > /* Background timer active */ > > bool armed; > > > > diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c > > index c2e8326..7f87099 100644 > > --- a/virt/kvm/arm/arch_timer.c > > +++ b/virt/kvm/arm/arch_timer.c > > @@ -178,6 +178,12 @@ static enum hrtimer_restart kvm_bg_timer_expire(struct hrtimer *hrt) > > return HRTIMER_NORESTART; > > } > > > > +static enum hrtimer_restart kvm_phys_timer_expire(struct hrtimer *hrt) > > +{ > > + WARN(1, "Timer only used to ensure guest exit - unexpected event."); > > + return HRTIMER_NORESTART; > > +} > > + > > So what prevents this handler from actually firing? Is it that we cancel > the hrtimer while interrupts are still disabled, hence the timer never > fires? If that's the intention, then this patch is slightly out of > place, as we haven't moved the timer sync within the irq_disable() section. > > Or am I missing something obvious? > No you're not missing anything, indeed, that is broken. I think I had in the back of my mind that we disable stuff in the world-switch still, but that obviously doesn't apply to the soft timers. I'll just move this patch following the next one where interrupts are disabled. Nice catch! > > bool kvm_timer_should_fire(struct arch_timer_context *timer_ctx) > > { > > u64 cval, now; > > @@ -255,7 +261,7 @@ static void kvm_timer_update_state(struct kvm_vcpu *vcpu) > > } > > > > /* Schedule the background timer for the emulated timer. */ > > -static void kvm_timer_emulate(struct kvm_vcpu *vcpu, > > +static void phys_timer_emulate(struct kvm_vcpu *vcpu, > > struct arch_timer_context *timer_ctx) > > { > > struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; > > @@ -267,7 +273,7 @@ static void kvm_timer_emulate(struct kvm_vcpu *vcpu, > > return; > > > > /* The timer has not yet expired, schedule a background timer */ > > - soft_timer_start(&timer->bg_timer, kvm_timer_compute_delta(timer_ctx)); > > + soft_timer_start(&timer->phys_timer, kvm_timer_compute_delta(timer_ctx)); > > } > > > > /* > > @@ -424,7 +430,7 @@ void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu) > > kvm_timer_update_state(vcpu); > > > > /* Set the background timer for the physical timer emulation. */ > > - kvm_timer_emulate(vcpu, vcpu_ptimer(vcpu)); > > + phys_timer_emulate(vcpu, vcpu_ptimer(vcpu)); > > > > if (unlikely(!irqchip_in_kernel(vcpu->kvm))) > > kvm_timer_flush_hwstate_user(vcpu); > > @@ -447,7 +453,7 @@ void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) > > * This is to cancel the background timer for the physical timer > > * emulation if it is set. > > */ > > - soft_timer_cancel(&timer->bg_timer, &timer->expired); > > + soft_timer_cancel(&timer->phys_timer, NULL); > > Right, that now explains the "work" test in one of the previous patches. > Yes, I've moved the addition of the test to this patch which actually uses is. > > > > /* > > * The guest could have modified the timer registers or the timer > > @@ -507,6 +513,9 @@ void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) > > hrtimer_init(&timer->bg_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); > > timer->bg_timer.function = kvm_bg_timer_expire; > > > > + hrtimer_init(&timer->phys_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); > > + timer->phys_timer.function = kvm_phys_timer_expire; > > + > > vtimer->irq.irq = default_vtimer_irq.irq; > > ptimer->irq.irq = default_ptimer_irq.irq; > > } > > @@ -615,6 +624,7 @@ void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) > > struct arch_timer_context *vtimer = vcpu_vtimer(vcpu); > > > > soft_timer_cancel(&timer->bg_timer, &timer->expired); > > + soft_timer_cancel(&timer->phys_timer, NULL); > > kvm_vgic_unmap_phys_irq(vcpu, vtimer->irq.irq); > > } > > > > > Thanks, -Christoffer
WARNING: multiple messages have this Message-ID (diff)
From: cdall@linaro.org (Christoffer Dall) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 09/20] KVM: arm/arm64: Use separate timer for phys timer emulation Date: Thu, 19 Oct 2017 09:38:09 +0200 [thread overview] Message-ID: <20171019073809.GM8900@cbox> (raw) In-Reply-To: <fd6c92dc-630f-62e6-5a47-f4f2b7638dad@arm.com> On Mon, Oct 09, 2017 at 06:23:45PM +0100, Marc Zyngier wrote: > On 23/09/17 01:41, Christoffer Dall wrote: > > We were using the same hrtimer for emulating the physical timer and for > > making sure a blocking VCPU thread would be eventually woken up. That > > worked fine in the previous arch timer design, but as we are about to > > actually use the soft timer expire function for the physical timer > > emulation, change the logic to use a dedicated hrtimer. > > > > This has the added benefit of not having to cancel any work in the sync > > path, which in turn allows us to run the flush and sync with IRQs > > disabled. > > > > Signed-off-by: Christoffer Dall <cdall@linaro.org> > > --- > > include/kvm/arm_arch_timer.h | 3 +++ > > virt/kvm/arm/arch_timer.c | 18 ++++++++++++++---- > > 2 files changed, 17 insertions(+), 4 deletions(-) > > > > diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h > > index dcbb2e1..16887c0 100644 > > --- a/include/kvm/arm_arch_timer.h > > +++ b/include/kvm/arm_arch_timer.h > > @@ -47,6 +47,9 @@ struct arch_timer_cpu { > > /* Work queued with the above timer expires */ > > struct work_struct expired; > > > > + /* Physical timer emulation */ > > + struct hrtimer phys_timer; > > + > > /* Background timer active */ > > bool armed; > > > > diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c > > index c2e8326..7f87099 100644 > > --- a/virt/kvm/arm/arch_timer.c > > +++ b/virt/kvm/arm/arch_timer.c > > @@ -178,6 +178,12 @@ static enum hrtimer_restart kvm_bg_timer_expire(struct hrtimer *hrt) > > return HRTIMER_NORESTART; > > } > > > > +static enum hrtimer_restart kvm_phys_timer_expire(struct hrtimer *hrt) > > +{ > > + WARN(1, "Timer only used to ensure guest exit - unexpected event."); > > + return HRTIMER_NORESTART; > > +} > > + > > So what prevents this handler from actually firing? Is it that we cancel > the hrtimer while interrupts are still disabled, hence the timer never > fires? If that's the intention, then this patch is slightly out of > place, as we haven't moved the timer sync within the irq_disable() section. > > Or am I missing something obvious? > No you're not missing anything, indeed, that is broken. I think I had in the back of my mind that we disable stuff in the world-switch still, but that obviously doesn't apply to the soft timers. I'll just move this patch following the next one where interrupts are disabled. Nice catch! > > bool kvm_timer_should_fire(struct arch_timer_context *timer_ctx) > > { > > u64 cval, now; > > @@ -255,7 +261,7 @@ static void kvm_timer_update_state(struct kvm_vcpu *vcpu) > > } > > > > /* Schedule the background timer for the emulated timer. */ > > -static void kvm_timer_emulate(struct kvm_vcpu *vcpu, > > +static void phys_timer_emulate(struct kvm_vcpu *vcpu, > > struct arch_timer_context *timer_ctx) > > { > > struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; > > @@ -267,7 +273,7 @@ static void kvm_timer_emulate(struct kvm_vcpu *vcpu, > > return; > > > > /* The timer has not yet expired, schedule a background timer */ > > - soft_timer_start(&timer->bg_timer, kvm_timer_compute_delta(timer_ctx)); > > + soft_timer_start(&timer->phys_timer, kvm_timer_compute_delta(timer_ctx)); > > } > > > > /* > > @@ -424,7 +430,7 @@ void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu) > > kvm_timer_update_state(vcpu); > > > > /* Set the background timer for the physical timer emulation. */ > > - kvm_timer_emulate(vcpu, vcpu_ptimer(vcpu)); > > + phys_timer_emulate(vcpu, vcpu_ptimer(vcpu)); > > > > if (unlikely(!irqchip_in_kernel(vcpu->kvm))) > > kvm_timer_flush_hwstate_user(vcpu); > > @@ -447,7 +453,7 @@ void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) > > * This is to cancel the background timer for the physical timer > > * emulation if it is set. > > */ > > - soft_timer_cancel(&timer->bg_timer, &timer->expired); > > + soft_timer_cancel(&timer->phys_timer, NULL); > > Right, that now explains the "work" test in one of the previous patches. > Yes, I've moved the addition of the test to this patch which actually uses is. > > > > /* > > * The guest could have modified the timer registers or the timer > > @@ -507,6 +513,9 @@ void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) > > hrtimer_init(&timer->bg_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); > > timer->bg_timer.function = kvm_bg_timer_expire; > > > > + hrtimer_init(&timer->phys_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); > > + timer->phys_timer.function = kvm_phys_timer_expire; > > + > > vtimer->irq.irq = default_vtimer_irq.irq; > > ptimer->irq.irq = default_ptimer_irq.irq; > > } > > @@ -615,6 +624,7 @@ void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) > > struct arch_timer_context *vtimer = vcpu_vtimer(vcpu); > > > > soft_timer_cancel(&timer->bg_timer, &timer->expired); > > + soft_timer_cancel(&timer->phys_timer, NULL); > > kvm_vgic_unmap_phys_irq(vcpu, vtimer->irq.irq); > > } > > > > > Thanks, -Christoffer
next prev parent reply other threads:[~2017-10-19 7:38 UTC|newest] Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-09-23 0:41 [PATCH v3 00/20] KVM: arm/arm64: Optimize arch timer register handling Christoffer Dall 2017-09-23 0:41 ` Christoffer Dall 2017-09-23 0:41 ` [PATCH v3 01/20] irqchip/gic: Deal with broken firmware exposing only 4kB of GICv2 CPU interface Christoffer Dall 2017-09-23 0:41 ` Christoffer Dall 2017-09-23 0:41 ` [PATCH v3 02/20] arm64: Use physical counter for in-kernel reads Christoffer Dall 2017-09-23 0:41 ` Christoffer Dall 2017-10-09 16:10 ` Marc Zyngier 2017-10-09 16:10 ` Marc Zyngier 2017-10-17 15:33 ` Will Deacon 2017-10-17 15:33 ` Will Deacon 2017-10-18 10:00 ` Christoffer Dall 2017-10-18 10:00 ` Christoffer Dall 2017-09-23 0:41 ` [PATCH v3 03/20] arm64: Use the physical counter when available for read_cycles Christoffer Dall 2017-09-23 0:41 ` Christoffer Dall 2017-10-09 16:21 ` Marc Zyngier 2017-10-09 16:21 ` Marc Zyngier 2017-10-18 11:34 ` Christoffer Dall 2017-10-18 11:34 ` Christoffer Dall 2017-10-18 15:52 ` Marc Zyngier 2017-10-18 15:52 ` Marc Zyngier 2017-09-23 0:41 ` [PATCH v3 04/20] KVM: arm/arm64: Guard kvm_vgic_map_is_active against !vgic_initialized Christoffer Dall 2017-09-23 0:41 ` Christoffer Dall 2017-10-09 16:22 ` Marc Zyngier 2017-10-09 16:22 ` Marc Zyngier 2017-09-23 0:41 ` [PATCH v3 05/20] KVM: arm/arm64: Support calling vgic_update_irq_pending from irq context Christoffer Dall 2017-09-23 0:41 ` Christoffer Dall 2017-10-09 16:37 ` Marc Zyngier 2017-10-09 16:37 ` Marc Zyngier 2017-10-18 11:54 ` Christoffer Dall 2017-10-18 11:54 ` Christoffer Dall 2017-09-23 0:41 ` [PATCH v3 06/20] KVM: arm/arm64: Check that system supports split eoi/deactivate Christoffer Dall 2017-09-23 0:41 ` Christoffer Dall 2017-10-09 16:47 ` Marc Zyngier 2017-10-09 16:47 ` Marc Zyngier 2017-10-18 13:41 ` Christoffer Dall 2017-10-18 13:41 ` Christoffer Dall 2017-10-18 16:03 ` Marc Zyngier 2017-10-18 16:03 ` Marc Zyngier 2017-10-18 19:16 ` Christoffer Dall 2017-10-18 19:16 ` Christoffer Dall 2017-09-23 0:41 ` [PATCH v3 07/20] KVM: arm/arm64: Make timer_arm and timer_disarm helpers more generic Christoffer Dall 2017-09-23 0:41 ` Christoffer Dall 2017-10-09 17:05 ` Marc Zyngier 2017-10-09 17:05 ` Marc Zyngier 2017-10-18 16:47 ` Christoffer Dall 2017-10-18 16:47 ` Christoffer Dall 2017-10-18 16:53 ` Marc Zyngier 2017-10-18 16:53 ` Marc Zyngier 2017-09-23 0:41 ` [PATCH v3 08/20] KVM: arm/arm64: Rename soft timer to bg_timer Christoffer Dall 2017-09-23 0:41 ` Christoffer Dall 2017-10-09 17:06 ` Marc Zyngier 2017-10-09 17:06 ` Marc Zyngier 2017-09-23 0:41 ` [PATCH v3 09/20] KVM: arm/arm64: Use separate timer for phys timer emulation Christoffer Dall 2017-09-23 0:41 ` Christoffer Dall 2017-10-09 17:23 ` Marc Zyngier 2017-10-09 17:23 ` Marc Zyngier 2017-10-19 7:38 ` Christoffer Dall [this message] 2017-10-19 7:38 ` Christoffer Dall 2017-09-23 0:41 ` [PATCH v3 10/20] KVM: arm/arm64: Move timer/vgic flush/sync under disabled irq Christoffer Dall 2017-09-23 0:41 ` Christoffer Dall 2017-10-09 17:34 ` Marc Zyngier 2017-10-09 17:34 ` Marc Zyngier 2017-09-23 0:41 ` [PATCH v3 11/20] KVM: arm/arm64: Move timer save/restore out of the hyp code Christoffer Dall 2017-09-23 0:41 ` Christoffer Dall 2017-10-09 17:47 ` Marc Zyngier 2017-10-09 17:47 ` Marc Zyngier 2017-10-19 7:46 ` Christoffer Dall 2017-10-19 7:46 ` Christoffer Dall 2017-09-23 0:41 ` [PATCH v3 12/20] genirq: Document vcpu_info usage for percpu_devid interrupts Christoffer Dall 2017-09-23 0:41 ` Christoffer Dall 2017-10-09 17:48 ` Marc Zyngier 2017-10-09 17:48 ` Marc Zyngier 2017-09-23 0:42 ` [PATCH v3 13/20] KVM: arm/arm64: Set VCPU affinity for virt timer irq Christoffer Dall 2017-09-23 0:42 ` Christoffer Dall 2017-10-09 17:52 ` Marc Zyngier 2017-10-09 17:52 ` Marc Zyngier 2017-09-23 0:42 ` [PATCH v3 14/20] KVM: arm/arm64: Avoid timer save/restore in vcpu entry/exit Christoffer Dall 2017-09-23 0:42 ` Christoffer Dall 2017-10-10 8:47 ` Marc Zyngier 2017-10-10 8:47 ` Marc Zyngier 2017-10-19 8:15 ` Christoffer Dall 2017-10-19 8:15 ` Christoffer Dall 2017-09-23 0:42 ` [PATCH v3 15/20] KVM: arm/arm64: Support EL1 phys timer register access in set/get reg Christoffer Dall 2017-09-23 0:42 ` Christoffer Dall 2017-10-10 9:10 ` Marc Zyngier 2017-10-10 9:10 ` Marc Zyngier 2017-10-19 8:32 ` Christoffer Dall 2017-10-19 8:32 ` Christoffer Dall 2017-09-23 0:42 ` [PATCH v3 16/20] KVM: arm/arm64: Use kvm_arm_timer_set/get_reg for guest register traps Christoffer Dall 2017-09-23 0:42 ` Christoffer Dall 2017-10-10 9:12 ` Marc Zyngier 2017-10-10 9:12 ` Marc Zyngier 2017-09-23 0:42 ` [PATCH v3 17/20] KVM: arm/arm64: Move phys_timer_emulate function Christoffer Dall 2017-09-23 0:42 ` Christoffer Dall 2017-10-10 9:21 ` Marc Zyngier 2017-10-10 9:21 ` Marc Zyngier 2017-09-23 0:42 ` [PATCH v3 18/20] KVM: arm/arm64: Avoid phys timer emulation in vcpu entry/exit Christoffer Dall 2017-09-23 0:42 ` Christoffer Dall 2017-10-10 9:45 ` Marc Zyngier 2017-10-10 9:45 ` Marc Zyngier 2017-10-19 8:44 ` Christoffer Dall 2017-10-19 8:44 ` Christoffer Dall 2017-09-23 0:42 ` [PATCH v3 19/20] KVM: arm/arm64: Get rid of kvm_timer_flush_hwstate Christoffer Dall 2017-09-23 0:42 ` Christoffer Dall 2017-10-10 9:46 ` Marc Zyngier 2017-10-10 9:46 ` Marc Zyngier 2017-09-23 0:42 ` [PATCH v3 20/20] KVM: arm/arm64: Rework kvm_timer_should_fire Christoffer Dall 2017-09-23 0:42 ` Christoffer Dall 2017-10-10 9:59 ` Marc Zyngier 2017-10-10 9:59 ` Marc Zyngier
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20171019073809.GM8900@cbox \ --to=cdall@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.