From: Christoffer Dall <christoffer.dall@linaro.org> To: "Paolo Bonzini" <pbonzini@redhat.com>, "Radim Krčmář" <rkrcmar@redhat.com> Cc: Marc Zyngier <marc.zyngier@arm.com>, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Subject: [PULL 18/27] KVM: arm/arm64: GICv4: Add doorbell interrupt handling Date: Mon, 13 Nov 2017 10:17:43 +0100 [thread overview] Message-ID: <20171113091752.10663-19-christoffer.dall@linaro.org> (raw) In-Reply-To: <20171113091752.10663-1-christoffer.dall@linaro.org> From: Marc Zyngier <marc.zyngier@arm.com> When a vPE is not running, a VLPI being made pending results in a doorbell interrupt being delivered. Let's handle this interrupt and update the pending_last flag that indicates that VLPIs are pending. The corresponding vcpu is also kicked into action. Special care is taken to prevent the doorbell from being enabled at request time (this is controlled separately), and to make the disabling on the interrupt non-lazy. Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org> Reviewed-by: Eric Auger <eric.auger@redhat.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> --- virt/kvm/arm/vgic/vgic-v4.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/virt/kvm/arm/vgic/vgic-v4.c b/virt/kvm/arm/vgic/vgic-v4.c index 2edfe23c8238..796e00c77903 100644 --- a/virt/kvm/arm/vgic/vgic-v4.c +++ b/virt/kvm/arm/vgic/vgic-v4.c @@ -16,12 +16,24 @@ */ #include <linux/interrupt.h> +#include <linux/irq.h> #include <linux/irqdomain.h> #include <linux/kvm_host.h> #include <linux/irqchip/arm-gic-v3.h> #include "vgic.h" +static irqreturn_t vgic_v4_doorbell_handler(int irq, void *info) +{ + struct kvm_vcpu *vcpu = info; + + vcpu->arch.vgic_cpu.vgic_v3.its_vpe.pending_last = true; + kvm_make_request(KVM_REQ_IRQ_PENDING, vcpu); + kvm_vcpu_kick(vcpu); + + return IRQ_HANDLED; +} + /** * vgic_v4_init - Initialize the GICv4 data structures * @kvm: Pointer to the VM being initialized @@ -61,6 +73,33 @@ int vgic_v4_init(struct kvm *kvm) return ret; } + kvm_for_each_vcpu(i, vcpu, kvm) { + int irq = dist->its_vm.vpes[i]->irq; + + /* + * Don't automatically enable the doorbell, as we're + * flipping it back and forth when the vcpu gets + * blocked. Also disable the lazy disabling, as the + * doorbell could kick us out of the guest too + * early... + */ + irq_set_status_flags(irq, IRQ_NOAUTOEN | IRQ_DISABLE_UNLAZY); + ret = request_irq(irq, vgic_v4_doorbell_handler, + 0, "vcpu", vcpu); + if (ret) { + kvm_err("failed to allocate vcpu IRQ%d\n", irq); + /* + * Trick: adjust the number of vpes so we know + * how many to nuke on teardown... + */ + dist->its_vm.nr_vpes = i; + break; + } + } + + if (ret) + vgic_v4_teardown(kvm); + return ret; } @@ -73,10 +112,19 @@ int vgic_v4_init(struct kvm *kvm) void vgic_v4_teardown(struct kvm *kvm) { struct its_vm *its_vm = &kvm->arch.vgic.its_vm; + int i; if (!its_vm->vpes) return; + for (i = 0; i < its_vm->nr_vpes; i++) { + struct kvm_vcpu *vcpu = kvm_get_vcpu(kvm, i); + int irq = its_vm->vpes[i]->irq; + + irq_clear_status_flags(irq, IRQ_NOAUTOEN | IRQ_DISABLE_UNLAZY); + free_irq(irq, vcpu); + } + its_free_vcpu_irqs(its_vm); kfree(its_vm->vpes); its_vm->nr_vpes = 0; -- 2.14.2
WARNING: multiple messages have this Message-ID (diff)
From: christoffer.dall@linaro.org (Christoffer Dall) To: linux-arm-kernel@lists.infradead.org Subject: [PULL 18/27] KVM: arm/arm64: GICv4: Add doorbell interrupt handling Date: Mon, 13 Nov 2017 10:17:43 +0100 [thread overview] Message-ID: <20171113091752.10663-19-christoffer.dall@linaro.org> (raw) In-Reply-To: <20171113091752.10663-1-christoffer.dall@linaro.org> From: Marc Zyngier <marc.zyngier@arm.com> When a vPE is not running, a VLPI being made pending results in a doorbell interrupt being delivered. Let's handle this interrupt and update the pending_last flag that indicates that VLPIs are pending. The corresponding vcpu is also kicked into action. Special care is taken to prevent the doorbell from being enabled at request time (this is controlled separately), and to make the disabling on the interrupt non-lazy. Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org> Reviewed-by: Eric Auger <eric.auger@redhat.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> --- virt/kvm/arm/vgic/vgic-v4.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/virt/kvm/arm/vgic/vgic-v4.c b/virt/kvm/arm/vgic/vgic-v4.c index 2edfe23c8238..796e00c77903 100644 --- a/virt/kvm/arm/vgic/vgic-v4.c +++ b/virt/kvm/arm/vgic/vgic-v4.c @@ -16,12 +16,24 @@ */ #include <linux/interrupt.h> +#include <linux/irq.h> #include <linux/irqdomain.h> #include <linux/kvm_host.h> #include <linux/irqchip/arm-gic-v3.h> #include "vgic.h" +static irqreturn_t vgic_v4_doorbell_handler(int irq, void *info) +{ + struct kvm_vcpu *vcpu = info; + + vcpu->arch.vgic_cpu.vgic_v3.its_vpe.pending_last = true; + kvm_make_request(KVM_REQ_IRQ_PENDING, vcpu); + kvm_vcpu_kick(vcpu); + + return IRQ_HANDLED; +} + /** * vgic_v4_init - Initialize the GICv4 data structures * @kvm: Pointer to the VM being initialized @@ -61,6 +73,33 @@ int vgic_v4_init(struct kvm *kvm) return ret; } + kvm_for_each_vcpu(i, vcpu, kvm) { + int irq = dist->its_vm.vpes[i]->irq; + + /* + * Don't automatically enable the doorbell, as we're + * flipping it back and forth when the vcpu gets + * blocked. Also disable the lazy disabling, as the + * doorbell could kick us out of the guest too + * early... + */ + irq_set_status_flags(irq, IRQ_NOAUTOEN | IRQ_DISABLE_UNLAZY); + ret = request_irq(irq, vgic_v4_doorbell_handler, + 0, "vcpu", vcpu); + if (ret) { + kvm_err("failed to allocate vcpu IRQ%d\n", irq); + /* + * Trick: adjust the number of vpes so we know + * how many to nuke on teardown... + */ + dist->its_vm.nr_vpes = i; + break; + } + } + + if (ret) + vgic_v4_teardown(kvm); + return ret; } @@ -73,10 +112,19 @@ int vgic_v4_init(struct kvm *kvm) void vgic_v4_teardown(struct kvm *kvm) { struct its_vm *its_vm = &kvm->arch.vgic.its_vm; + int i; if (!its_vm->vpes) return; + for (i = 0; i < its_vm->nr_vpes; i++) { + struct kvm_vcpu *vcpu = kvm_get_vcpu(kvm, i); + int irq = its_vm->vpes[i]->irq; + + irq_clear_status_flags(irq, IRQ_NOAUTOEN | IRQ_DISABLE_UNLAZY); + free_irq(irq, vcpu); + } + its_free_vcpu_irqs(its_vm); kfree(its_vm->vpes); its_vm->nr_vpes = 0; -- 2.14.2
next prev parent reply other threads:[~2017-11-13 9:17 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-11-13 9:17 [PULL 00/27] KVM/ARM GICv4 Support for v4.15 Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 01/27] KVM: arm/arm64: register irq bypass consumer on ARM/ARM64 Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 02/27] KVM: arm/arm64: vgic: restructure kvm_vgic_(un)map_phys_irq Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 03/27] KVM: arm: Select ARM_GIC_V3 and ARM_GIC_V3_ITS Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 04/27] KVM: arm/arm64: vgic: Move kvm_vgic_destroy call around Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 05/27] KVM: arm/arm64: vITS: Add MSI translation helpers Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 06/27] KVM: arm/arm64: vITS: Add a helper to update the affinity of an LPI Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 07/27] KVM: arm/arm64: GICv4: Add property field and per-VM predicate Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 08/27] KVM: arm/arm64: GICv4: Add init/teardown of the per-VM vPE irq domain Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 09/27] KVM: arm/arm64: GICv4: Wire mapping/unmapping of VLPIs in VFIO irq bypass Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 10/27] KVM: arm/arm64: GICv4: Handle INT command applied to a VLPI Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 11/27] KVM: arm/arm64: GICv4: Unmap VLPI when freeing an LPI Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 12/27] KVM: arm/arm64: GICv4: Propagate affinity changes to the physical ITS Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 13/27] KVM: arm/arm64: GICv4: Handle CLEAR applied to a VLPI Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 14/27] KVM: arm/arm64: GICv4: Handle MOVALL applied to a vPE Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 15/27] KVM: arm/arm64: GICv4: Propagate property updates to VLPIs Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 16/27] KVM: arm/arm64: GICv4: Handle INVALL applied to a vPE Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 17/27] KVM: arm/arm64: GICv4: Use pending_last as a scheduling hint Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall [this message] 2017-11-13 9:17 ` [PULL 18/27] KVM: arm/arm64: GICv4: Add doorbell interrupt handling Christoffer Dall 2017-11-13 9:17 ` [PULL 19/27] KVM: arm/arm64: GICv4: Use the doorbell interrupt as an unblocking source Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 20/27] KVM: arm/arm64: GICv4: Hook vPE scheduling into vgic flush/sync Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 21/27] KVM: arm/arm64: GICv4: Enable virtual cpuif if VLPIs can be delivered Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 22/27] KVM: arm/arm64: GICv4: Prevent a VM using GICv4 from being saved Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 23/27] KVM: arm/arm64: GICv4: Prevent userspace from changing doorbell affinity Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 24/27] KVM: arm/arm64: GICv4: Enable VLPI support Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 25/27] KVM: arm/arm64: GICv4: Theory of operations Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 26/27] KVM: arm/arm64: Fix GICv4 ITS initialization issues Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-13 9:17 ` [PULL 27/27] KVM: arm/arm64: Don't queue VLPIs on INV/INVALL Christoffer Dall 2017-11-13 9:17 ` Christoffer Dall 2017-11-17 12:23 ` [PULL 00/27] KVM/ARM GICv4 Support for v4.15 Paolo Bonzini 2017-11-17 12:23 ` Paolo Bonzini
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=20171113091752.10663-19-christoffer.dall@linaro.org \ --to=christoffer.dall@linaro.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=pbonzini@redhat.com \ --cc=rkrcmar@redhat.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.