From: Eric Auger <eric.auger@linaro.org> To: Andre Przywara <andre.przywara@arm.com>, "eric.auger@st.com" <eric.auger@st.com> Cc: "kvm@vger.kernel.org" <kvm@vger.kernel.org>, Marc Zyngier <Marc.Zyngier@arm.com>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, "pbonzini@redhat.com" <pbonzini@redhat.com>, "kvmarm@lists.cs.columbia.edu" <kvmarm@lists.cs.columbia.edu> Subject: Re: [PATCH v2 4/7] KVM: arm/arm64: enable irqchip routing Date: Mon, 13 Jul 2015 11:58:44 +0200 [thread overview] Message-ID: <55A38BD4.50401@linaro.org> (raw) In-Reply-To: <55A05228.4030203@arm.com> Hi Andre, On 07/11/2015 01:15 AM, Andre Przywara wrote: > Hi Eric, > > On 09/07/15 09:22, Eric Auger wrote: >> This patch adds compilation and link against irqchip. >> >> On ARM, irqchip routing is not really useful since there is >> a single irqchip. However main motivation behind using irqchip >> code is to enable MSI routing code. With the support of in-kernel >> GICv3 ITS emulation, it now seems to be a MUST HAVE requirement. >> > > .... > >> diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c >> index 3630971..6c6c25e 100644 >> --- a/virt/kvm/arm/vgic.c >> +++ b/virt/kvm/arm/vgic.c >> @@ -2215,44 +2215,65 @@ out_free_irq: >> return ret; >> } >> >> -int kvm_irq_map_gsi(struct kvm *kvm, >> - struct kvm_kernel_irq_routing_entry *entries, >> - int gsi) >> +int vgic_irqfd_set_irq(struct kvm_kernel_irq_routing_entry *e, >> + struct kvm *kvm, int irq_source_id, >> + int level, bool line_status) >> { >> - return 0; >> -} >> - >> -int kvm_irq_map_chip_pin(struct kvm *kvm, unsigned irqchip, unsigned pin) >> -{ >> - return pin; >> -} >> - >> -int kvm_set_irq(struct kvm *kvm, int irq_source_id, >> - u32 irq, int level, bool line_status) >> -{ >> - unsigned int spi = irq + VGIC_NR_PRIVATE_IRQS; >> + unsigned int spi_id = e->irqchip.pin + VGIC_NR_PRIVATE_IRQS; >> >> - trace_kvm_set_irq(irq, level, irq_source_id); >> + trace_kvm_set_irq(spi_id, level, irq_source_id); >> >> BUG_ON(!vgic_initialized(kvm)); >> >> - return kvm_vgic_inject_irq(kvm, 0, spi, level); >> + if (spi_id > min(kvm->arch.vgic.nr_irqs, 1020)) >> + return -EINVAL; >> + return kvm_vgic_inject_irq(kvm, 0, spi_id, level); >> +} >> + >> +/** >> + * Populates a kvm routing entry from a user routing entry >> + * @e: kvm internal formatted entry >> + * @ue: user api formatted entry >> + * return 0 on success, -EINVAL on errors. >> + */ >> +int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e, >> + const struct kvm_irq_routing_entry *ue) >> +{ >> + int r = -EINVAL; >> + >> + switch (ue->type) { >> + case KVM_IRQ_ROUTING_IRQCHIP: >> + e->set = vgic_irqfd_set_irq; >> + e->irqchip.irqchip = ue->u.irqchip.irqchip; >> + e->irqchip.pin = ue->u.irqchip.pin; >> + if ((e->irqchip.pin >= KVM_IRQCHIP_NUM_PINS) || >> + (e->irqchip.irqchip >= KVM_NR_IRQCHIPS)) >> + goto out; >> + break; >> + default: >> + goto out; >> + } >> + r = 0; >> +out: >> + return r; >> } >> >> -/* MSI not implemented yet */ >> int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, >> struct kvm *kvm, int irq_source_id, >> int level, bool line_status) >> { >> - return 0; >> -} >> + struct kvm_msi msi; >> + >> + msi.address_lo = e->msi.address_lo; >> + msi.address_hi = e->msi.address_hi; >> + msi.data = e->msi.data; >> + if (e->type == KVM_IRQ_ROUTING_EXTENDED_MSI) { >> + msi.devid = e->devid; >> + msi.flags = KVM_MSI_VALID_DEVID; >> + } > > Can't we make the assignment unconditional? > The GICv2m MSI code does not care about the devid and the ITS code > requires it. > This simplifies quite something in the following patches. > (This refers to the idea of not using the extended type in the kernel). How are we going to make sure the userspace provided a valid devid then? - we have this info at user struct level: kvm_irq_routing_msi - we wouldn't propagate the info at kernel struct level: kvm_kernel_irq_routing_entry - the only place where we could check the devid availability against the need is at kvm_set_routing_entry I think (routing adaptation on ARM). What is going to happen if devid == 0 since unset? > >> >> -#ifdef CONFIG_HAVE_KVM_MSI >> -int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi) >> -{ >> if (kvm->arch.vgic.vm_ops.inject_msi) >> - return kvm->arch.vgic.vm_ops.inject_msi(kvm, msi); >> + return kvm->arch.vgic.vm_ops.inject_msi(kvm, &msi); >> else >> return -ENODEV; >> } >> -#endif >> diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c >> index e678f8a..f26cadd 100644 >> --- a/virt/kvm/irqchip.c >> +++ b/virt/kvm/irqchip.c >> @@ -29,7 +29,9 @@ >> #include <linux/srcu.h> >> #include <linux/export.h> >> #include <trace/events/kvm.h> >> +#if !defined(CONFIG_ARM) && !defined(CONFIG_ARM64) >> #include "irq.h" >> +#endif > > To what irq.h is that referring to? And why is ARM not allowed to > include that? this refers to arch/x86/kvm/irq.h, arch/powerpc/kvm/irq.h, ... This typically declares things we have in include/kvm/arm_vgic.h like irqchip_in_kernel So currently I don't see things we should put in that header. Cheers Eric > Cheers, > Andre. > >> >> struct kvm_irq_routing_table { >> int chip[KVM_NR_IRQCHIPS][KVM_IRQCHIP_NUM_PINS]; >>
WARNING: multiple messages have this Message-ID (diff)
From: eric.auger@linaro.org (Eric Auger) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 4/7] KVM: arm/arm64: enable irqchip routing Date: Mon, 13 Jul 2015 11:58:44 +0200 [thread overview] Message-ID: <55A38BD4.50401@linaro.org> (raw) In-Reply-To: <55A05228.4030203@arm.com> Hi Andre, On 07/11/2015 01:15 AM, Andre Przywara wrote: > Hi Eric, > > On 09/07/15 09:22, Eric Auger wrote: >> This patch adds compilation and link against irqchip. >> >> On ARM, irqchip routing is not really useful since there is >> a single irqchip. However main motivation behind using irqchip >> code is to enable MSI routing code. With the support of in-kernel >> GICv3 ITS emulation, it now seems to be a MUST HAVE requirement. >> > > .... > >> diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c >> index 3630971..6c6c25e 100644 >> --- a/virt/kvm/arm/vgic.c >> +++ b/virt/kvm/arm/vgic.c >> @@ -2215,44 +2215,65 @@ out_free_irq: >> return ret; >> } >> >> -int kvm_irq_map_gsi(struct kvm *kvm, >> - struct kvm_kernel_irq_routing_entry *entries, >> - int gsi) >> +int vgic_irqfd_set_irq(struct kvm_kernel_irq_routing_entry *e, >> + struct kvm *kvm, int irq_source_id, >> + int level, bool line_status) >> { >> - return 0; >> -} >> - >> -int kvm_irq_map_chip_pin(struct kvm *kvm, unsigned irqchip, unsigned pin) >> -{ >> - return pin; >> -} >> - >> -int kvm_set_irq(struct kvm *kvm, int irq_source_id, >> - u32 irq, int level, bool line_status) >> -{ >> - unsigned int spi = irq + VGIC_NR_PRIVATE_IRQS; >> + unsigned int spi_id = e->irqchip.pin + VGIC_NR_PRIVATE_IRQS; >> >> - trace_kvm_set_irq(irq, level, irq_source_id); >> + trace_kvm_set_irq(spi_id, level, irq_source_id); >> >> BUG_ON(!vgic_initialized(kvm)); >> >> - return kvm_vgic_inject_irq(kvm, 0, spi, level); >> + if (spi_id > min(kvm->arch.vgic.nr_irqs, 1020)) >> + return -EINVAL; >> + return kvm_vgic_inject_irq(kvm, 0, spi_id, level); >> +} >> + >> +/** >> + * Populates a kvm routing entry from a user routing entry >> + * @e: kvm internal formatted entry >> + * @ue: user api formatted entry >> + * return 0 on success, -EINVAL on errors. >> + */ >> +int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e, >> + const struct kvm_irq_routing_entry *ue) >> +{ >> + int r = -EINVAL; >> + >> + switch (ue->type) { >> + case KVM_IRQ_ROUTING_IRQCHIP: >> + e->set = vgic_irqfd_set_irq; >> + e->irqchip.irqchip = ue->u.irqchip.irqchip; >> + e->irqchip.pin = ue->u.irqchip.pin; >> + if ((e->irqchip.pin >= KVM_IRQCHIP_NUM_PINS) || >> + (e->irqchip.irqchip >= KVM_NR_IRQCHIPS)) >> + goto out; >> + break; >> + default: >> + goto out; >> + } >> + r = 0; >> +out: >> + return r; >> } >> >> -/* MSI not implemented yet */ >> int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, >> struct kvm *kvm, int irq_source_id, >> int level, bool line_status) >> { >> - return 0; >> -} >> + struct kvm_msi msi; >> + >> + msi.address_lo = e->msi.address_lo; >> + msi.address_hi = e->msi.address_hi; >> + msi.data = e->msi.data; >> + if (e->type == KVM_IRQ_ROUTING_EXTENDED_MSI) { >> + msi.devid = e->devid; >> + msi.flags = KVM_MSI_VALID_DEVID; >> + } > > Can't we make the assignment unconditional? > The GICv2m MSI code does not care about the devid and the ITS code > requires it. > This simplifies quite something in the following patches. > (This refers to the idea of not using the extended type in the kernel). How are we going to make sure the userspace provided a valid devid then? - we have this info at user struct level: kvm_irq_routing_msi - we wouldn't propagate the info at kernel struct level: kvm_kernel_irq_routing_entry - the only place where we could check the devid availability against the need is at kvm_set_routing_entry I think (routing adaptation on ARM). What is going to happen if devid == 0 since unset? > >> >> -#ifdef CONFIG_HAVE_KVM_MSI >> -int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi) >> -{ >> if (kvm->arch.vgic.vm_ops.inject_msi) >> - return kvm->arch.vgic.vm_ops.inject_msi(kvm, msi); >> + return kvm->arch.vgic.vm_ops.inject_msi(kvm, &msi); >> else >> return -ENODEV; >> } >> -#endif >> diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c >> index e678f8a..f26cadd 100644 >> --- a/virt/kvm/irqchip.c >> +++ b/virt/kvm/irqchip.c >> @@ -29,7 +29,9 @@ >> #include <linux/srcu.h> >> #include <linux/export.h> >> #include <trace/events/kvm.h> >> +#if !defined(CONFIG_ARM) && !defined(CONFIG_ARM64) >> #include "irq.h" >> +#endif > > To what irq.h is that referring to? And why is ARM not allowed to > include that? this refers to arch/x86/kvm/irq.h, arch/powerpc/kvm/irq.h, ... This typically declares things we have in include/kvm/arm_vgic.h like irqchip_in_kernel So currently I don't see things we should put in that header. Cheers Eric > Cheers, > Andre. > >> >> struct kvm_irq_routing_table { >> int chip[KVM_NR_IRQCHIPS][KVM_IRQCHIP_NUM_PINS]; >>
next prev parent reply other threads:[~2015-07-13 9:58 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-07-09 8:22 [PATCH v2 0/7] KVM: arm/arm64: gsi routing support Eric Auger 2015-07-09 8:22 ` Eric Auger 2015-07-09 8:22 ` [PATCH v2 1/7] KVM: api: introduce KVM_IRQ_ROUTING_EXTENDED_MSI Eric Auger 2015-07-09 8:22 ` Eric Auger 2015-07-10 22:42 ` Andre Przywara 2015-07-10 22:42 ` Andre Przywara 2015-07-13 9:25 ` Eric Auger 2015-07-13 9:25 ` Eric Auger 2015-07-09 8:22 ` [PATCH v2 2/7] KVM: kvm_host: add devid in kvm_kernel_irq_routing_entry Eric Auger 2015-07-09 8:22 ` Eric Auger 2015-07-09 8:22 ` [PATCH v2 3/7] KVM: irqchip: convey devid to kvm_set_msi Eric Auger 2015-07-09 8:22 ` Eric Auger 2015-07-10 23:15 ` Andre Przywara 2015-07-10 23:15 ` Andre Przywara 2015-07-17 7:27 ` Pavel Fedin 2015-07-17 7:27 ` Pavel Fedin 2015-07-17 10:09 ` Paolo Bonzini 2015-07-17 10:09 ` Paolo Bonzini 2015-07-17 10:21 ` Pavel Fedin 2015-07-17 10:21 ` Pavel Fedin 2015-07-18 18:39 ` Eric Auger 2015-07-18 18:39 ` Eric Auger 2015-07-09 8:22 ` [PATCH v2 4/7] KVM: arm/arm64: enable irqchip routing Eric Auger 2015-07-09 8:22 ` Eric Auger 2015-07-10 23:15 ` Andre Przywara 2015-07-10 23:15 ` Andre Przywara 2015-07-13 9:58 ` Eric Auger [this message] 2015-07-13 9:58 ` Eric Auger 2015-07-15 7:29 ` Pavel Fedin 2015-07-15 7:29 ` Pavel Fedin 2015-07-09 8:22 ` [PATCH v2 5/7] KVM: arm/arm64: build a default routing table Eric Auger 2015-07-09 8:22 ` Eric Auger 2015-07-09 8:22 ` [PATCH v2 6/7] KVM: arm/arm64: enable MSI routing Eric Auger 2015-07-09 8:22 ` Eric Auger 2015-07-10 23:16 ` Andre Przywara 2015-07-10 23:16 ` Andre Przywara 2015-07-09 8:22 ` [PATCH v2 7/7] KVM: arm: implement kvm_set_msi by gsi direct mapping Eric Auger 2015-07-09 8:22 ` Eric Auger 2015-07-10 23:17 ` Andre Przywara 2015-07-10 23:17 ` Andre Przywara 2015-07-31 12:59 ` Eric Auger 2015-07-31 12:59 ` Eric Auger 2015-08-02 20:23 ` Andre Przywara 2015-08-02 20:23 ` Andre Przywara 2015-08-03 9:11 ` Eric Auger 2015-08-03 9:11 ` Eric Auger 2015-07-09 14:37 ` [PATCH v2 0/7] KVM: arm/arm64: gsi routing support Pavel Fedin 2015-07-09 14:37 ` Pavel Fedin 2015-07-09 15:25 ` Andre Przywara 2015-07-09 15:25 ` Andre Przywara 2015-07-09 15:52 ` Pavel Fedin 2015-07-09 15:52 ` Pavel Fedin 2015-07-09 17:11 ` Eric Auger 2015-07-09 17:11 ` Eric Auger 2015-07-09 18:08 ` Pavel Fedin 2015-07-09 18:08 ` Pavel Fedin
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=55A38BD4.50401@linaro.org \ --to=eric.auger@linaro.org \ --cc=Marc.Zyngier@arm.com \ --cc=andre.przywara@arm.com \ --cc=eric.auger@st.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=pbonzini@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.