qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
	qemu-devel@nongnu.org, qemu-arm@nongnu.org,
	peter.maydell@linaro.org, prem.mallappa@gmail.com
Cc: alex.williamson@redhat.com, tn@semihalf.com, mst@redhat.com,
	cdall@kernel.org, bharat.bhushan@nxp.com,
	jean-philippe.brucker@arm.com, linuc.decode@gmail.com,
	peterx@redhat.com, jintack@cs.columbia.edu
Subject: [Qemu-devel] [PATCH v12 11/17] target/arm/kvm: Translate the MSI doorbell in kvm_arch_fixup_msi_route
Date: Wed, 25 Apr 2018 16:15:56 +0200	[thread overview]
Message-ID: <1524665762-31355-12-git-send-email-eric.auger@redhat.com> (raw)
In-Reply-To: <1524665762-31355-1-git-send-email-eric.auger@redhat.com>

In case the MSI is translated by an IOMMU we need to fixup the
MSI route with the translated address.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Bharat Bhushan <Bharat.Bhushan@nxp.com>

---
v11 -> v12:
- fix rcu_read_lock and mr ref leaks
- check mrs.mr

v9 -> v10:
- use address_space_translate

v5 -> v6:
- use IOMMUMemoryRegionClass API
---
 target/arm/kvm.c        | 38 +++++++++++++++++++++++++++++++++++++-
 target/arm/trace-events |  3 +++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index ecc39ac..5141d0a 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -20,8 +20,10 @@
 #include "sysemu/kvm.h"
 #include "kvm_arm.h"
 #include "cpu.h"
+#include "trace.h"
 #include "internals.h"
 #include "hw/arm/arm.h"
+#include "hw/pci/pci.h"
 #include "exec/memattrs.h"
 #include "exec/address-spaces.h"
 #include "hw/boards.h"
@@ -649,7 +651,41 @@ int kvm_arm_vgic_probe(void)
 int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
                              uint64_t address, uint32_t data, PCIDevice *dev)
 {
-    return 0;
+    AddressSpace *as = pci_device_iommu_address_space(dev);
+    hwaddr xlat, len, doorbell_gpa;
+    MemoryRegionSection mrs;
+    MemoryRegion *mr;
+    int ret = 1;
+
+    if (as == &address_space_memory) {
+        return 0;
+    }
+
+    /* MSI doorbell address is translated by an IOMMU */
+
+    rcu_read_lock();
+    mr = address_space_translate(as, address, &xlat, &len, true);
+    if (!mr) {
+        goto unlock;
+    }
+    mrs = memory_region_find(mr, xlat, 1);
+    if (!mrs.mr) {
+        goto unlock;
+    }
+
+    doorbell_gpa = mrs.offset_within_address_space;
+    memory_region_unref(mrs.mr);
+
+    route->u.msi.address_lo = doorbell_gpa;
+    route->u.msi.address_hi = doorbell_gpa >> 32;
+
+    trace_kvm_arm_fixup_msi_route(address, doorbell_gpa);
+
+    ret = 0;
+
+unlock:
+    rcu_read_unlock();
+    return ret;
 }
 
 int kvm_arch_add_msi_route_post(struct kvm_irq_routing_entry *route,
diff --git a/target/arm/trace-events b/target/arm/trace-events
index 9e37131..6b759f9 100644
--- a/target/arm/trace-events
+++ b/target/arm/trace-events
@@ -8,3 +8,6 @@ arm_gt_tval_write(int timer, uint64_t value) "gt_tval_write: timer %d value 0x%"
 arm_gt_ctl_write(int timer, uint64_t value) "gt_ctl_write: timer %d value 0x%" PRIx64
 arm_gt_imask_toggle(int timer, int irqstate) "gt_ctl_write: timer %d IMASK toggle, new irqstate %d"
 arm_gt_cntvoff_write(uint64_t value) "gt_cntvoff_write: value 0x%" PRIx64
+
+# target/arm/kvm.c
+kvm_arm_fixup_msi_route(uint64_t iova, uint64_t gpa) "MSI iova = 0x%"PRIx64" is translated into 0x%"PRIx64
-- 
2.5.5

  parent reply	other threads:[~2018-04-25 14:16 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-25 14:15 [Qemu-devel] [PATCH v12 00/17] ARM SMMUv3 Emulation Support Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 01/17] hw/arm/smmu-common: smmu base device and datatypes Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 02/17] hw/arm/smmu-common: IOMMU memory region and address space setup Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 03/17] hw/arm/smmu-common: VMSAv8-64 page table walk Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 04/17] hw/arm/smmuv3: Skeleton Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 05/17] hw/arm/smmuv3: Wired IRQ and GERROR helpers Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 06/17] hw/arm/smmuv3: Queue helpers Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 07/17] hw/arm/smmuv3: Implement MMIO write operations Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 08/17] hw/arm/smmuv3: Event queue recording helper Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 09/17] hw/arm/smmuv3: Implement translate callback Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 10/17] hw/arm/smmuv3: Abort on vfio or vhost case Eric Auger
2018-04-25 14:15 ` Eric Auger [this message]
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 12/17] hw/arm/virt: Add SMMUv3 to the virt board Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 13/17] hw/arm/virt-acpi-build: Add smmuv3 node in IORT table Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 14/17] hw/arm/virt: Introduce the iommu option Eric Auger
2018-04-25 14:16 ` [Qemu-devel] [PATCH v12 15/17] hw/arm/smmuv3: Cache/invalidate config data Eric Auger
2018-04-25 14:16 ` [Qemu-devel] [PATCH v12 16/17] hw/arm/smmuv3: IOTLB emulation Eric Auger
2018-04-25 14:16 ` [Qemu-devel] [PATCH v12 17/17] hw/arm/smmuv3: Add notifications on invalidation Eric Auger
2018-05-04 16:51 ` [Qemu-devel] [PATCH v12 00/17] ARM SMMUv3 Emulation Support Peter Maydell
2018-05-04 16:52   ` Auger Eric

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=1524665762-31355-12-git-send-email-eric.auger@redhat.com \
    --to=eric.auger@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=bharat.bhushan@nxp.com \
    --cc=cdall@kernel.org \
    --cc=eric.auger.pro@gmail.com \
    --cc=jean-philippe.brucker@arm.com \
    --cc=jintack@cs.columbia.edu \
    --cc=linuc.decode@gmail.com \
    --cc=mst@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=peterx@redhat.com \
    --cc=prem.mallappa@gmail.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=tn@semihalf.com \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).