From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
peter.maydell@linaro.org, alex.williamson@redhat.com,
mst@redhat.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org,
jean-philippe.brucker@arm.com
Cc: will.deacon@arm.com, kevin.tian@intel.com, marc.zyngier@arm.com,
christoffer.dall@linaro.org, drjones@redhat.com, wei@redhat.com,
tn@semihalf.com, bharat.bhushan@nxp.com, peterx@redhat.com,
linuc.decode@gmail.com
Subject: [Qemu-devel] [RFC v6 21/22] virtio-iommu: Implement set_page_size_mask
Date: Mon, 12 Feb 2018 18:58:23 +0000 [thread overview]
Message-ID: <1518461904-5305-22-git-send-email-eric.auger@redhat.com> (raw)
In-Reply-To: <1518461904-5305-1-git-send-email-eric.auger@redhat.com>
We implement the set_page_size_mask callback to allow the
virtio-iommu to be aware of any restrictions on the page size
mask due to an underlying HW IOMMU.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
hw/virtio/trace-events | 1 +
hw/virtio/virtio-iommu.c | 16 ++++++++++++++++
2 files changed, 17 insertions(+)
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
index ce718e8..1145995 100644
--- a/hw/virtio/trace-events
+++ b/hw/virtio/trace-events
@@ -55,3 +55,4 @@ virtio_iommu_translate_out(uint64_t virt_addr, uint64_t phys_addr, uint32_t sid)
virtio_iommu_fill_resv_property(uint32_t devid, uint8_t subtype, uint64_t addr, uint64_t size, uint32_t flags, size_t filled) "dev= %d, subtype=%d addr=0x%"PRIx64" size=0x%"PRIx64" flags=%d filled=0x%lx"
virtio_iommu_fill_none_property(uint32_t devid) "devid=%d"
virtio_iommu_report_fault(uint8_t reason, uint32_t flags, uint32_t endpoint, uint64_t addr) "FAULT reason=%d flags=%d endpoint=%d address =0x%"PRIx64
+virtio_iommu_set_page_size_mask(const char *iommu_mr, uint64_t mask) "mr=%s page_size_mask=0x%"PRIx64
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index a8fabef..1a15ccc 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -837,6 +837,21 @@ unlock:
return entry;
}
+static void virtio_iommu_set_page_size_mask(IOMMUMemoryRegion *mr,
+ uint64_t page_size_mask)
+{
+ IOMMUDevice *sdev = container_of(mr, IOMMUDevice, iommu_mr);
+ VirtIOIOMMU *s = sdev->viommu;
+
+ s->config.page_size_mask &= page_size_mask;
+ if (!s->config.page_size_mask) {
+ error_setg(&error_fatal,
+ "No compatible page size between guest and host iommus");
+ }
+
+ trace_virtio_iommu_set_page_size_mask(mr->parent_obj.name, page_size_mask);
+}
+
static void virtio_iommu_get_config(VirtIODevice *vdev, uint8_t *config_data)
{
VirtIOIOMMU *dev = VIRTIO_IOMMU(vdev);
@@ -1027,6 +1042,7 @@ static void virtio_iommu_memory_region_class_init(ObjectClass *klass,
IOMMUMemoryRegionClass *imrc = IOMMU_MEMORY_REGION_CLASS(klass);
imrc->translate = virtio_iommu_translate;
+ imrc->set_page_size_mask = virtio_iommu_set_page_size_mask;
}
static const TypeInfo virtio_iommu_info = {
--
1.9.1
next prev parent reply other threads:[~2018-02-12 19:01 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-12 18:58 [Qemu-devel] [RFC v6 00/22] VIRTIO-IOMMU device Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 01/22] machine: Add a get_primary_pci_bus callback Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 02/22] hw/arm/virt: Implement get_primary_pci_bus Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 03/22] pc: " Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 04/22] update-linux-headers: Import virtio_iommu.h Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 05/22] linux-headers: Partial update for virtio-iommu v0.6 Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 06/22] virtio-iommu: Add skeleton Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 07/22] virtio-iommu: Decode the command payload Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 08/22] virtio-iommu: Add the iommu regions Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 09/22] virtio-iommu: Register attached endpoints Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 10/22] virtio-iommu: Implement attach/detach command Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 11/22] virtio-iommu: Implement map/unmap Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 12/22] virtio-iommu: Implement translate Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 13/22] virtio-iommu: Implement probe request Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 14/22] virtio-iommu: Add an msi_bypass property Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 15/22] virtio-iommu: Implement fault reporting Eric Auger
2018-03-21 13:15 ` Jean-Philippe Brucker
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 16/22] virtio_iommu: Handle reserved regions in translation process Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 17/22] hw/arm/virt: Add virtio-iommu to the virt board Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 18/22] hw/arm/virt-acpi-build: Add virtio-iommu node in IORT table Eric Auger
2018-02-13 12:24 ` Andrew Jones
2018-02-13 13:22 ` Auger Eric
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 19/22] memory.h: Add set_page_size_mask IOMMUMemoryRegion callback Eric Auger
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 20/22] hw/vfio/common: Set the IOMMUMemoryRegion supported page sizes Eric Auger
2018-02-12 18:58 ` Eric Auger [this message]
2018-02-12 18:58 ` [Qemu-devel] [RFC v6 22/22] hw/vfio/common: Do not print error when viommu translates into an mmio region 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=1518461904-5305-22-git-send-email-eric.auger@redhat.com \
--to=eric.auger@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=bharat.bhushan@nxp.com \
--cc=christoffer.dall@linaro.org \
--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=marc.zyngier@arm.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).