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,
alex.williamson@redhat.com, clg@redhat.com,
jean-philippe@linaro.org, mst@redhat.com, pbonzini@redhat.com
Cc: peter.maydell@linaro.org, peterx@redhat.com, david@redhat.com,
philmd@linaro.org
Subject: [PATCH v2 06/12] range: Introduce range_inverse_array()
Date: Wed, 13 Sep 2023 10:01:41 +0200 [thread overview]
Message-ID: <20230913080423.523953-7-eric.auger@redhat.com> (raw)
In-Reply-To: <20230913080423.523953-1-eric.auger@redhat.com>
This helper reverses an array of regions, turning original
regions into holes and original holes into actual regions,
covering the whole UINT64_MAX span.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
v1 -> v2:
- Move range_inverse_array description comment in the header
- Take low/high params
---
include/qemu/range.h | 8 ++++++++
util/range.c | 45 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/include/qemu/range.h b/include/qemu/range.h
index 7e2b1cc447..2b59e3bf0c 100644
--- a/include/qemu/range.h
+++ b/include/qemu/range.h
@@ -219,4 +219,12 @@ static inline int ranges_overlap(uint64_t first1, uint64_t len1,
GList *range_list_insert(GList *list, Range *data);
+/*
+ * Inverse an array of sorted ranges over the [low, high] span, ie.
+ * original ranges becomes holes in the newly allocated inv_ranges
+ */
+void range_inverse_array(uint32_t nr_ranges, Range *ranges,
+ uint32_t *nr_inv_ranges, Range **inv_ranges,
+ uint64_t low, uint64_t high);
+
#endif
diff --git a/util/range.c b/util/range.c
index 098d9d2dc0..4baeb588cc 100644
--- a/util/range.c
+++ b/util/range.c
@@ -70,3 +70,48 @@ GList *range_list_insert(GList *list, Range *data)
return list;
}
+
+void range_inverse_array(uint32_t nr_ranges, Range *ranges,
+ uint32_t *nr_inv_ranges, Range **inv_ranges,
+ uint64_t low, uint64_t high)
+{
+ Range *resv;
+ int i = 0, j = 0;
+
+ resv = g_malloc0_n(nr_ranges + 1, sizeof(Range));
+
+ for (; j < nr_ranges && (range_upb(&ranges[j]) < low); j++) {
+ continue; /* skip all ranges below mon */
+ }
+
+ if (j == nr_ranges) {
+ range_set_bounds(&resv[i++], low, high);
+ goto realloc;
+ }
+
+ /* first range lob is greater than min, insert a first range */
+ if (range_lob(&ranges[j]) > low) {
+ range_set_bounds(&resv[i++], low,
+ MIN(range_lob(&ranges[j]) - 1, high));
+ }
+
+ /* insert a range inbetween each original range until we reach max */
+ for (; j < nr_ranges - 1; j++) {
+ if (range_lob(&ranges[j]) >= high) {
+ goto realloc;
+ }
+ if (range_compare(&ranges[j], &ranges[j + 1])) {
+ range_set_bounds(&resv[i++], range_upb(&ranges[j]) + 1,
+ MIN(range_lob(&ranges[j + 1]) - 1, high));
+ }
+ }
+ /* last range upb is less than max, insert a last range */
+ if (range_upb(&ranges[j]) < high) {
+ range_set_bounds(&resv[i++],
+ range_upb(&ranges[j]) + 1, high);
+ }
+realloc:
+ *nr_inv_ranges = i;
+ resv = g_realloc(resv, i * sizeof(Range));
+ *inv_ranges = resv;
+}
--
2.41.0
next prev parent reply other threads:[~2023-09-13 8:07 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-13 8:01 [PATCH v2 00/12] VIRTIO-IOMMU/VFIO: Don't assume 64b IOVA space Eric Auger
2023-09-13 8:01 ` [PATCH v2 01/12] memory: Let ReservedRegion use Range Eric Auger
2023-09-13 12:43 ` Cédric Le Goater
2023-09-13 8:01 ` [PATCH v2 02/12] memory: Introduce memory_region_iommu_set_iova_ranges Eric Auger
2023-09-13 12:43 ` Cédric Le Goater
2023-09-20 7:40 ` Eric Auger
2023-09-13 8:01 ` [PATCH v2 03/12] vfio: Collect container iova range info Eric Auger
2023-09-13 12:55 ` Cédric Le Goater
2023-09-20 7:38 ` Eric Auger
2023-09-19 15:44 ` Alex Williamson
2023-09-20 7:15 ` Eric Auger
2023-09-20 7:39 ` Eric Auger
2023-09-13 8:01 ` [PATCH v2 04/12] virtio-iommu: Rename reserved_regions into prop_resv_regions Eric Auger
2023-09-13 13:01 ` Cédric Le Goater
2023-09-13 8:01 ` [PATCH v2 05/12] virtio-iommu: Introduce per IOMMUDevice reserved regions Eric Auger
2023-09-29 15:52 ` Jean-Philippe Brucker
2023-10-03 15:48 ` Eric Auger
2023-09-13 8:01 ` Eric Auger [this message]
2023-09-19 16:29 ` [PATCH v2 06/12] range: Introduce range_inverse_array() Alex Williamson
2023-09-20 7:24 ` Eric Auger
2023-09-13 8:01 ` [PATCH v2 07/12] virtio-iommu: Implement set_iova_ranges() callback Eric Auger
2023-09-29 16:15 ` Jean-Philippe Brucker
2023-10-10 14:36 ` Eric Auger
2023-09-13 8:01 ` [PATCH v2 08/12] range: Make range_compare() public Eric Auger
2023-09-13 8:01 ` [PATCH v2 09/12] util/reserved-region: Add new ReservedRegion helpers Eric Auger
2023-09-29 16:16 ` Jean-Philippe Brucker
2023-10-10 13:51 ` Eric Auger
2023-09-13 8:01 ` [PATCH v2 10/12] virtio-iommu: Consolidate host reserved regions and property set ones Eric Auger
2023-09-13 8:01 ` [PATCH v2 11/12] test: Add some tests for range and resv-mem helpers Eric Auger
2023-09-13 8:01 ` [PATCH v2 12/12] vfio: Remove 64-bit IOVA address space assumption Eric Auger
2023-09-19 17:22 ` Alex Williamson
2023-09-20 7:28 ` Eric Auger
2023-09-26 20:00 ` Eric Auger
2023-10-10 17:16 ` Eric Auger
2023-09-20 20:02 ` Alex Williamson
2023-10-11 17:32 ` Eric Auger
2023-09-26 8:06 ` [PATCH v2 00/12] VIRTIO-IOMMU/VFIO: Don't assume 64b IOVA space YangHang Liu
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=20230913080423.523953-7-eric.auger@redhat.com \
--to=eric.auger@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=clg@redhat.com \
--cc=david@redhat.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=philmd@linaro.org \
--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).