From: Marc Zyngier <marc.zyngier@arm.com> To: Peter Maydell <peter.maydell@linaro.org>, Eric Auger <eric.auger@linaro.org> Cc: kvm-devel <kvm@vger.kernel.org>, "kvmarm@lists.cs.columbia.edu" <kvmarm@lists.cs.columbia.edu>, arm-mail-list <linux-arm-kernel@lists.infradead.org>, Andre Przywara <Andre.Przywara@arm.com> Subject: Re: [PATCH 04/10] KVM: arm/arm64: vgic: Allow HW irq to be encoded in LR Date: Wed, 17 Jun 2015 14:34:33 +0100 [thread overview] Message-ID: <55817769.60909@arm.com> (raw) In-Reply-To: <CAFEAcA8idJehTx75G1OzcPpg5ewx_6X15srx7iV6sszmiqHNFw@mail.gmail.com> On 17/06/15 14:21, Peter Maydell wrote: > On 17 June 2015 at 12:53, Eric Auger <eric.auger@linaro.org> wrote: >> shouldn't we test somewhere that the hwirq is between 16 and 1019. > > Not directly related, but that reminds me that I noticed the > other day that we have VGIC_MAX_IRQS = 1024 (and use that as a > guard on how many irqs we let userspace configure and ask us > to deliver), but that doesn't account for the couple of magic > numbers at the top of the range. I think that lets userspace > cause us to do UNPREDICTABLE things to the GIC... Good point. How about the following: diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index 78fb820..950064a 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -1561,7 +1561,7 @@ int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int irq_num, goto out; } - if (irq_num >= kvm->arch.vgic.nr_irqs) + if (irq_num >= min(kvm->arch.vgic.nr_irqs, 1020)) return -EINVAL; vcpu_id = vgic_update_irq_pending(kvm, cpuid, irq_num, level); @@ -2161,10 +2161,7 @@ int kvm_set_irq(struct kvm *kvm, int irq_source_id, BUG_ON(!vgic_initialized(kvm)); - if (spi > kvm->arch.vgic.nr_irqs) - return -EINVAL; return kvm_vgic_inject_irq(kvm, 0, spi, level); - } /* MSI not implemented yet */ Thanks, M. -- Jazz is not dead. It just smells funny...
WARNING: multiple messages have this Message-ID (diff)
From: marc.zyngier@arm.com (Marc Zyngier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/10] KVM: arm/arm64: vgic: Allow HW irq to be encoded in LR Date: Wed, 17 Jun 2015 14:34:33 +0100 [thread overview] Message-ID: <55817769.60909@arm.com> (raw) In-Reply-To: <CAFEAcA8idJehTx75G1OzcPpg5ewx_6X15srx7iV6sszmiqHNFw@mail.gmail.com> On 17/06/15 14:21, Peter Maydell wrote: > On 17 June 2015 at 12:53, Eric Auger <eric.auger@linaro.org> wrote: >> shouldn't we test somewhere that the hwirq is between 16 and 1019. > > Not directly related, but that reminds me that I noticed the > other day that we have VGIC_MAX_IRQS = 1024 (and use that as a > guard on how many irqs we let userspace configure and ask us > to deliver), but that doesn't account for the couple of magic > numbers at the top of the range. I think that lets userspace > cause us to do UNPREDICTABLE things to the GIC... Good point. How about the following: diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index 78fb820..950064a 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -1561,7 +1561,7 @@ int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int irq_num, goto out; } - if (irq_num >= kvm->arch.vgic.nr_irqs) + if (irq_num >= min(kvm->arch.vgic.nr_irqs, 1020)) return -EINVAL; vcpu_id = vgic_update_irq_pending(kvm, cpuid, irq_num, level); @@ -2161,10 +2161,7 @@ int kvm_set_irq(struct kvm *kvm, int irq_source_id, BUG_ON(!vgic_initialized(kvm)); - if (spi > kvm->arch.vgic.nr_irqs) - return -EINVAL; return kvm_vgic_inject_irq(kvm, 0, spi, level); - } /* MSI not implemented yet */ Thanks, M. -- Jazz is not dead. It just smells funny...
next prev parent reply other threads:[~2015-06-17 13:34 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 [this message] 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 ` [PATCH 09/10] KVM: arm/arm64: timer: Allow the timer to control the active state Marc Zyngier 2015-06-08 17:04 ` 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=55817769.60909@arm.com \ --to=marc.zyngier@arm.com \ --cc=Andre.Przywara@arm.com \ --cc=eric.auger@linaro.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=peter.maydell@linaro.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.