[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v11 19/28] ioapic: register IOMMU IEC notifier for i
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v11 19/28] ioapic: register IOMMU IEC notifier for ioapic |
Date: |
Tue, 5 Jul 2016 16:19:20 +0800 |
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.
Since now we are creating IOMMUs using "-device" parameter, IOMMU
device will be created after IOAPIC. We need to do the registration
after machine done by leveraging machine_done notifier.
Signed-off-by: Peter Xu <address@hidden>
---
hw/intc/ioapic.c | 31 +++++++++++++++++++++++++++++++
include/hw/i386/ioapic_internal.h | 2 ++
2 files changed, 33 insertions(+)
diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index c4469e4..819585d 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,16 @@ static void ioapic_update_kvm_routes(IOAPICCommonState *s)
#endif
}
+#ifdef CONFIG_KVM
+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);
+}
+#endif
+
void ioapic_eoi_broadcast(int vector)
{
IOAPICCommonState *s;
@@ -354,6 +365,24 @@ static const MemoryRegionOps ioapic_io_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
+static void ioapic_machine_done_notify(Notifier *notifier, void *data)
+{
+#ifdef CONFIG_KVM
+ IOAPICCommonState *s = container_of(notifier, IOAPICCommonState,
+ machine_done);
+
+ 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_realize(DeviceState *dev, Error **errp)
{
IOAPICCommonState *s = IOAPIC_COMMON(dev);
@@ -364,6 +393,8 @@ static void ioapic_realize(DeviceState *dev, Error **errp)
qdev_init_gpio_in(dev, ioapic_set_irq, IOAPIC_NUM_PINS);
ioapics[ioapic_no] = s;
+ s->machine_done.notify = ioapic_machine_done_notify;
+ qemu_add_machine_init_done_notifier(&s->machine_done);
}
static void ioapic_class_init(ObjectClass *klass, void *data)
diff --git a/include/hw/i386/ioapic_internal.h
b/include/hw/i386/ioapic_internal.h
index 31dafb3..84e3deb 100644
--- a/include/hw/i386/ioapic_internal.h
+++ b/include/hw/i386/ioapic_internal.h
@@ -25,6 +25,7 @@
#include "hw/hw.h"
#include "exec/memory.h"
#include "hw/sysbus.h"
+#include "qemu/notify.h"
#define MAX_IOAPICS 1
@@ -107,6 +108,7 @@ struct IOAPICCommonState {
uint8_t ioregsel;
uint32_t irr;
uint64_t ioredtbl[IOAPIC_NUM_PINS];
+ Notifier machine_done;
};
void ioapic_reset_common(DeviceState *dev);
--
2.4.11
- [Qemu-devel] [PATCH v11 11/28] intel_iommu: handle interrupt remap enable, (continued)
- [Qemu-devel] [PATCH v11 11/28] intel_iommu: handle interrupt remap enable, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 12/28] intel_iommu: define several structs for IOMMU IR, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 13/28] intel_iommu: add IR translation faults defines, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 14/28] intel_iommu: Add support for PCI MSI remap, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 15/28] q35: ioapic: add support for emulated IOAPIC IR, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 16/28] ioapic: introduce ioapic_entry_parse() helper, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 17/28] intel_iommu: add support for split irqchip, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 18/28] x86-iommu: introduce IEC notifiers, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 19/28] ioapic: register IOMMU IEC notifier for ioapic,
Peter Xu <=
- [Qemu-devel] [PATCH v11 20/28] intel_iommu: Add support for Extended Interrupt Mode, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 21/28] intel_iommu: add SID validation for IR, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 22/28] kvm-irqchip: simplify kvm_irqchip_add_msi_route, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 23/28] kvm-irqchip: i386: add hook for add/remove virq, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 24/28] kvm-irqchip: x86: add msi route notify fn, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 25/28] kvm-irqchip: do explicit commit when update irq, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 26/28] intel_iommu: support all masks in interrupt entry cache invalidation, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 27/28] kvm-all: add trace events for kvm irqchip ops, Peter Xu, 2016/07/05
- [Qemu-devel] [PATCH v11 28/28] intel_iommu: disallow kernel-irqchip=on with IR, Peter Xu, 2016/07/05
- Re: [Qemu-devel] [PATCH v11 00/28] IOMMU: Enable interrupt remapping for Intel IOMMU, Radim Krčmář, 2016/07/08