From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Auger Subject: Re: [PATCH v4 5/7] KVM: arm/arm64: build a default routing table Date: Thu, 21 Apr 2016 16:51:22 +0200 Message-ID: <5718E8EA.4080801@linaro.org> References: <1459759657-7402-1-git-send-email-eric.auger@linaro.org> <1459759657-7402-6-git-send-email-eric.auger@linaro.org> <20160414120505.GG30804@cbox> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Cc: eric.auger@st.com, marc.zyngier@arm.com, andre.przywara@arm.com, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, patches@linaro.org, pbonzini@redhat.com, p.fedin@samsung.com, Manish.Jaggi@caviumnetworks.com To: Christoffer Dall Return-path: Received: from mail-wm0-f46.google.com ([74.125.82.46]:36318 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752041AbcDUOwj (ORCPT ); Thu, 21 Apr 2016 10:52:39 -0400 Received: by mail-wm0-f46.google.com with SMTP id v188so248178939wme.1 for ; Thu, 21 Apr 2016 07:52:39 -0700 (PDT) In-Reply-To: <20160414120505.GG30804@cbox> Sender: kvm-owner@vger.kernel.org List-ID: On 04/14/2016 02:05 PM, Christoffer Dall wrote: > On Mon, Apr 04, 2016 at 10:47:35AM +0200, Eric Auger wrote: >> Implement a default routing table made of flat irqchip routing >> entries (gsi = irqchip.pin) covering the VGIC SPI indexes. >> This routing table is overwritten by the first user-space call >> to KVM_SET_GSI_ROUTING ioctl. >> >> Signed-off-by: Eric Auger >> > > so before applying this patch, but after applying the previous patch, > will our current GICv2m-based MSI injection work? If you don't apply that patch and kernel does not build a default table, userspace is obliged to do the job. if it doesn't the irqfd-> virtual gsi forwarding will fail. So effectively it makes sense to squash both patches. > > If not, is there a better split of these patches (e.g. squash this one > into the previous one)? > >> --- >> --- >> virt/kvm/arm/vgic/vgic_init.c | 24 ++++++++++++++++++++++++ >> 1 file changed, 24 insertions(+) >> >> diff --git a/virt/kvm/arm/vgic/vgic_init.c b/virt/kvm/arm/vgic/vgic_init.c >> index e4459e3..041443b 100644 >> --- a/virt/kvm/arm/vgic/vgic_init.c >> +++ b/virt/kvm/arm/vgic/vgic_init.c >> @@ -261,6 +261,10 @@ int vgic_init(struct kvm *kvm) >> kvm_for_each_vcpu(i, vcpu, kvm) >> kvm_vgic_vcpu_init(vcpu); >> >> + ret = kvm_setup_default_irq_routing(kvm); >> + if (ret) >> + goto out; >> + >> dist->initialized = true; >> out: >> return ret; >> @@ -454,3 +458,23 @@ out_free_irq: >> kvm_get_running_vcpus()); >> return ret; >> } >> + >> +int kvm_setup_default_irq_routing(struct kvm *kvm) >> +{ >> + struct kvm_irq_routing_entry *entries; >> + struct vgic_dist *dist = &kvm->arch.vgic; >> + u32 nr = dist->nr_spis; >> + int i, ret; >> + >> + entries = kcalloc(nr, sizeof(struct kvm_kernel_irq_routing_entry), >> + GFP_KERNEL); > > I think you need to check if the allocation succeeded here or not... sure thanks Eric > >> + for (i = 0; i < nr; i++) { >> + entries[i].gsi = i; >> + entries[i].type = KVM_IRQ_ROUTING_IRQCHIP; >> + entries[i].u.irqchip.irqchip = 0; >> + entries[i].u.irqchip.pin = i; >> + } >> + ret = kvm_set_irq_routing(kvm, entries, nr, 0); >> + kfree(entries); >> + return ret; >> +} >> -- >> 1.9.1 >>