From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7KVZ-0003Z3-Au for qemu-devel@nongnu.org; Mon, 30 May 2016 06:33:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b7KVY-0005bR-AT for qemu-devel@nongnu.org; Mon, 30 May 2016 06:33:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34906) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7KVY-0005bN-4Y for qemu-devel@nongnu.org; Mon, 30 May 2016 06:33:16 -0400 From: Peter Xu Date: Mon, 30 May 2016 18:31:31 +0800 Message-Id: <1464604298-16739-19-git-send-email-peterx@redhat.com> In-Reply-To: <1464604298-16739-1-git-send-email-peterx@redhat.com> References: <1464604298-16739-1-git-send-email-peterx@redhat.com> Subject: [Qemu-devel] [PATCH v8 18/25] ioapic: register IOMMU IEC notifier for ioapic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, rth@twiddle.net, ehabkost@redhat.com, jasowang@redhat.com, marcel@redhat.com, mst@redhat.com, pbonzini@redhat.com, jan.kiszka@web.de, rkrcmar@redhat.com, alex.williamson@redhat.com, wexu@redhat.com, davidkiarie4@gmail.com, peterx@redhat.com Let IOAPIC the first consumer of x86 IOMMU IEC invalidation notifiers. This is only used for split irqchip case, when vIOMMU receives IR invalidation requests, IOAPIC will be notified to update kernel irq routes. For simplicity, we just update all IOAPIC routes, even if the invalidated entries are not IOAPIC ones. Signed-off-by: Peter Xu --- hw/intc/ioapic.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index c4469e4..4823211 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -31,6 +31,7 @@ #include "sysemu/kvm.h" #include "target-i386/cpu.h" #include "hw/i386/apic-msidef.h" +#include "hw/i386/x86-iommu.h" //#define DEBUG_IOAPIC @@ -198,6 +199,14 @@ static void ioapic_update_kvm_routes(IOAPICCommonState *s) #endif } +static void ioapic_iec_notifier(void *private, bool global, + uint32_t index, uint32_t mask) +{ + IOAPICCommonState *s = (IOAPICCommonState *)private; + /* For simplicity, we just update all the routes */ + ioapic_update_kvm_routes(s); +} + void ioapic_eoi_broadcast(int vector) { IOAPICCommonState *s; @@ -364,6 +373,18 @@ static void ioapic_realize(DeviceState *dev, Error **errp) qdev_init_gpio_in(dev, ioapic_set_irq, IOAPIC_NUM_PINS); ioapics[ioapic_no] = s; + +#ifdef CONFIG_KVM + if (kvm_irqchip_is_split()) { + X86IOMMUState *iommu = x86_iommu_get_default(); + if (iommu) { + /* Register this IOAPIC with IOMMU IEC notifier, so that + * when there are IR invalidates, we can be notified to + * update kernel IR cache. */ + x86_iommu_iec_register_notifier(iommu, ioapic_iec_notifier, s); + } + } +#endif } static void ioapic_class_init(ObjectClass *klass, void *data) -- 2.4.11