From 6f572c45ff2c2376a16cd15882067d7fdcd74a83 Mon Sep 17 00:00:00 2001

From: Alex Williamson <alex.williamson@redhat.com>

Date: Tue, 5 Nov 2013 15:30:40 +0100

Subject: [PATCH 12/25] vfio-pci: Add support for MSI affinity

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Alex Williamson <alex.williamson@redhat.com>

Message-id: <20131105153040.15749.78283.stgit@bling.home>

Patchwork-id: 55413

O-Subject: [RHEL7 qemu-kvm PATCH v2 2/2] vfio-pci: Add support for MSI affinity

Bugzilla: 1025477

RH-Acked-by: Bandan Das <bsd@redhat.com>

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Jeffrey Cody <jcody@redhat.com>

Bugzilla: 1025477

Upstream commit: c7679d450ee021eb0826be65e4e018884443643a

When MSI is accelerated through KVM the vectors are only programmed

when the guest first enables MSI support.  Subsequent writes to the

vector address or data fields are ignored.  Unfortunately that means

we're ignore updates done to adjust SMP affinity of the vectors.

MSI SMP affinity already works in non-KVM mode because the address

and data fields are read from their backing store on each interrupt.

This patch stores the MSIMessage programmed into KVM so that we can

determine when changes are made and update the routes.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

---

 hw/misc/vfio.c |   47 ++++++++++++++++++++++++++++++++++++++++-------

 1 file changed, 40 insertions(+), 7 deletions(-)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/misc/vfio.c |   47 ++++++++++++++++++++++++++++++++++++++++-------

 1 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c

index a072fd9..286dad1 100644

--- a/hw/misc/vfio.c

+++ b/hw/misc/vfio.c

@@ -119,6 +119,7 @@ typedef struct VFIOINTx {

 typedef struct VFIOMSIVector {

     EventNotifier interrupt; /* eventfd triggered on interrupt */

     struct VFIODevice *vdev; /* back pointer to device */

+    MSIMessage msg; /* cache the MSI message so we know when it changes */

     int virq; /* KVM irqchip route for QEMU bypass */

     bool use;

 } VFIOMSIVector;

@@ -795,7 +796,6 @@ retry:

     vdev->msi_vectors = g_malloc0(vdev->nr_vectors * sizeof(VFIOMSIVector));

     for (i = 0; i < vdev->nr_vectors; i++) {

-        MSIMessage msg;

         VFIOMSIVector *vector = &vdev->msi_vectors[i];

         vector->vdev = vdev;

@@ -805,13 +805,13 @@ retry:

             error_report("vfio: Error: event_notifier_init failed");

         }

-        msg = msi_get_message(&vdev->pdev, i);

+        vector->msg = msi_get_message(&vdev->pdev, i);

         /*

          * Attempt to enable route through KVM irqchip,

          * default to userspace handling if unavailable.

          */

-        vector->virq = kvm_irqchip_add_msi_route(kvm_state, msg);

+        vector->virq = kvm_irqchip_add_msi_route(kvm_state, vector->msg);

         if (vector->virq < 0 ||

             kvm_irqchip_add_irqfd_notifier(kvm_state, &vector->interrupt,

                                            vector->virq) < 0) {

@@ -917,6 +917,33 @@ static void vfio_disable_msi(VFIODevice *vdev)

             vdev->host.bus, vdev->host.slot, vdev->host.function);

 }

+static void vfio_update_msi(VFIODevice *vdev)

+{

+    int i;

+

+    for (i = 0; i < vdev->nr_vectors; i++) {

+        VFIOMSIVector *vector = &vdev->msi_vectors[i];

+        MSIMessage msg;

+

+        if (!vector->use || vector->virq < 0) {

+            continue;

+        }

+

+        msg = msi_get_message(&vdev->pdev, i);

+

+        if (msg.address != vector->msg.address ||

+            msg.data != vector->msg.data) {

+

+            DPRINTF("%s(%04x:%02x:%02x.%x) MSI vector %d changed\n",

+                    __func__, vdev->host.domain, vdev->host.bus,

+                    vdev->host.slot, vdev->host.function, i);

+

+            kvm_irqchip_update_msi_route(kvm_state, vector->virq, msg);

+            vector->msg = msg;

+        }

+    }

+}

+

 /*

  * IO Port/MMIO - Beware of the endians, VFIO is always little endian

  */

@@ -1834,10 +1861,16 @@ static void vfio_pci_write_config(PCIDevice *pdev, uint32_t addr,

         is_enabled = msi_enabled(pdev);

-        if (!was_enabled && is_enabled) {

-            vfio_enable_msi(vdev);

-        } else if (was_enabled && !is_enabled) {

-            vfio_disable_msi(vdev);

+        if (!was_enabled) {

+            if (is_enabled) {

+                vfio_enable_msi(vdev);

+            }

+        } else {

+            if (!is_enabled) {

+                vfio_disable_msi(vdev);

+            } else {

+                vfio_update_msi(vdev);

+            }

         }

     } else if (pdev->cap_present & QEMU_PCI_CAP_MSIX &&

         ranges_overlap(addr, len, pdev->msix_cap, MSIX_CAP_LENGTH)) {

-- 

1.7.1