From: "Michael S. Tsirkin" <mst@redhat.com> To: qemu-devel@nongnu.org Cc: Peter Maydell <peter.maydell@linaro.org>, Peter Xu <peterx@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Marcel Apfelbaum <marcel@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>, Richard Henderson <rth@twiddle.net>, Eduardo Habkost <ehabkost@redhat.com>, kvm@vger.kernel.org Subject: [PULL 31/55] kvm-irqchip: x86: add msi route notify fn Date: Tue, 19 Jul 2016 01:45:55 +0300 [thread overview] Message-ID: <20160719014555-mutt-send-email-mst@redhat.com> (raw) In-Reply-To: <1468881010-27229-1-git-send-email-mst@redhat.com> From: Peter Xu <peterx@redhat.com> One more IEC notifier is added to let msi routes know about the IEC changes. When interrupt invalidation happens, all registered msi routes will be updated for all PCI devices. Since both vfio and vhost are possible gsi route consumers, this patch will go one step further to keep them safe in split irqchip mode and when irqfd is enabled. Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> [move trace-events lines into target-i386/trace-events] Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> --- include/hw/pci/pci.h | 2 ++ hw/pci/pci.c | 15 +++++++++++++++ kvm-all.c | 10 +--------- target-i386/kvm.c | 30 ++++++++++++++++++++++++++++++ target-i386/trace-events | 1 + 5 files changed, 49 insertions(+), 9 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 9ed1624..74d797d 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -805,4 +805,6 @@ extern const VMStateDescription vmstate_pci_device; .offset = vmstate_offset_pointer(_state, _field, PCIDevice), \ } +MSIMessage pci_get_msi_message(PCIDevice *dev, int vector); + #endif diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 149994b..728c6d4 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2596,6 +2596,21 @@ PCIDevice *pci_get_function_0(PCIDevice *pci_dev) } } +MSIMessage pci_get_msi_message(PCIDevice *dev, int vector) +{ + MSIMessage msg; + if (msix_enabled(dev)) { + msg = msix_get_message(dev, vector); + } else if (msi_enabled(dev)) { + msg = msi_get_message(dev, vector); + } else { + /* Should never happen */ + error_report("%s: unknown interrupt type", __func__); + abort(); + } + return msg; +} + static const TypeInfo pci_device_type_info = { .name = TYPE_PCI_DEVICE, .parent = TYPE_DEVICE, diff --git a/kvm-all.c b/kvm-all.c index 69ff658..ca30a58 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1246,15 +1246,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev) MSIMessage msg = {0, 0}; if (dev) { - if (msix_enabled(dev)) { - msg = msix_get_message(dev, vector); - } else if (msi_enabled(dev)) { - msg = msi_get_message(dev, vector); - } else { - /* Should never happen */ - error_report("%s: unknown interrupt type", __func__); - abort(); - } + msg = pci_get_msi_message(dev, vector); } if (kvm_gsi_direct_mapping()) { diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 8875034..61f57f9 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -36,6 +36,7 @@ #include "hw/i386/apic_internal.h" #include "hw/i386/apic-msidef.h" #include "hw/i386/intel_iommu.h" +#include "hw/i386/x86-iommu.h" #include "exec/ioport.h" #include "standard-headers/asm-x86/hyperv.h" @@ -3413,9 +3414,26 @@ struct MSIRouteEntry { static QLIST_HEAD(, MSIRouteEntry) msi_route_list = \ QLIST_HEAD_INITIALIZER(msi_route_list); +static void kvm_update_msi_routes_all(void *private, bool global, + uint32_t index, uint32_t mask) +{ + int cnt = 0; + MSIRouteEntry *entry; + MSIMessage msg; + /* TODO: explicit route update */ + QLIST_FOREACH(entry, &msi_route_list, list) { + cnt++; + msg = pci_get_msi_message(entry->dev, entry->vector); + kvm_irqchip_update_msi_route(kvm_state, entry->virq, + msg, entry->dev); + } + trace_kvm_x86_update_msi_routes(cnt); +} + int kvm_arch_add_msi_route_post(struct kvm_irq_routing_entry *route, int vector, PCIDevice *dev) { + static bool notify_list_inited = false; MSIRouteEntry *entry; if (!dev) { @@ -3432,6 +3450,18 @@ int kvm_arch_add_msi_route_post(struct kvm_irq_routing_entry *route, QLIST_INSERT_HEAD(&msi_route_list, entry, list); trace_kvm_x86_add_msi_route(route->gsi); + + if (!notify_list_inited) { + /* For the first time we do add route, add ourselves into + * IOMMU's IEC notify list if needed. */ + X86IOMMUState *iommu = x86_iommu_get_default(); + if (iommu) { + x86_iommu_iec_register_notifier(iommu, + kvm_update_msi_routes_all, + NULL); + } + notify_list_inited = true; + } return 0; } diff --git a/target-i386/trace-events b/target-i386/trace-events index 818058c..ccc49e3 100644 --- a/target-i386/trace-events +++ b/target-i386/trace-events @@ -4,3 +4,4 @@ kvm_x86_fixup_msi_error(uint32_t gsi) "VT-d failed to remap interrupt for GSI %" PRIu32 kvm_x86_add_msi_route(int virq) "Adding route entry for virq %d" kvm_x86_remove_msi_route(int virq) "Removing route entry for virq %d" +kvm_x86_update_msi_routes(int num) "Updated %d MSI routes" -- MST
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com> To: qemu-devel@nongnu.org Cc: Peter Maydell <peter.maydell@linaro.org>, Peter Xu <peterx@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Marcel Apfelbaum <marcel@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>, Richard Henderson <rth@twiddle.net>, Eduardo Habkost <ehabkost@redhat.com>, kvm@vger.kernel.org Subject: [Qemu-devel] [PULL 31/55] kvm-irqchip: x86: add msi route notify fn Date: Tue, 19 Jul 2016 01:45:55 +0300 [thread overview] Message-ID: <20160719014555-mutt-send-email-mst@redhat.com> (raw) In-Reply-To: <1468881010-27229-1-git-send-email-mst@redhat.com> From: Peter Xu <peterx@redhat.com> One more IEC notifier is added to let msi routes know about the IEC changes. When interrupt invalidation happens, all registered msi routes will be updated for all PCI devices. Since both vfio and vhost are possible gsi route consumers, this patch will go one step further to keep them safe in split irqchip mode and when irqfd is enabled. Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> [move trace-events lines into target-i386/trace-events] Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> --- include/hw/pci/pci.h | 2 ++ hw/pci/pci.c | 15 +++++++++++++++ kvm-all.c | 10 +--------- target-i386/kvm.c | 30 ++++++++++++++++++++++++++++++ target-i386/trace-events | 1 + 5 files changed, 49 insertions(+), 9 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 9ed1624..74d797d 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -805,4 +805,6 @@ extern const VMStateDescription vmstate_pci_device; .offset = vmstate_offset_pointer(_state, _field, PCIDevice), \ } +MSIMessage pci_get_msi_message(PCIDevice *dev, int vector); + #endif diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 149994b..728c6d4 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2596,6 +2596,21 @@ PCIDevice *pci_get_function_0(PCIDevice *pci_dev) } } +MSIMessage pci_get_msi_message(PCIDevice *dev, int vector) +{ + MSIMessage msg; + if (msix_enabled(dev)) { + msg = msix_get_message(dev, vector); + } else if (msi_enabled(dev)) { + msg = msi_get_message(dev, vector); + } else { + /* Should never happen */ + error_report("%s: unknown interrupt type", __func__); + abort(); + } + return msg; +} + static const TypeInfo pci_device_type_info = { .name = TYPE_PCI_DEVICE, .parent = TYPE_DEVICE, diff --git a/kvm-all.c b/kvm-all.c index 69ff658..ca30a58 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1246,15 +1246,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev) MSIMessage msg = {0, 0}; if (dev) { - if (msix_enabled(dev)) { - msg = msix_get_message(dev, vector); - } else if (msi_enabled(dev)) { - msg = msi_get_message(dev, vector); - } else { - /* Should never happen */ - error_report("%s: unknown interrupt type", __func__); - abort(); - } + msg = pci_get_msi_message(dev, vector); } if (kvm_gsi_direct_mapping()) { diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 8875034..61f57f9 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -36,6 +36,7 @@ #include "hw/i386/apic_internal.h" #include "hw/i386/apic-msidef.h" #include "hw/i386/intel_iommu.h" +#include "hw/i386/x86-iommu.h" #include "exec/ioport.h" #include "standard-headers/asm-x86/hyperv.h" @@ -3413,9 +3414,26 @@ struct MSIRouteEntry { static QLIST_HEAD(, MSIRouteEntry) msi_route_list = \ QLIST_HEAD_INITIALIZER(msi_route_list); +static void kvm_update_msi_routes_all(void *private, bool global, + uint32_t index, uint32_t mask) +{ + int cnt = 0; + MSIRouteEntry *entry; + MSIMessage msg; + /* TODO: explicit route update */ + QLIST_FOREACH(entry, &msi_route_list, list) { + cnt++; + msg = pci_get_msi_message(entry->dev, entry->vector); + kvm_irqchip_update_msi_route(kvm_state, entry->virq, + msg, entry->dev); + } + trace_kvm_x86_update_msi_routes(cnt); +} + int kvm_arch_add_msi_route_post(struct kvm_irq_routing_entry *route, int vector, PCIDevice *dev) { + static bool notify_list_inited = false; MSIRouteEntry *entry; if (!dev) { @@ -3432,6 +3450,18 @@ int kvm_arch_add_msi_route_post(struct kvm_irq_routing_entry *route, QLIST_INSERT_HEAD(&msi_route_list, entry, list); trace_kvm_x86_add_msi_route(route->gsi); + + if (!notify_list_inited) { + /* For the first time we do add route, add ourselves into + * IOMMU's IEC notify list if needed. */ + X86IOMMUState *iommu = x86_iommu_get_default(); + if (iommu) { + x86_iommu_iec_register_notifier(iommu, + kvm_update_msi_routes_all, + NULL); + } + notify_list_inited = true; + } return 0; } diff --git a/target-i386/trace-events b/target-i386/trace-events index 818058c..ccc49e3 100644 --- a/target-i386/trace-events +++ b/target-i386/trace-events @@ -4,3 +4,4 @@ kvm_x86_fixup_msi_error(uint32_t gsi) "VT-d failed to remap interrupt for GSI %" PRIu32 kvm_x86_add_msi_route(int virq) "Adding route entry for virq %d" kvm_x86_remove_msi_route(int virq) "Removing route entry for virq %d" +kvm_x86_update_msi_routes(int num) "Updated %d MSI routes" -- MST
next prev parent reply other threads:[~2016-07-18 22:46 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <1468881010-27229-1-git-send-email-mst@redhat.com> 2016-07-18 22:42 ` [Qemu-devel] [PULL 01/55] nvdimm: fix memory leak in error code path Michael S. Tsirkin 2016-07-18 22:42 ` [Qemu-devel] [PULL 02/55] tests/prom-env-test: increase the test timeout Michael S. Tsirkin 2016-07-18 22:42 ` [Qemu-devel] [PULL 03/55] hw/alpha: fix PCI bus initialization Michael S. Tsirkin 2016-07-18 22:42 ` [Qemu-devel] [PULL 04/55] hw/mips: " Michael S. Tsirkin 2016-07-18 22:43 ` [Qemu-devel] [PULL 05/55] hw/apb: " Michael S. Tsirkin 2016-07-18 22:43 ` [Qemu-devel] [PULL 06/55] hw/grackle: " Michael S. Tsirkin 2016-07-18 22:43 ` [Qemu-devel] [PULL 07/55] hw/prep: realize the PCI root bus as part of the prep init Michael S. Tsirkin 2016-07-18 22:43 ` [Qemu-devel] [PULL 08/55] hw/versatile: realize the PCI root bus as part of the versatile init Michael S. Tsirkin 2016-07-18 22:43 ` [Qemu-devel] [PULL 09/55] x86-iommu: introduce parent class Michael S. Tsirkin 2016-07-18 22:43 ` [Qemu-devel] [PULL 10/55] intel_iommu: rename VTD_PCI_DEVFN_MAX to x86-iommu Michael S. Tsirkin 2016-07-18 22:43 ` [Qemu-devel] [PULL 11/55] x86-iommu: provide x86_iommu_get_default Michael S. Tsirkin 2016-07-18 22:43 ` [Qemu-devel] [PULL 12/55] x86-iommu: introduce "intremap" property Michael S. Tsirkin 2016-07-18 22:43 ` [Qemu-devel] [PULL 13/55] acpi: enable INTR for DMAR report structure Michael S. Tsirkin 2016-07-18 22:43 ` [Qemu-devel] [PULL 14/55] intel_iommu: allow queued invalidation for IR Michael S. Tsirkin 2016-07-18 22:43 ` [Qemu-devel] [PULL 15/55] intel_iommu: set IR bit for ECAP register Michael S. Tsirkin 2016-07-18 22:44 ` [Qemu-devel] [PULL 16/55] acpi: add DMAR scope definition for root IOAPIC Michael S. Tsirkin 2016-07-18 22:44 ` [Qemu-devel] [PULL 17/55] intel_iommu: define interrupt remap table addr register Michael S. Tsirkin 2016-07-18 22:44 ` [Qemu-devel] [PULL 18/55] intel_iommu: handle interrupt remap enable Michael S. Tsirkin 2016-07-18 22:44 ` [Qemu-devel] [PULL 19/55] intel_iommu: define several structs for IOMMU IR Michael S. Tsirkin 2016-07-18 22:44 ` [Qemu-devel] [PULL 20/55] intel_iommu: add IR translation faults defines Michael S. Tsirkin 2016-07-18 22:44 ` [Qemu-devel] [PULL 21/55] intel_iommu: Add support for PCI MSI remap Michael S. Tsirkin 2016-07-18 22:44 ` [Qemu-devel] [PULL 22/55] q35: ioapic: add support for emulated IOAPIC IR Michael S. Tsirkin 2016-11-11 17:18 ` Emilio G. Cota 2016-11-11 19:50 ` Emilio G. Cota 2016-11-11 23:17 ` Peter Xu 2016-11-12 2:04 ` Emilio G. Cota 2016-11-12 11:01 ` Alex Bennée 2016-07-18 22:44 ` [Qemu-devel] [PULL 23/55] ioapic: introduce ioapic_entry_parse() helper Michael S. Tsirkin 2016-07-18 22:45 ` [PULL 24/55] intel_iommu: add support for split irqchip Michael S. Tsirkin 2016-07-18 22:45 ` [Qemu-devel] " Michael S. Tsirkin 2016-07-18 22:45 ` [Qemu-devel] [PULL 25/55] x86-iommu: introduce IEC notifiers Michael S. Tsirkin 2016-07-18 22:45 ` [Qemu-devel] [PULL 26/55] ioapic: register IOMMU IEC notifier for ioapic Michael S. Tsirkin 2016-07-18 22:45 ` [Qemu-devel] [PULL 27/55] intel_iommu: Add support for Extended Interrupt Mode Michael S. Tsirkin 2016-07-18 22:45 ` [Qemu-devel] [PULL 28/55] intel_iommu: add SID validation for IR Michael S. Tsirkin 2016-07-18 22:45 ` [PULL 29/55] kvm-irqchip: simplify kvm_irqchip_add_msi_route Michael S. Tsirkin 2016-07-18 22:45 ` [Qemu-devel] " Michael S. Tsirkin 2016-07-18 22:45 ` [PULL 30/55] kvm-irqchip: i386: add hook for add/remove virq Michael S. Tsirkin 2016-07-18 22:45 ` [Qemu-devel] " Michael S. Tsirkin 2016-07-18 22:45 ` Michael S. Tsirkin [this message] 2016-07-18 22:45 ` [Qemu-devel] [PULL 31/55] kvm-irqchip: x86: add msi route notify fn Michael S. Tsirkin 2016-07-18 22:46 ` [PULL 32/55] kvm-irqchip: do explicit commit when update irq Michael S. Tsirkin 2016-07-18 22:46 ` [Qemu-devel] " Michael S. Tsirkin 2016-07-18 22:46 ` [Qemu-devel] [PULL 33/55] intel_iommu: support all masks in interrupt entry cache invalidation Michael S. Tsirkin 2016-07-18 22:46 ` [PULL 34/55] kvm-all: add trace events for kvm irqchip ops Michael S. Tsirkin 2016-07-18 22:46 ` [Qemu-devel] " Michael S. Tsirkin 2016-07-18 22:46 ` [Qemu-devel] [PULL 35/55] intel_iommu: disallow kernel-irqchip=on with IR Michael S. Tsirkin 2016-07-18 22:46 ` [Qemu-devel] [PULL 36/55] virtio: Add typedef for handle_output Michael S. Tsirkin 2016-07-18 22:46 ` [Qemu-devel] [PULL 37/55] virtio: Introduce virtio_add_queue_aio Michael S. Tsirkin 2016-07-18 22:46 ` [Qemu-devel] [PULL 38/55] virtio-blk: Call virtio_add_queue_aio Michael S. Tsirkin 2016-07-18 22:46 ` [Qemu-devel] [PULL 39/55] virtio-scsi: " Michael S. Tsirkin 2016-07-18 22:46 ` [Qemu-devel] [PULL 40/55] Revert "mirror: Workaround for unexpected iohandler events during completion" Michael S. Tsirkin 2016-07-18 22:47 ` [Qemu-devel] [PULL 41/55] virtio-scsi: Replace HandleOutput typedef Michael S. Tsirkin 2016-07-18 22:47 ` [Qemu-devel] [PULL 42/55] virtio-net: Remove old migration version support Michael S. Tsirkin 2016-07-18 22:47 ` [Qemu-devel] [PULL 43/55] virtio-serial: " Michael S. Tsirkin 2016-07-18 22:47 ` [Qemu-devel] [PULL 44/55] virtio: Migration helper function and macro Michael S. Tsirkin 2016-07-18 22:47 ` [Qemu-devel] [PULL 45/55] virtio-scsi: Wrap in vmstate Michael S. Tsirkin 2016-07-18 22:47 ` [Qemu-devel] [PULL 46/55] virtio-blk: " Michael S. Tsirkin 2016-07-18 22:47 ` [Qemu-devel] [PULL 47/55] virtio-rng: " Michael S. Tsirkin 2016-07-18 22:47 ` [Qemu-devel] [PULL 48/55] virtio-balloon: " Michael S. Tsirkin 2016-07-18 22:47 ` [Qemu-devel] [PULL 49/55] virtio-net: " Michael S. Tsirkin 2016-07-18 22:47 ` [Qemu-devel] [PULL 50/55] virtio-serial: " Michael S. Tsirkin 2016-07-18 22:47 ` [Qemu-devel] [PULL 51/55] 9pfs: " Michael S. Tsirkin 2016-07-18 22:48 ` [Qemu-devel] [PULL 52/55] virtio-input: " Michael S. Tsirkin 2016-07-18 22:48 ` [Qemu-devel] [PULL 53/55] virtio-gpu: Use migrate_add_blocker for virgl migration blocking Michael S. Tsirkin 2016-07-18 22:48 ` [Qemu-devel] [PULL 54/55] virtio-gpu: Wrap in vmstate Michael S. Tsirkin 2016-07-18 22:48 ` [Qemu-devel] [PULL 55/55] virtio: Update migration docs Michael S. Tsirkin
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=20160719014555-mutt-send-email-mst@redhat.com \ --to=mst@redhat.com \ --cc=ehabkost@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=marcel@redhat.com \ --cc=mtosatti@redhat.com \ --cc=pbonzini@redhat.com \ --cc=peter.maydell@linaro.org \ --cc=peterx@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=rth@twiddle.net \ /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.