diff mbox series

[v2,01/12] memory: Let ReservedRegion use Range

Message ID 20230913080423.523953-2-eric.auger@redhat.com (mailing list archive)
State New, archived
Headers show
Series VIRTIO-IOMMU/VFIO: Don't assume 64b IOVA space | expand

Commit Message

Eric Auger Sept. 13, 2023, 8:01 a.m. UTC 
A reserved region is a range tagged with a type. Let's directly use
the Range type in the prospect to reuse some of the library helpers
shipped with the Range type.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

---

v1 -> v2:
- Added Philippe and David's R-b
---
 include/exec/memory.h            | 4 ++--
 hw/core/qdev-properties-system.c | 9 ++++++---
 hw/virtio/virtio-iommu.c         | 6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

Comments

Cédric Le Goater Sept. 13, 2023, 12:43 p.m. UTC | #1 
On 9/13/23 10:01, Eric Auger wrote:
> A reserved region is a range tagged with a type. Let's directly use
> the Range type in the prospect to reuse some of the library helpers
> shipped with the Range type.
> 
> Signed-off-by: Eric Auger <eric.auger@redhat.com>
> Reviewed-by: David Hildenbrand <david@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> 
> ---
> 
> v1 -> v2:
> - Added Philippe and David's R-b
> ---
>   include/exec/memory.h            | 4 ++--
>   hw/core/qdev-properties-system.c | 9 ++++++---
>   hw/virtio/virtio-iommu.c         | 6 +++---
>   3 files changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/include/exec/memory.h b/include/exec/memory.h
> index 68284428f8..184cb3a01b 100644
> --- a/include/exec/memory.h
> +++ b/include/exec/memory.h
> @@ -24,6 +24,7 @@
>   #include "qemu/bswap.h"
>   #include "qemu/queue.h"
>   #include "qemu/int128.h"
> +#include "qemu/range.h"
>   #include "qemu/notify.h"
>   #include "qom/object.h"
>   #include "qemu/rcu.h"
> @@ -79,8 +80,7 @@ extern unsigned int global_dirty_tracking;
>   typedef struct MemoryRegionOps MemoryRegionOps;
>   
>   struct ReservedRegion {
> -    hwaddr low;
> -    hwaddr high;
> +    Range range;
>       unsigned type;
>   };
>   
> diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
> index 6d5d43eda2..8d486eeefd 100644
> --- a/hw/core/qdev-properties-system.c
> +++ b/hw/core/qdev-properties-system.c
> @@ -699,7 +699,7 @@ static void get_reserved_region(Object *obj, Visitor *v, const char *name,
>       int rc;
>   
>       rc = snprintf(buffer, sizeof(buffer), "0x%"PRIx64":0x%"PRIx64":%u",
> -                  rr->low, rr->high, rr->type);
> +                  range_lob(&rr->range), range_upb(&rr->range), rr->type);
>       assert(rc < sizeof(buffer));
>   
>       visit_type_str(v, name, &p, errp);
> @@ -711,6 +711,7 @@ static void set_reserved_region(Object *obj, Visitor *v, const char *name,
>       Property *prop = opaque;
>       ReservedRegion *rr = object_field_prop_ptr(obj, prop);
>       const char *endptr;
> +    uint64_t lob, upb;
>       char *str;
>       int ret;
>   
> @@ -718,7 +719,7 @@ static void set_reserved_region(Object *obj, Visitor *v, const char *name,
>           return;
>       }
>   
> -    ret = qemu_strtou64(str, &endptr, 16, &rr->low);
> +    ret = qemu_strtou64(str, &endptr, 16, &lob);
>       if (ret) {
>           error_setg(errp, "start address of '%s'"
>                      " must be a hexadecimal integer", name);
> @@ -728,7 +729,7 @@ static void set_reserved_region(Object *obj, Visitor *v, const char *name,
>           goto separator_error;
>       }
>   
> -    ret = qemu_strtou64(endptr + 1, &endptr, 16, &rr->high);
> +    ret = qemu_strtou64(endptr + 1, &endptr, 16, &upb);
>       if (ret) {
>           error_setg(errp, "end address of '%s'"
>                      " must be a hexadecimal integer", name);
> @@ -738,6 +739,8 @@ static void set_reserved_region(Object *obj, Visitor *v, const char *name,
>           goto separator_error;
>       }
>   
> +    range_set_bounds(&rr->range, lob, upb);
> +
>       ret = qemu_strtoui(endptr + 1, &endptr, 10, &rr->type);
>       if (ret) {
>           error_setg(errp, "type of '%s'"
> diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
> index be51635895..e5e46e1b55 100644
> --- a/hw/virtio/virtio-iommu.c
> +++ b/hw/virtio/virtio-iommu.c
> @@ -645,8 +645,8 @@ static ssize_t virtio_iommu_fill_resv_mem_prop(VirtIOIOMMU *s, uint32_t ep,
>           prop.head.type = cpu_to_le16(VIRTIO_IOMMU_PROBE_T_RESV_MEM);
>           prop.head.length = cpu_to_le16(length);
>           prop.subtype = subtype;
> -        prop.start = cpu_to_le64(s->reserved_regions[i].low);
> -        prop.end = cpu_to_le64(s->reserved_regions[i].high);
> +        prop.start = cpu_to_le64(range_lob(&s->reserved_regions[i].range));
> +        prop.end = cpu_to_le64(range_upb(&s->reserved_regions[i].range));
>   
>           memcpy(buf, &prop, size);
>   
> @@ -897,7 +897,7 @@ static IOMMUTLBEntry virtio_iommu_translate(IOMMUMemoryRegion *mr, hwaddr addr,
>       for (i = 0; i < s->nb_reserved_regions; i++) {
>           ReservedRegion *reg = &s->reserved_regions[i];
>   
> -        if (addr >= reg->low && addr <= reg->high) {
> +        if (range_contains(&reg->range, addr)) {
>               switch (reg->type) {
>               case VIRTIO_IOMMU_RESV_MEM_T_MSI:
>                   entry.perm = flag;
diff mbox series

Patch

diff --git a/include/exec/memory.h b/include/exec/memory.h
index 68284428f8..184cb3a01b 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -24,6 +24,7 @@ 
 #include "qemu/bswap.h"
 #include "qemu/queue.h"
 #include "qemu/int128.h"
+#include "qemu/range.h"
 #include "qemu/notify.h"
 #include "qom/object.h"
 #include "qemu/rcu.h"
@@ -79,8 +80,7 @@  extern unsigned int global_dirty_tracking;
 typedef struct MemoryRegionOps MemoryRegionOps;
 
 struct ReservedRegion {
-    hwaddr low;
-    hwaddr high;
+    Range range;
     unsigned type;
 };
 
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 6d5d43eda2..8d486eeefd 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -699,7 +699,7 @@  static void get_reserved_region(Object *obj, Visitor *v, const char *name,
     int rc;
 
     rc = snprintf(buffer, sizeof(buffer), "0x%"PRIx64":0x%"PRIx64":%u",
-                  rr->low, rr->high, rr->type);
+                  range_lob(&rr->range), range_upb(&rr->range), rr->type);
     assert(rc < sizeof(buffer));
 
     visit_type_str(v, name, &p, errp);
@@ -711,6 +711,7 @@  static void set_reserved_region(Object *obj, Visitor *v, const char *name,
     Property *prop = opaque;
     ReservedRegion *rr = object_field_prop_ptr(obj, prop);
     const char *endptr;
+    uint64_t lob, upb;
     char *str;
     int ret;
 
@@ -718,7 +719,7 @@  static void set_reserved_region(Object *obj, Visitor *v, const char *name,
         return;
     }
 
-    ret = qemu_strtou64(str, &endptr, 16, &rr->low);
+    ret = qemu_strtou64(str, &endptr, 16, &lob);
     if (ret) {
         error_setg(errp, "start address of '%s'"
                    " must be a hexadecimal integer", name);
@@ -728,7 +729,7 @@  static void set_reserved_region(Object *obj, Visitor *v, const char *name,
         goto separator_error;
     }
 
-    ret = qemu_strtou64(endptr + 1, &endptr, 16, &rr->high);
+    ret = qemu_strtou64(endptr + 1, &endptr, 16, &upb);
     if (ret) {
         error_setg(errp, "end address of '%s'"
                    " must be a hexadecimal integer", name);
@@ -738,6 +739,8 @@  static void set_reserved_region(Object *obj, Visitor *v, const char *name,
         goto separator_error;
     }
 
+    range_set_bounds(&rr->range, lob, upb);
+
     ret = qemu_strtoui(endptr + 1, &endptr, 10, &rr->type);
     if (ret) {
         error_setg(errp, "type of '%s'"
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index be51635895..e5e46e1b55 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -645,8 +645,8 @@  static ssize_t virtio_iommu_fill_resv_mem_prop(VirtIOIOMMU *s, uint32_t ep,
         prop.head.type = cpu_to_le16(VIRTIO_IOMMU_PROBE_T_RESV_MEM);
         prop.head.length = cpu_to_le16(length);
         prop.subtype = subtype;
-        prop.start = cpu_to_le64(s->reserved_regions[i].low);
-        prop.end = cpu_to_le64(s->reserved_regions[i].high);
+        prop.start = cpu_to_le64(range_lob(&s->reserved_regions[i].range));
+        prop.end = cpu_to_le64(range_upb(&s->reserved_regions[i].range));
 
         memcpy(buf, &prop, size);
 
@@ -897,7 +897,7 @@  static IOMMUTLBEntry virtio_iommu_translate(IOMMUMemoryRegion *mr, hwaddr addr,
     for (i = 0; i < s->nb_reserved_regions; i++) {
         ReservedRegion *reg = &s->reserved_regions[i];
 
-        if (addr >= reg->low && addr <= reg->high) {
+        if (range_contains(&reg->range, addr)) {
             switch (reg->type) {
             case VIRTIO_IOMMU_RESV_MEM_T_MSI:
                 entry.perm = flag;