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, alex.williamson@redhat.com,
mst@redhat.com, jean-philippe.brucker@arm.com
Cc: will.deacon@arm.com, kevin.tian@intel.com, drjones@redhat.com,
wei@redhat.com, tn@semihalf.com, bharat.bhushan@nxp.com,
peterx@redhat.com, linuc.decode@gmail.com
Subject: [Qemu-devel] [RFC v7 08/16] virtio-iommu: Implement translate
Date: Mon, 6 Aug 2018 22:14:36 +0200 [thread overview]
Message-ID: <1533586484-5737-9-git-send-email-eric.auger@redhat.com> (raw)
In-Reply-To: <1533586484-5737-1-git-send-email-eric.auger@redhat.com>
This patch implements the translate callback
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
v5 -> v6:
- replace error_report by qemu_log_mask
v4 -> v5:
- check the device domain is not NULL
- s/printf/error_report
- set flags to IOMMU_NONE in case of all translation faults
---
hw/virtio/trace-events | 1 +
hw/virtio/virtio-iommu.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
index 926c50b..4041af6 100644
--- a/hw/virtio/trace-events
+++ b/hw/virtio/trace-events
@@ -66,3 +66,4 @@ virtio_iommu_put_domain(uint32_t domain_id) "Free domain=%d"
virtio_iommu_unmap_left_interval(uint64_t low, uint64_t high, uint64_t next_low, uint64_t next_high) "Unmap left [0x%"PRIx64",0x%"PRIx64"], new interval=[0x%"PRIx64",0x%"PRIx64"]"
virtio_iommu_unmap_right_interval(uint64_t low, uint64_t high, uint64_t next_low, uint64_t next_high) "Unmap right [0x%"PRIx64",0x%"PRIx64"], new interval=[0x%"PRIx64",0x%"PRIx64"]"
virtio_iommu_unmap_inc_interval(uint64_t low, uint64_t high) "Unmap inc [0x%"PRIx64",0x%"PRIx64"]"
+virtio_iommu_translate_out(uint64_t virt_addr, uint64_t phys_addr, uint32_t sid) "0x%"PRIx64" -> 0x%"PRIx64 " for sid=%d"
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index f3a6799..6f44d15 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -489,19 +489,62 @@ static IOMMUTLBEntry virtio_iommu_translate(IOMMUMemoryRegion *mr, hwaddr addr,
int iommu_idx)
{
IOMMUDevice *sdev = container_of(mr, IOMMUDevice, iommu_mr);
+ VirtIOIOMMU *s = sdev->viommu;
uint32_t sid;
+ viommu_endpoint *ep;
+ viommu_mapping *mapping;
+ viommu_interval interval;
+
+ interval.low = addr;
+ interval.high = addr + 1;
IOMMUTLBEntry entry = {
.target_as = &address_space_memory,
.iova = addr,
.translated_addr = addr,
- .addr_mask = ~(hwaddr)0,
+ .addr_mask = (1 << ctz32(s->config.page_size_mask)) - 1,
.perm = IOMMU_NONE,
};
sid = virtio_iommu_get_sid(sdev);
trace_virtio_iommu_translate(mr->parent_obj.name, sid, addr, flag);
+ qemu_mutex_lock(&s->mutex);
+
+ ep = g_tree_lookup(s->endpoints, GUINT_TO_POINTER(sid));
+ if (!ep) {
+ error_report("%s sid=%d is not known!!", __func__, sid);
+ goto unlock;
+ }
+
+ if (!ep->domain) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s %02x:%02x.%01x not attached to any domain\n",
+ __func__, PCI_BUS_NUM(sid), PCI_SLOT(sid), PCI_FUNC(sid));
+ goto unlock;
+ }
+
+ mapping = g_tree_lookup(ep->domain->mappings, (gpointer)(&interval));
+ if (!mapping) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s no mapping for 0x%"PRIx64" for sid=%d\n",
+ __func__, addr, sid);
+ goto unlock;
+ }
+
+ if (((flag & IOMMU_RO) && !(mapping->flags & VIRTIO_IOMMU_MAP_F_READ)) ||
+ ((flag & IOMMU_WO) && !(mapping->flags & VIRTIO_IOMMU_MAP_F_WRITE))) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "Permission error on 0x%"PRIx64"(%d): allowed=%d\n",
+ addr, flag, mapping->flags);
+ goto unlock;
+ }
+ entry.translated_addr = addr - mapping->virt_addr + mapping->phys_addr;
+ entry.perm = flag;
+ trace_virtio_iommu_translate_out(addr, entry.translated_addr, sid);
+
+unlock:
+ qemu_mutex_unlock(&s->mutex);
return entry;
}
--
2.5.5
next prev parent reply other threads:[~2018-08-06 20:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-06 20:14 [Qemu-devel] [RFC v7 00/16] VIRTIO-IOMMU device Eric Auger
2018-08-06 20:14 ` [Qemu-devel] [RFC v7 01/16] linux-headers: Partial update for virtio-iommu v0.7 Eric Auger
2018-08-06 20:14 ` [Qemu-devel] [RFC v7 02/16] virtio-iommu: Add skeleton Eric Auger
2018-08-06 20:14 ` [Qemu-devel] [RFC v7 03/16] virtio-iommu: Decode the command payload Eric Auger
2018-08-06 20:14 ` [Qemu-devel] [RFC v7 04/16] virtio-iommu: Add the iommu regions Eric Auger
2018-08-06 20:14 ` [Qemu-devel] [RFC v7 05/16] virtio-iommu: Endpoint and domains structs and helpers Eric Auger
2018-08-06 20:14 ` [Qemu-devel] [RFC v7 06/16] virtio-iommu: Implement attach/detach command Eric Auger
2018-08-06 20:14 ` [Qemu-devel] [RFC v7 07/16] virtio-iommu: Implement map/unmap Eric Auger
2018-08-06 20:14 ` Eric Auger [this message]
2018-08-06 20:14 ` [Qemu-devel] [RFC v7 09/16] virtio-iommu: Implement probe request Eric Auger
2018-08-06 20:14 ` [Qemu-devel] [RFC v7 10/16] virtio-iommu: Add an msi_bypass property Eric Auger
2018-08-06 20:14 ` [Qemu-devel] [RFC v7 11/16] virtio-iommu: Implement fault reporting Eric Auger
2018-08-06 20:14 ` [Qemu-devel] [RFC v7 12/16] virtio_iommu: Handle reserved regions in translation process Eric Auger
2018-08-06 20:14 ` [Qemu-devel] [RFC v7 13/16] qdev: export qbus_find_recursive Eric Auger
2018-08-06 20:14 ` [Qemu-devel] [RFC v7 14/16] hw/arm/virt: Add virtio-iommu to the virt board Eric Auger
2018-08-06 20:14 ` [Qemu-devel] [RFC v7 15/16] hw/arm/virt-acpi-build: Add virtio-iommu node in IORT table Eric Auger
2018-08-06 20:14 ` [Qemu-devel] [RFC v7 16/16] hw/arm/virt: Allow virtio-iommu instantiation Eric Auger
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=1533586484-5737-9-git-send-email-eric.auger@redhat.com \
--to=eric.auger@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=bharat.bhushan@nxp.com \
--cc=drjones@redhat.com \
--cc=eric.auger.pro@gmail.com \
--cc=jean-philippe.brucker@arm.com \
--cc=kevin.tian@intel.com \
--cc=linuc.decode@gmail.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=tn@semihalf.com \
--cc=wei@redhat.com \
--cc=will.deacon@arm.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).