From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: "Eugenio Pérez" <eperezma@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>
Subject: [PULL V2 10/15] util: add iova_tree_find_iova
Date: Thu, 10 Mar 2022 10:39:02 +0800 [thread overview]
Message-ID: <20220310023907.2443-11-jasowang@redhat.com> (raw)
In-Reply-To: <20220310023907.2443-1-jasowang@redhat.com>
From: Eugenio Pérez <eperezma@redhat.com>
This function does the reverse operation of iova_tree_find: To look for
a mapping that match a translated address so we can do the reverse.
This have linear complexity instead of logarithmic, but it supports
overlapping HVA. Future developments could reduce it.
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
include/qemu/iova-tree.h | 20 +++++++++++++++++++-
util/iova-tree.c | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/include/qemu/iova-tree.h b/include/qemu/iova-tree.h
index d066400..c938fb0 100644
--- a/include/qemu/iova-tree.h
+++ b/include/qemu/iova-tree.h
@@ -83,7 +83,7 @@ int iova_tree_remove(IOVATree *tree, const DMAMap *map);
* @tree: the iova tree to search from
* @map: the mapping to search
*
- * Search for a mapping in the iova tree that overlaps with the
+ * Search for a mapping in the iova tree that iova overlaps with the
* mapping range specified. Only the first found mapping will be
* returned.
*
@@ -96,6 +96,24 @@ int iova_tree_remove(IOVATree *tree, const DMAMap *map);
const DMAMap *iova_tree_find(const IOVATree *tree, const DMAMap *map);
/**
+ * iova_tree_find_iova:
+ *
+ * @tree: the iova tree to search from
+ * @map: the mapping to search
+ *
+ * Search for a mapping in the iova tree that translated_addr overlaps with the
+ * mapping range specified. Only the first found mapping will be
+ * returned.
+ *
+ * Return: DMAMap pointer if found, or NULL if not found. Note that
+ * the returned DMAMap pointer is maintained internally. User should
+ * only read the content but never modify or free the content. Also,
+ * user is responsible to make sure the pointer is valid (say, no
+ * concurrent deletion in progress).
+ */
+const DMAMap *iova_tree_find_iova(const IOVATree *tree, const DMAMap *map);
+
+/**
* iova_tree_find_address:
*
* @tree: the iova tree to search from
diff --git a/util/iova-tree.c b/util/iova-tree.c
index 3160c50..f015598 100644
--- a/util/iova-tree.c
+++ b/util/iova-tree.c
@@ -37,6 +37,11 @@ struct IOVATreeAllocArgs {
bool iova_found;
};
+typedef struct IOVATreeFindIOVAArgs {
+ const DMAMap *needle;
+ const DMAMap *result;
+} IOVATreeFindIOVAArgs;
+
/**
* Iterate args to the next hole
*
@@ -80,6 +85,35 @@ const DMAMap *iova_tree_find(const IOVATree *tree, const DMAMap *map)
return g_tree_lookup(tree->tree, map);
}
+static gboolean iova_tree_find_address_iterator(gpointer key, gpointer value,
+ gpointer data)
+{
+ const DMAMap *map = key;
+ IOVATreeFindIOVAArgs *args = data;
+ const DMAMap *needle;
+
+ g_assert(key == value);
+
+ needle = args->needle;
+ if (map->translated_addr + map->size < needle->translated_addr ||
+ needle->translated_addr + needle->size < map->translated_addr) {
+ return false;
+ }
+
+ args->result = map;
+ return true;
+}
+
+const DMAMap *iova_tree_find_iova(const IOVATree *tree, const DMAMap *map)
+{
+ IOVATreeFindIOVAArgs args = {
+ .needle = map,
+ };
+
+ g_tree_foreach(tree->tree, iova_tree_find_address_iterator, &args);
+ return args.result;
+}
+
const DMAMap *iova_tree_find_address(const IOVATree *tree, hwaddr iova)
{
const DMAMap map = { .iova = iova, .size = 0 };
--
2.7.4
next prev parent reply other threads:[~2022-03-10 2:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-10 2:38 [PULL V2 00/15] Net patches Jason Wang
2022-03-10 2:38 ` [PULL V2 01/15] virtio-net: fix map leaking on error during receive Jason Wang
2022-03-10 2:38 ` [PULL V2 02/15] vhost: Add VhostShadowVirtqueue Jason Wang
2022-03-10 2:38 ` [PULL V2 03/15] vhost: Add Shadow VirtQueue kick forwarding capabilities Jason Wang
2022-03-10 2:38 ` [PULL V2 04/15] vhost: Add Shadow VirtQueue call " Jason Wang
2022-03-10 2:38 ` [PULL V2 05/15] vhost: Add vhost_svq_valid_features to shadow vq Jason Wang
2022-03-10 2:38 ` [PULL V2 06/15] virtio: Add vhost_svq_get_vring_addr Jason Wang
2022-03-10 2:38 ` [PULL V2 07/15] vdpa: adapt vhost_ops callbacks to svq Jason Wang
2022-03-10 2:39 ` [PULL V2 08/15] vhost: Shadow virtqueue buffers forwarding Jason Wang
2022-03-10 2:39 ` [PULL V2 09/15] util: Add iova_tree_alloc_map Jason Wang
2022-03-10 2:39 ` Jason Wang [this message]
2022-03-10 2:39 ` [PULL V2 11/15] vhost: Add VhostIOVATree Jason Wang
2022-03-10 2:39 ` [PULL V2 12/15] vdpa: Add custom IOTLB translations to SVQ Jason Wang
2022-03-10 2:39 ` [PULL V2 13/15] vdpa: Adapt vhost_vdpa_get_vring_base " Jason Wang
2022-03-10 2:39 ` [PULL V2 14/15] vdpa: Never set log_base addr if SVQ is enabled Jason Wang
2022-03-10 2:39 ` [PULL V2 15/15] vdpa: Expose VHOST_F_LOG_ALL on SVQ Jason Wang
2022-03-10 17:06 ` [PULL V2 00/15] Net patches Peter Maydell
2022-03-11 4:43 ` 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=20220310023907.2443-11-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=eperezma@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.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).