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, mst@redhat.com, armbru@redhat.com,
	pbonzini@redhat.com, jean-philippe@linaro.org,
	bbhushan2@marvell.com, peterx@redhat.com
Subject: [PATCH v5 3/5] virtio-iommu: Handle reserved regions in the translation process
Date: Wed, 24 Jun 2020 15:26:23 +0200	[thread overview]
Message-ID: <20200624132625.27453-4-eric.auger@redhat.com> (raw)
In-Reply-To: <20200624132625.27453-1-eric.auger@redhat.com>

When translating an address we need to check if it belongs to
a reserved virtual address range. If it does, there are 2 cases:

- it belongs to a RESERVED region: the guest should neither use
  this address in a MAP not instruct the end-point to DMA on
  them. We report an error

- It belongs to an MSI region: we bypass the translation.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>

---

v1 -> v2:
- use addr when testing addr belongs to the reserved region
  and use a block local variable
---
 hw/virtio/virtio-iommu.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index aabc3e36b1..d0541ec4ad 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -605,6 +605,7 @@ static IOMMUTLBEntry virtio_iommu_translate(IOMMUMemoryRegion *mr, hwaddr addr,
     uint32_t sid, flags;
     bool bypass_allowed;
     bool found;
+    int i;
 
     interval.low = addr;
     interval.high = addr + 1;
@@ -638,6 +639,25 @@ static IOMMUTLBEntry virtio_iommu_translate(IOMMUMemoryRegion *mr, hwaddr addr,
         goto unlock;
     }
 
+    for (i = 0; i < s->nb_reserved_regions; i++) {
+        ReservedRegion *reg = &s->reserved_regions[i];
+
+        if (addr >= reg->low && addr <= reg->high) {
+            switch (reg->type) {
+            case VIRTIO_IOMMU_RESV_MEM_T_MSI:
+                entry.perm = flag;
+                break;
+            case VIRTIO_IOMMU_RESV_MEM_T_RESERVED:
+            default:
+                virtio_iommu_report_fault(s, VIRTIO_IOMMU_FAULT_R_MAPPING,
+                                          VIRTIO_IOMMU_FAULT_F_ADDRESS,
+                                          sid, addr);
+                break;
+            }
+            goto unlock;
+        }
+    }
+
     if (!ep->domain) {
         if (!bypass_allowed) {
             error_report_once("%s %02x:%02x.%01x not attached to any domain",
-- 
2.20.1



  parent reply	other threads:[~2020-06-24 13:30 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-24 13:26 [PATCH v5 0/5] VIRTIO-IOMMU probe request support and MSI bypass on ARM Eric Auger
2020-06-24 13:26 ` [PATCH v5 1/5] qdev: Introduce DEFINE_PROP_RESERVED_REGION Eric Auger
2020-06-24 13:26 ` [PATCH v5 2/5] virtio-iommu: Implement RESV_MEM probe request Eric Auger
2020-06-25  7:05   ` Markus Armbruster
2020-06-25 10:12     ` Peter Maydell
2020-06-26  7:42       ` Auger Eric
2020-06-26  7:41     ` Auger Eric
2020-06-26  8:53       ` Markus Armbruster
2020-06-26  9:09         ` Auger Eric
2020-06-24 13:26 ` Eric Auger [this message]
2020-06-24 13:26 ` [PATCH v5 4/5] virtio-iommu-pci: Add array of Interval properties Eric Auger
2020-06-24 13:26 ` [PATCH v5 5/5] hw/arm/virt: Let the virtio-iommu bypass MSIs Eric Auger
2020-06-25 10:01   ` Peter Maydell
2020-06-26  7:42     ` Auger Eric
2020-06-24 13:47 ` [PATCH v5 0/5] VIRTIO-IOMMU probe request support and MSI bypass on ARM Michael S. Tsirkin
2020-06-26  7:56   ` Jean-Philippe Brucker
2020-06-24 15:16 ` Michael S. Tsirkin
2020-06-25 10:02   ` Peter Maydell

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=20200624132625.27453-4-eric.auger@redhat.com \
    --to=eric.auger@redhat.com \
    --cc=armbru@redhat.com \
    --cc=bbhushan2@marvell.com \
    --cc=eric.auger.pro@gmail.com \
    --cc=jean-philippe@linaro.org \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=peterx@redhat.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /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).