From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asRCL-0007c9-6f for qemu-devel@nongnu.org; Tue, 19 Apr 2016 04:39:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1asRCK-0006Ng-A5 for qemu-devel@nongnu.org; Tue, 19 Apr 2016 04:39:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56482) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asRCK-0006Nc-4q for qemu-devel@nongnu.org; Tue, 19 Apr 2016 04:39:52 -0400 From: Peter Xu Date: Tue, 19 Apr 2016 16:38:42 +0800 Message-Id: <1461055122-32378-17-git-send-email-peterx@redhat.com> In-Reply-To: <1461055122-32378-1-git-send-email-peterx@redhat.com> References: <1461055122-32378-1-git-send-email-peterx@redhat.com> Subject: [Qemu-devel] [PATCH v4 16/16] ioapic: register VT-d IEC invalidate notifier 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, peterx@redhat.com Let IOAPIC the first consumer of VT-d IEC invalidation notifiers. This is only used for split irqchip case, when VT-d 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 d6e88d5..b41ab89 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -30,6 +30,7 @@ #include "sysemu/kvm.h" #include "target-i386/cpu.h" #include "hw/i386/apic-msidef.h" +#include "hw/i386/intel_iommu.h" //#define DEBUG_IOAPIC @@ -197,6 +198,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; @@ -330,6 +339,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()) { + IntelIOMMUState *iommu = vtd_iommu_get(); + 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. */ + vtd_iec_register_notifier(iommu, ioapic_iec_notifier, s); + } + } +#endif } static void ioapic_class_init(ObjectClass *klass, void *data) -- 2.4.3