From: "Eugenio Pérez" <eperezma@redhat.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
Parav Pandit <parav@mellanox.com>, Cindy Lu <lulu@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Juan Quintela <quintela@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
Markus Armbruster <armbru@redhat.com>,
Gautam Dawar <gdawar@xilinx.com>,
virtualization@lists.linux-foundation.org,
Eduardo Habkost <ehabkost@redhat.com>,
Harpreet Singh Anand <hanand@xilinx.com>,
Xiao W Wang <xiao.w.wang@intel.com>, Peter Xu <peterx@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Eli Cohen <eli@mellanox.com>, Paolo Bonzini <pbonzini@redhat.com>,
Zhu Lingshan <lingshan.zhu@intel.com>,
Eric Blake <eblake@redhat.com>,
Stefano Garzarella <sgarzare@redhat.com>
Subject: [PATCH 21/31] util: Add iova_tree_alloc
Date: Fri, 21 Jan 2022 21:27:23 +0100 [thread overview]
Message-ID: <20220121202733.404989-22-eperezma@redhat.com> (raw)
In-Reply-To: <20220121202733.404989-1-eperezma@redhat.com>
This iova tree function allows it to look for a hole in allocated
regions and return a totally new translation for a given translated
address.
It's usage is mainly to allow devices to access qemu address space,
remapping guest's one into a new iova space where qemu can add chunks of
addresses.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
include/qemu/iova-tree.h | 17 ++++++++
util/iova-tree.c | 86 +++++++++++++++++++++++++++++++++++++++-
2 files changed, 102 insertions(+), 1 deletion(-)
diff --git a/include/qemu/iova-tree.h b/include/qemu/iova-tree.h
index 8249edd764..33f9b2e13f 100644
--- a/include/qemu/iova-tree.h
+++ b/include/qemu/iova-tree.h
@@ -29,6 +29,7 @@
#define IOVA_OK (0)
#define IOVA_ERR_INVALID (-1) /* Invalid parameters */
#define IOVA_ERR_OVERLAP (-2) /* IOVA range overlapped */
+#define IOVA_ERR_NOMEM (-3) /* Cannot allocate */
typedef struct IOVATree IOVATree;
typedef struct DMAMap {
@@ -119,6 +120,22 @@ const DMAMap *iova_tree_find_address(const IOVATree *tree, hwaddr iova);
*/
void iova_tree_foreach(IOVATree *tree, iova_tree_iterator iterator);
+/**
+ * iova_tree_alloc:
+ *
+ * @tree: the iova tree to allocate from
+ * @map: the new map (as translated addr & size) to allocate in iova region
+ * @iova_begin: the minimum address of the allocation
+ * @iova_end: the maximum addressable direction of the allocation
+ *
+ * Allocates a new region of a given size, between iova_min and iova_max.
+ *
+ * Return: Same as iova_tree_insert, but cannot overlap and can be out of
+ * free contiguous range. Caller can get the assigned iova in map->iova.
+ */
+int iova_tree_alloc(IOVATree *tree, DMAMap *map, hwaddr iova_begin,
+ hwaddr iova_end);
+
/**
* iova_tree_destroy:
*
diff --git a/util/iova-tree.c b/util/iova-tree.c
index 5063a256dd..1439fc9fe2 100644
--- a/util/iova-tree.c
+++ b/util/iova-tree.c
@@ -88,7 +88,7 @@ static DMAMapInternal *iova_tree_find_internal(const IOVATree *tree,
const DMAMap *iova_tree_find(const IOVATree *tree, const DMAMap *map)
{
const DMAMapInternal *ret = iova_tree_find_internal(tree, map);
- return &ret->map;
+ return ret ? &ret->map : NULL;
}
const DMAMap *iova_tree_find_address(const IOVATree *tree, hwaddr iova)
@@ -162,6 +162,90 @@ int iova_tree_remove(IOVATree *tree, const DMAMap *map)
return IOVA_OK;
}
+/**
+ * Check if there is at minimum "size" iova space between the end of "left" and
+ * the start of "right". If some of them is NULL, iova_begin and iova_end will
+ * be used.
+ */
+static bool iova_tree_alloc_map_in_hole(const DMAMapInternal *l,
+ const DMAMapInternal *r,
+ hwaddr iova_begin, hwaddr iova_last,
+ size_t size)
+{
+ const DMAMap *left = l ? &l->map : NULL;
+ const DMAMap *right = r ? &r->map : NULL;
+ uint64_t hole_start, hole_last;
+
+ if (right && right->iova + right->size < iova_begin) {
+ return false;
+ }
+
+ if (left && left->iova > iova_last) {
+ return false;
+ }
+
+ hole_start = MAX(left ? left->iova + left->size + 1 : 0, iova_begin);
+ hole_last = MIN(right ? right->iova : HWADDR_MAX, iova_last);
+
+ if (hole_last - hole_start > size) {
+ /* We found a valid hole. */
+ return true;
+ }
+
+ /* Keep iterating */
+ return false;
+}
+
+/**
+ * Allocates a new entry in the tree
+ *
+ * The caller specifies the size of the new entry with map->size. The new iova
+ * address is returned in map->iova if allocation success. The map ownership is
+ * always of the caller as in iova_tree_insert.
+ *
+ * More contrains can be specified with iova_begin and iova_last.
+ *
+ * Returns the same as iova_tree_insert, but it can return IOVA_ERR_NOMEM if
+ * cannot find a hole in iova range big enough.
+ */
+int iova_tree_alloc(IOVATree *tree, DMAMap *map, hwaddr iova_begin,
+ hwaddr iova_last)
+{
+ const DMAMapInternal *last, *i;
+
+ assert(iova_begin < iova_last);
+
+ /*
+ * Find a valid hole for the mapping
+ *
+ * TODO: Replace all this with g_tree_node_first/next/last when available
+ * (from glib since 2.68). Using a sepparated QTAILQ complicates code.
+ *
+ * Try to allocate first at the end of the list.
+ */
+ last = QTAILQ_LAST(&tree->list);
+ if (iova_tree_alloc_map_in_hole(last, NULL, iova_begin, iova_last,
+ map->size)) {
+ goto alloc;
+ }
+
+ /* Look for inner hole */
+ last = NULL;
+ for (i = QTAILQ_FIRST(&tree->list); i;
+ last = i, i = QTAILQ_NEXT(i, entry)) {
+ if (iova_tree_alloc_map_in_hole(last, i, iova_begin, iova_last,
+ map->size)) {
+ goto alloc;
+ }
+ }
+
+ return IOVA_ERR_NOMEM;
+
+alloc:
+ map->iova = last ? last->map.iova + last->map.size + 1 : iova_begin;
+ return iova_tree_insert(tree, map);
+}
+
void iova_tree_destroy(IOVATree *tree)
{
g_tree_destroy(tree->tree);
--
2.27.0
next prev parent reply other threads:[~2022-01-21 21:17 UTC|newest]
Thread overview: 130+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-21 20:27 [PATCH 00/31] vDPA shadow virtqueue Eugenio Pérez
2022-01-21 20:27 ` [PATCH 01/31] vdpa: Reorder virtio/vhost-vdpa.c functions Eugenio Pérez
2022-01-28 5:59 ` Jason Wang
2022-01-28 7:57 ` Eugenio Perez Martin
2022-02-21 7:31 ` Jason Wang
2022-02-21 7:42 ` Eugenio Perez Martin
2022-01-21 20:27 ` [PATCH 02/31] vhost: Add VhostShadowVirtqueue Eugenio Pérez
2022-01-26 8:53 ` Eugenio Perez Martin
2022-01-28 6:00 ` Jason Wang
2022-01-28 8:10 ` Eugenio Perez Martin
2022-01-21 20:27 ` [PATCH 03/31] vdpa: Add vhost_svq_get_dev_kick_notifier Eugenio Pérez
2022-01-28 6:03 ` Jason Wang
2022-01-31 9:33 ` Eugenio Perez Martin
2022-01-21 20:27 ` [PATCH 04/31] vdpa: Add vhost_svq_set_svq_kick_fd Eugenio Pérez
2022-01-28 6:29 ` Jason Wang
2022-01-31 10:18 ` Eugenio Perez Martin
2022-02-08 8:47 ` Jason Wang
2022-02-18 18:22 ` Eugenio Perez Martin
2022-01-21 20:27 ` [PATCH 05/31] vhost: Add Shadow VirtQueue kick forwarding capabilities Eugenio Pérez
2022-01-28 6:32 ` Jason Wang
2022-01-31 10:48 ` Eugenio Perez Martin
2022-01-21 20:27 ` [PATCH 06/31] vhost: Route guest->host notification through shadow virtqueue Eugenio Pérez
2022-01-28 6:56 ` Jason Wang
2022-01-31 11:33 ` Eugenio Perez Martin
2022-02-08 9:02 ` Jason Wang
2022-01-21 20:27 ` [PATCH 07/31] vhost: dd vhost_svq_get_svq_call_notifier Eugenio Pérez
2022-01-29 7:57 ` Jason Wang
2022-01-29 17:49 ` Eugenio Perez Martin
2022-01-21 20:27 ` [PATCH 08/31] vhost: Add vhost_svq_set_guest_call_notifier Eugenio Pérez
2022-01-21 20:27 ` [PATCH 09/31] vhost-vdpa: Take into account SVQ in vhost_vdpa_set_vring_call Eugenio Pérez
2022-01-29 8:05 ` Jason Wang
2022-01-31 15:34 ` Eugenio Perez Martin
2022-02-08 3:23 ` Jason Wang
2022-02-18 12:35 ` Eugenio Perez Martin
2022-02-21 7:39 ` Jason Wang
2022-02-21 8:01 ` Eugenio Perez Martin
2022-02-22 7:18 ` Jason Wang
2022-01-21 20:27 ` [PATCH 10/31] vhost: Route host->guest notification through shadow virtqueue Eugenio Pérez
2022-01-21 20:27 ` [PATCH 11/31] vhost: Add vhost_svq_valid_device_features to shadow vq Eugenio Pérez
2022-01-29 8:11 ` Jason Wang
2022-01-31 15:49 ` Eugenio Perez Martin
2022-02-01 10:57 ` Eugenio Perez Martin
2022-02-08 3:37 ` Jason Wang
2022-02-26 9:11 ` Liuxiangdong via
2022-02-26 11:12 ` Eugenio Perez Martin
2022-01-21 20:27 ` [PATCH 12/31] vhost: Add vhost_svq_valid_guest_features " Eugenio Pérez
2022-01-21 20:27 ` [PATCH 13/31] vhost: Add vhost_svq_ack_guest_features " Eugenio Pérez
2022-01-21 20:27 ` [PATCH 14/31] virtio: Add vhost_shadow_vq_get_vring_addr Eugenio Pérez
2022-01-21 20:27 ` [PATCH 15/31] vdpa: Add vhost_svq_get_num Eugenio Pérez
2022-01-29 8:14 ` Jason Wang
2022-01-31 16:36 ` Eugenio Perez Martin
2022-01-21 20:27 ` [PATCH 16/31] vhost: pass queue index to vhost_vq_get_addr Eugenio Pérez
2022-01-29 8:20 ` Jason Wang
2022-01-31 17:44 ` Eugenio Perez Martin
2022-02-08 6:58 ` Jason Wang
2022-01-21 20:27 ` [PATCH 17/31] vdpa: adapt vhost_ops callbacks to svq Eugenio Pérez
2022-01-30 4:03 ` Jason Wang
2022-01-31 18:58 ` Eugenio Perez Martin
2022-02-08 3:57 ` Jason Wang
2022-02-17 17:13 ` Eugenio Perez Martin
2022-02-21 7:15 ` Jason Wang
2022-02-21 17:22 ` Eugenio Perez Martin
2022-02-22 3:16 ` Jason Wang
2022-02-22 7:42 ` Eugenio Perez Martin
2022-02-22 7:59 ` Jason Wang
2022-01-21 20:27 ` [PATCH 18/31] vhost: Shadow virtqueue buffers forwarding Eugenio Pérez
2022-01-30 4:42 ` Jason Wang
2022-02-01 17:08 ` Eugenio Perez Martin
2022-02-08 8:11 ` Jason Wang
2022-02-22 19:01 ` Eugenio Perez Martin
2022-02-23 2:03 ` Jason Wang
2022-01-30 6:46 ` Jason Wang
2022-02-01 11:25 ` Eugenio Perez Martin
2022-02-08 8:15 ` Jason Wang
2022-02-17 12:48 ` Eugenio Perez Martin
2022-02-21 7:43 ` Jason Wang
2022-02-21 8:15 ` Eugenio Perez Martin
2022-02-22 7:26 ` Jason Wang
2022-02-22 8:55 ` Eugenio Perez Martin
2022-02-23 2:26 ` Jason Wang
2022-01-21 20:27 ` [PATCH 19/31] utils: Add internal DMAMap to iova-tree Eugenio Pérez
2022-01-21 20:27 ` [PATCH 20/31] util: Store DMA entries in a list Eugenio Pérez
2022-01-21 20:27 ` Eugenio Pérez [this message]
2022-01-24 4:32 ` [PATCH 21/31] util: Add iova_tree_alloc Peter Xu
2022-01-24 9:20 ` Eugenio Perez Martin
2022-01-24 11:07 ` Peter Xu
2022-01-25 9:40 ` Eugenio Perez Martin
2022-01-27 8:06 ` Peter Xu
2022-01-27 9:24 ` Eugenio Perez Martin
2022-01-28 3:57 ` Peter Xu
2022-01-28 5:55 ` Jason Wang
2022-01-28 7:48 ` Eugenio Perez Martin
2022-02-15 19:34 ` Eugenio Pérez
2022-02-15 19:34 ` [PATCH] util: Add iova_tree_alloc Eugenio Pérez
2022-02-16 7:25 ` Peter Xu
2022-01-30 5:06 ` [PATCH 21/31] " Jason Wang
2022-01-21 20:27 ` [PATCH 22/31] vhost: Add VhostIOVATree Eugenio Pérez
2022-01-30 5:21 ` Jason Wang
2022-02-01 17:27 ` Eugenio Perez Martin
2022-02-08 8:17 ` Jason Wang
2022-01-21 20:27 ` [PATCH 23/31] vdpa: Add custom IOTLB translations to SVQ Eugenio Pérez
2022-01-30 5:57 ` Jason Wang
2022-01-31 19:11 ` Eugenio Perez Martin
2022-02-08 8:19 ` Jason Wang
2022-01-21 20:27 ` [PATCH 24/31] vhost: Add vhost_svq_get_last_used_idx Eugenio Pérez
2022-01-21 20:27 ` [PATCH 25/31] vdpa: Adapt vhost_vdpa_get_vring_base to SVQ Eugenio Pérez
2022-01-21 20:27 ` [PATCH 26/31] vdpa: Clear VHOST_VRING_F_LOG at vhost_vdpa_set_vring_addr in SVQ Eugenio Pérez
2022-01-21 20:27 ` [PATCH 27/31] vdpa: Never set log_base addr if SVQ is enabled Eugenio Pérez
2022-01-21 20:27 ` [PATCH 28/31] vdpa: Expose VHOST_F_LOG_ALL on SVQ Eugenio Pérez
2022-01-30 6:50 ` Jason Wang
2022-02-01 11:45 ` Eugenio Perez Martin
2022-02-08 8:25 ` Jason Wang
2022-02-16 15:53 ` Eugenio Perez Martin
2022-02-17 6:02 ` Jason Wang
2022-02-17 8:22 ` Eugenio Perez Martin
2022-02-22 7:41 ` Jason Wang
2022-02-22 8:05 ` Eugenio Perez Martin
2022-02-23 3:46 ` Jason Wang
2022-02-23 8:06 ` Eugenio Perez Martin
2022-02-24 3:45 ` Jason Wang
2022-01-21 20:27 ` [PATCH 29/31] vdpa: Make ncs autofree Eugenio Pérez
2022-01-30 6:51 ` Jason Wang
2022-02-01 17:10 ` Eugenio Perez Martin
2022-01-21 20:27 ` [PATCH 30/31] vdpa: Move vhost_vdpa_get_iova_range to net/vhost-vdpa.c Eugenio Pérez
2022-01-30 6:53 ` Jason Wang
2022-02-01 17:11 ` Eugenio Perez Martin
2022-01-21 20:27 ` [PATCH 31/31] vdpa: Add x-svq to NetdevVhostVDPAOptions Eugenio Pérez
2022-01-28 6:02 ` [PATCH 00/31] vDPA shadow virtqueue Jason Wang
2022-01-31 9:15 ` Eugenio Perez Martin
2022-02-08 8:27 ` Jason Wang
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=20220121202733.404989-22-eperezma@redhat.com \
--to=eperezma@redhat.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=ehabkost@redhat.com \
--cc=eli@mellanox.com \
--cc=gdawar@xilinx.com \
--cc=hanand@xilinx.com \
--cc=jasowang@redhat.com \
--cc=lingshan.zhu@intel.com \
--cc=lulu@redhat.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=parav@mellanox.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=richard.henderson@linaro.org \
--cc=sgarzare@redhat.com \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=xiao.w.wang@intel.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).