From: Marc Zyngier <marc.zyngier@arm.com> To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Cc: "Christoffer Dall" <christoffer.dall@linaro.org>, "Eric Auger" <eric.auger@linaro.org>, "Alex Bennée" <alex.bennee@linaro.org>, "Andre Przywara" <andre.przywara@arm.com> Subject: [PATCH 09/10] KVM: arm/arm64: timer: Allow the timer to control the active state Date: Mon, 8 Jun 2015 18:04:04 +0100 [thread overview] Message-ID: <1433783045-8002-10-git-send-email-marc.zyngier@arm.com> (raw) In-Reply-To: <1433783045-8002-1-git-send-email-marc.zyngier@arm.com> In order to remove the crude hack where we sneak the masked bit into the timer's control register, make use of the phys_irq_map API control the active state of the interrupt. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- include/kvm/arm_arch_timer.h | 3 +++ virt/kvm/arm/arch_timer.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h index e596675..9feebf1 100644 --- a/include/kvm/arm_arch_timer.h +++ b/include/kvm/arm_arch_timer.h @@ -52,6 +52,9 @@ struct arch_timer_cpu { /* Timer IRQ */ const struct kvm_irq_level *irq; + + /* VGIC mapping */ + struct irq_phys_map *map; }; int kvm_timer_hyp_init(void); diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 98c95f2..b9fff78 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -64,7 +64,7 @@ static void kvm_timer_inject_irq(struct kvm_vcpu *vcpu) int ret; struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; - timer->cntv_ctl |= ARCH_TIMER_CTRL_IT_MASK; + vgic_set_phys_irq_active(timer->map, true); ret = kvm_vgic_inject_irq(vcpu->kvm, vcpu->vcpu_id, timer->irq->irq, timer->irq->level); @@ -117,7 +117,8 @@ bool kvm_timer_should_fire(struct kvm_vcpu *vcpu) cycle_t cval, now; if ((timer->cntv_ctl & ARCH_TIMER_CTRL_IT_MASK) || - !(timer->cntv_ctl & ARCH_TIMER_CTRL_ENABLE)) + !(timer->cntv_ctl & ARCH_TIMER_CTRL_ENABLE) || + vgic_get_phys_irq_active(timer->map)) return false; cval = timer->cntv_cval; @@ -196,6 +197,13 @@ void kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, * vcpu timer irq number when the vcpu is reset. */ timer->irq = irq; + + /* + * Tell the VGIC that the virtual interrupt is tied to a + * physical interrupt. We do that once per VCPU. + */ + timer->map = vgic_map_phys_irq(vcpu, irq->irq, host_vtimer_irq); + WARN_ON(!timer->map); } void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) @@ -335,6 +343,7 @@ void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; timer_disarm(timer); + vgic_unmap_phys_irq(vcpu, timer->map); } void kvm_timer_enable(struct kvm *kvm) -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: marc.zyngier@arm.com (Marc Zyngier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 09/10] KVM: arm/arm64: timer: Allow the timer to control the active state Date: Mon, 8 Jun 2015 18:04:04 +0100 [thread overview] Message-ID: <1433783045-8002-10-git-send-email-marc.zyngier@arm.com> (raw) In-Reply-To: <1433783045-8002-1-git-send-email-marc.zyngier@arm.com> In order to remove the crude hack where we sneak the masked bit into the timer's control register, make use of the phys_irq_map API control the active state of the interrupt. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- include/kvm/arm_arch_timer.h | 3 +++ virt/kvm/arm/arch_timer.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h index e596675..9feebf1 100644 --- a/include/kvm/arm_arch_timer.h +++ b/include/kvm/arm_arch_timer.h @@ -52,6 +52,9 @@ struct arch_timer_cpu { /* Timer IRQ */ const struct kvm_irq_level *irq; + + /* VGIC mapping */ + struct irq_phys_map *map; }; int kvm_timer_hyp_init(void); diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 98c95f2..b9fff78 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -64,7 +64,7 @@ static void kvm_timer_inject_irq(struct kvm_vcpu *vcpu) int ret; struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; - timer->cntv_ctl |= ARCH_TIMER_CTRL_IT_MASK; + vgic_set_phys_irq_active(timer->map, true); ret = kvm_vgic_inject_irq(vcpu->kvm, vcpu->vcpu_id, timer->irq->irq, timer->irq->level); @@ -117,7 +117,8 @@ bool kvm_timer_should_fire(struct kvm_vcpu *vcpu) cycle_t cval, now; if ((timer->cntv_ctl & ARCH_TIMER_CTRL_IT_MASK) || - !(timer->cntv_ctl & ARCH_TIMER_CTRL_ENABLE)) + !(timer->cntv_ctl & ARCH_TIMER_CTRL_ENABLE) || + vgic_get_phys_irq_active(timer->map)) return false; cval = timer->cntv_cval; @@ -196,6 +197,13 @@ void kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, * vcpu timer irq number when the vcpu is reset. */ timer->irq = irq; + + /* + * Tell the VGIC that the virtual interrupt is tied to a + * physical interrupt. We do that once per VCPU. + */ + timer->map = vgic_map_phys_irq(vcpu, irq->irq, host_vtimer_irq); + WARN_ON(!timer->map); } void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) @@ -335,6 +343,7 @@ void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; timer_disarm(timer); + vgic_unmap_phys_irq(vcpu, timer->map); } void kvm_timer_enable(struct kvm *kvm) -- 2.1.4
next prev parent reply other threads:[~2015-06-08 17:04 UTC|newest] Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-06-08 17:03 [PATCH 00/10] arm/arm64: KVM: Active interrupt state switching for shared devices Marc Zyngier 2015-06-08 17:03 ` Marc Zyngier 2015-06-08 17:03 ` [PATCH 01/10] arm/arm64: KVM: Fix ordering of timer/GIC on guest entry Marc Zyngier 2015-06-08 17:03 ` Marc Zyngier 2015-06-09 11:29 ` Alex Bennée 2015-06-09 11:29 ` Alex Bennée 2015-06-30 20:19 ` Christoffer Dall 2015-06-30 20:19 ` Christoffer Dall 2015-06-08 17:03 ` [PATCH 02/10] arm/arm64: KVM: Move vgic handling to a non-preemptible section Marc Zyngier 2015-06-08 17:03 ` Marc Zyngier 2015-06-09 11:38 ` Alex Bennée 2015-06-09 11:38 ` Alex Bennée 2015-06-30 20:19 ` Christoffer Dall 2015-06-30 20:19 ` Christoffer Dall 2015-06-08 17:03 ` [PATCH 03/10] KVM: arm/arm64: vgic: Convert struct vgic_lr to use bitfields Marc Zyngier 2015-06-08 17:03 ` Marc Zyngier 2015-06-09 13:12 ` Alex Bennée 2015-06-09 13:12 ` Alex Bennée 2015-06-10 17:23 ` Andre Przywara 2015-06-10 17:23 ` Andre Przywara 2015-06-10 18:04 ` Marc Zyngier 2015-06-10 18:04 ` Marc Zyngier 2015-06-08 17:03 ` [PATCH 04/10] KVM: arm/arm64: vgic: Allow HW irq to be encoded in LR Marc Zyngier 2015-06-08 17:03 ` Marc Zyngier 2015-06-09 13:21 ` Alex Bennée 2015-06-09 13:21 ` Alex Bennée 2015-06-09 14:03 ` Marc Zyngier 2015-06-09 14:03 ` Marc Zyngier 2015-06-17 11:53 ` Eric Auger 2015-06-17 11:53 ` Eric Auger 2015-06-17 12:39 ` Marc Zyngier 2015-06-17 12:39 ` Marc Zyngier 2015-06-17 13:21 ` Peter Maydell 2015-06-17 13:21 ` Peter Maydell 2015-06-17 13:34 ` Marc Zyngier 2015-06-17 13:34 ` Marc Zyngier 2015-06-08 17:04 ` [PATCH 05/10] KVM: arm/arm64: vgic: Relax vgic_can_sample_irq for edge IRQs Marc Zyngier 2015-06-08 17:04 ` Marc Zyngier 2015-06-30 20:19 ` Christoffer Dall 2015-06-30 20:19 ` Christoffer Dall 2015-07-01 9:17 ` Marc Zyngier 2015-07-01 9:17 ` Marc Zyngier 2015-07-01 11:58 ` Christoffer Dall 2015-07-01 11:58 ` Christoffer Dall 2015-07-01 18:18 ` Marc Zyngier 2015-07-01 18:18 ` Marc Zyngier 2015-07-02 16:23 ` Christoffer Dall 2015-07-02 16:23 ` Christoffer Dall 2015-07-03 9:50 ` Marc Zyngier 2015-07-03 9:50 ` Marc Zyngier 2015-07-03 9:57 ` Peter Maydell 2015-07-03 9:57 ` Peter Maydell 2015-06-08 17:04 ` [PATCH 06/10] KVM: arm/arm64: vgic: Allow dynamic mapping of physical/virtual interrupts Marc Zyngier 2015-06-08 17:04 ` Marc Zyngier 2015-06-11 8:43 ` Andre Przywara 2015-06-11 8:43 ` Andre Przywara 2015-06-11 8:56 ` Marc Zyngier 2015-06-11 8:56 ` Marc Zyngier 2015-06-15 15:44 ` Eric Auger 2015-06-15 15:44 ` Eric Auger 2015-06-16 8:28 ` Marc Zyngier 2015-06-16 8:28 ` Marc Zyngier 2015-06-16 9:10 ` Eric Auger 2015-06-16 9:10 ` Eric Auger 2015-06-30 20:19 ` Christoffer Dall 2015-06-30 20:19 ` Christoffer Dall 2015-07-01 10:20 ` Marc Zyngier 2015-07-01 10:20 ` Marc Zyngier 2015-07-01 11:45 ` Christoffer Dall 2015-07-01 11:45 ` Christoffer Dall 2015-06-08 17:04 ` [PATCH 07/10] KVM: arm/arm64: vgic: Allow HW interrupts to be queued to a guest Marc Zyngier 2015-06-08 17:04 ` Marc Zyngier 2015-06-11 8:44 ` Andre Przywara 2015-06-11 8:44 ` Andre Przywara 2015-06-11 9:15 ` Marc Zyngier 2015-06-11 9:15 ` Marc Zyngier 2015-06-11 9:44 ` Andre Przywara 2015-06-11 9:44 ` Andre Przywara 2015-06-11 10:02 ` Marc Zyngier 2015-06-11 10:02 ` Marc Zyngier 2015-06-15 16:11 ` Eric Auger 2015-06-15 16:11 ` Eric Auger 2015-06-17 11:51 ` Eric Auger 2015-06-17 11:51 ` Eric Auger 2015-06-17 12:23 ` Marc Zyngier 2015-06-17 12:23 ` Marc Zyngier 2015-06-08 17:04 ` [PATCH 08/10] KVM: arm/arm64: vgic: Add vgic_{get,set}_phys_irq_active Marc Zyngier 2015-06-08 17:04 ` [PATCH 08/10] KVM: arm/arm64: vgic: Add vgic_{get, set}_phys_irq_active Marc Zyngier 2015-06-17 15:11 ` [PATCH 08/10] KVM: arm/arm64: vgic: Add vgic_{get,set}_phys_irq_active Eric Auger 2015-06-17 15:11 ` [PATCH 08/10] KVM: arm/arm64: vgic: Add vgic_{get, set}_phys_irq_active Eric Auger 2015-06-08 17:04 ` Marc Zyngier [this message] 2015-06-08 17:04 ` [PATCH 09/10] KVM: arm/arm64: timer: Allow the timer to control the active state Marc Zyngier 2015-06-08 17:04 ` [PATCH 10/10] KVM: arm/arm64: vgic: Allow non-shared device HW interrupts Marc Zyngier 2015-06-08 17:04 ` Marc Zyngier 2015-06-17 15:11 ` Eric Auger 2015-06-17 15:11 ` Eric Auger 2015-06-17 15:37 ` Marc Zyngier 2015-06-17 15:37 ` Marc Zyngier 2015-06-17 15:50 ` Eric Auger 2015-06-17 15:50 ` Eric Auger 2015-06-18 8:37 ` Marc Zyngier 2015-06-18 8:37 ` Marc Zyngier 2015-06-18 17:51 ` Eric Auger 2015-06-18 17:51 ` Eric Auger 2015-06-30 20:19 ` Christoffer Dall 2015-06-30 20:19 ` Christoffer Dall 2015-07-01 8:26 ` Marc Zyngier 2015-07-01 8:26 ` Marc Zyngier 2015-07-01 8:57 ` Christoffer Dall 2015-07-01 8:57 ` Christoffer Dall 2015-06-10 8:33 ` [PATCH 00/10] arm/arm64: KVM: Active interrupt state switching for shared devices Eric Auger 2015-06-10 8:33 ` Eric Auger 2015-06-10 9:03 ` Marc Zyngier 2015-06-10 9:03 ` Marc Zyngier 2015-06-10 11:13 ` Eric Auger 2015-06-10 11:13 ` Eric Auger 2015-06-18 6:51 ` Eric Auger 2015-06-18 6:51 ` Eric Auger
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=1433783045-8002-10-git-send-email-marc.zyngier@arm.com \ --to=marc.zyngier@arm.com \ --cc=alex.bennee@linaro.org \ --cc=andre.przywara@arm.com \ --cc=christoffer.dall@linaro.org \ --cc=eric.auger@linaro.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ /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.