From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Williamson" <alex.williamson@redhat.com>,
"Eric Auger" <eric.auger@redhat.com>,
"Jean-Philippe Brucker" <jean-philippe@linaro.org>,
"Yanghang Liu" <yanghliu@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>
Subject: [PULL 06/22] util/reserved-region: Add new ReservedRegion helpers
Date: Mon, 6 Nov 2023 15:36:37 +0100 [thread overview]
Message-ID: <20231106143653.302391-7-clg@redhat.com> (raw)
In-Reply-To: <20231106143653.302391-1-clg@redhat.com>
From: Eric Auger <eric.auger@redhat.com>
Introduce resv_region_list_insert() helper which inserts
a new ReservedRegion into a sorted list of reserved region.
In case of overlap, the new region has higher priority and
hides the existing overlapped segments. If the overlap is
partial, new regions are created for parts which are not
overlapped. The new region has higher priority independently
on the type of the regions.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Tested-by: Yanghang Liu <yanghliu@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
include/qemu/reserved-region.h | 32 ++++++++++++
util/reserved-region.c | 91 ++++++++++++++++++++++++++++++++++
util/meson.build | 1 +
3 files changed, 124 insertions(+)
create mode 100644 include/qemu/reserved-region.h
create mode 100644 util/reserved-region.c
diff --git a/include/qemu/reserved-region.h b/include/qemu/reserved-region.h
new file mode 100644
index 0000000000000000000000000000000000000000..8e6f0a97e22bdda67645f807e6b5e9cf04093dce
--- /dev/null
+++ b/include/qemu/reserved-region.h
@@ -0,0 +1,32 @@
+/*
+ * QEMU ReservedRegion helpers
+ *
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef QEMU_RESERVED_REGION_H
+#define QEMU_RESERVED_REGION_H
+
+#include "exec/memory.h"
+
+/*
+ * Insert a new region into a sorted list of reserved regions. In case
+ * there is overlap with existing regions, the new added region has
+ * higher priority and replaces the overlapped segment.
+ */
+GList *resv_region_list_insert(GList *list, ReservedRegion *reg);
+
+#endif
diff --git a/util/reserved-region.c b/util/reserved-region.c
new file mode 100644
index 0000000000000000000000000000000000000000..18f83eb4c654fbab5a040a539f940bd605431909
--- /dev/null
+++ b/util/reserved-region.c
@@ -0,0 +1,91 @@
+/*
+ * QEMU ReservedRegion helpers
+ *
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "qemu/osdep.h"
+#include "qemu/range.h"
+#include "qemu/reserved-region.h"
+
+GList *resv_region_list_insert(GList *list, ReservedRegion *reg)
+{
+ ReservedRegion *resv_iter, *new_reg;
+ Range *r = ®->range;
+ Range *range_iter;
+ GList *l;
+
+ for (l = list; l ; ) {
+ resv_iter = (ReservedRegion *)l->data;
+ range_iter = &resv_iter->range;
+
+ /* Skip all list elements strictly less than range to add */
+ if (range_compare(range_iter, r) < 0) {
+ l = l->next;
+ } else if (range_compare(range_iter, r) > 0) {
+ return g_list_insert_before(list, l, reg);
+ } else { /* there is an overlap */
+ if (range_contains_range(r, range_iter)) {
+ /* new range contains current item, simply remove this latter */
+ GList *prev = l->prev;
+ g_free(l->data);
+ list = g_list_delete_link(list, l);
+ if (prev) {
+ l = prev->next;
+ } else {
+ l = list;
+ }
+ } else if (range_contains_range(range_iter, r)) {
+ /* new region is included in the current region */
+ if (range_lob(range_iter) == range_lob(r)) {
+ /* adjacent on the left side, derives into 2 regions */
+ range_set_bounds(range_iter, range_upb(r) + 1,
+ range_upb(range_iter));
+ return g_list_insert_before(list, l, reg);
+ } else if (range_upb(range_iter) == range_upb(r)) {
+ /* adjacent on the right side, derives into 2 regions */
+ range_set_bounds(range_iter, range_lob(range_iter),
+ range_lob(r) - 1);
+ l = l->next;
+ } else {
+ uint64_t lob = range_lob(range_iter);
+ /*
+ * the new range is in the middle of an existing one,
+ * split this latter into 3 regs instead
+ */
+ range_set_bounds(range_iter, range_upb(r) + 1,
+ range_upb(range_iter));
+ new_reg = g_new0(ReservedRegion, 1);
+ new_reg->type = resv_iter->type;
+ range_set_bounds(&new_reg->range,
+ lob, range_lob(r) - 1);
+ list = g_list_insert_before(list, l, new_reg);
+ return g_list_insert_before(list, l, reg);
+ }
+ } else if (range_lob(r) < range_lob(range_iter)) {
+ range_set_bounds(range_iter, range_upb(r) + 1,
+ range_upb(range_iter));
+ return g_list_insert_before(list, l, reg);
+ } else { /* intersection on the upper range */
+ range_set_bounds(range_iter, range_lob(range_iter),
+ range_lob(r) - 1);
+ l = l->next;
+ }
+ } /* overlap */
+ }
+ return g_list_append(list, reg);
+}
+
diff --git a/util/meson.build b/util/meson.build
index 769b24f2e0df23a755a4ed460c5d67cfc49aa4c4..c3a24af5c5cf27059cea9511ebc0fe1804500b52 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -52,6 +52,7 @@ util_ss.add(files('qdist.c'))
util_ss.add(files('qht.c'))
util_ss.add(files('qsp.c'))
util_ss.add(files('range.c'))
+util_ss.add(files('reserved-region.c'))
util_ss.add(files('stats64.c'))
util_ss.add(files('systemd.c'))
util_ss.add(files('transactions.c'))
--
2.41.0
next prev parent reply other threads:[~2023-11-06 14:44 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-06 14:36 [PULL 00/22] vfio queue Cédric Le Goater
2023-11-06 14:36 ` [PULL 01/22] memory: Let ReservedRegion use Range Cédric Le Goater
2023-11-06 14:36 ` [PULL 02/22] memory: Introduce memory_region_iommu_set_iova_ranges Cédric Le Goater
2023-11-06 14:36 ` [PULL 03/22] vfio: Collect container iova range info Cédric Le Goater
2023-11-06 14:36 ` [PULL 04/22] virtio-iommu: Rename reserved_regions into prop_resv_regions Cédric Le Goater
2023-11-06 14:36 ` [PULL 05/22] range: Make range_compare() public Cédric Le Goater
2023-11-06 14:36 ` Cédric Le Goater [this message]
2023-11-06 14:36 ` [PULL 07/22] virtio-iommu: Introduce per IOMMUDevice reserved regions Cédric Le Goater
2023-11-06 14:36 ` [PULL 08/22] range: Introduce range_inverse_array() Cédric Le Goater
2023-11-06 14:36 ` [PULL 09/22] virtio-iommu: Record whether a probe request has been issued Cédric Le Goater
2023-11-09 15:08 ` Peter Maydell
2023-11-09 16:56 ` Eric Auger
2023-11-06 14:36 ` [PULL 10/22] virtio-iommu: Implement set_iova_ranges() callback Cédric Le Goater
2023-11-06 14:36 ` [PULL 11/22] virtio-iommu: Consolidate host reserved regions and property set ones Cédric Le Goater
2023-11-06 14:36 ` [PULL 12/22] test: Add some tests for range and resv-mem helpers Cédric Le Goater
2023-11-06 14:36 ` [PULL 13/22] hw/pci: modify pci_setup_iommu() to set PCIIOMMUOps Cédric Le Goater
2023-11-06 14:36 ` [PULL 14/22] util/uuid: Add UUID_STR_LEN definition Cédric Le Goater
2023-11-06 14:36 ` [PULL 15/22] vfio/pci: Fix buffer overrun when writing the VF token Cédric Le Goater
2023-11-06 14:36 ` [PULL 16/22] util/uuid: Remove UUID_FMT_LEN Cédric Le Goater
2023-11-06 14:36 ` [PULL 17/22] util/uuid: Define UUID_STR_LEN from UUID_NONE string Cédric Le Goater
2023-11-06 14:36 ` [PULL 18/22] vfio/container: Move IBM EEH related functions into spapr_pci_vfio.c Cédric Le Goater
2023-11-06 14:36 ` [PULL 19/22] vfio/container: Move vfio_container_add/del_section_window into spapr.c Cédric Le Goater
2023-11-06 14:36 ` [PULL 20/22] vfio/container: Move spapr specific init/deinit " Cédric Le Goater
2023-11-06 14:36 ` [PULL 21/22] vfio/spapr: Make vfio_spapr_create/remove_window static Cédric Le Goater
2023-11-06 14:36 ` [PULL 22/22] vfio/common: Move vfio_host_win_add/del into spapr.c Cédric Le Goater
2023-11-07 3:02 ` [PULL 00/22] vfio queue Stefan Hajnoczi
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=20231106143653.302391-7-clg@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=eric.auger@redhat.com \
--cc=jean-philippe@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=yanghliu@redhat.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).