From: "Eugenio Pérez" <eperezma@redhat.com>
To: qemu-devel@nongnu.org
Cc: Parav Pandit <parav@mellanox.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Juan Quintela <quintela@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
virtualization@lists.linux-foundation.org,
Harpreet Singh Anand <hanand@xilinx.com>,
Xiao W Wang <xiao.w.wang@intel.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Eli Cohen <eli@mellanox.com>, Michael Lilja <ml@napatech.com>,
Stefano Garzarella <sgarzare@redhat.com>
Subject: [RFC v3 24/29] vhost: Add iova_rev_maps_alloc
Date: Wed, 19 May 2021 18:28:58 +0200 [thread overview]
Message-ID: <20210519162903.1172366-25-eperezma@redhat.com> (raw)
In-Reply-To: <20210519162903.1172366-1-eperezma@redhat.com>
This way the tree can store/map a completely new virtual address space,
in the range the device admits.
It does not limit the range it will allocate, but the IOVA address of
the maps are allocated growing. A range limitation will be need for the
cases where start_addr != 0.
Tools for remove mappings will be needed also.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
hw/virtio/vhost-iova-tree.h | 11 +++---
hw/virtio/vhost-iova-tree.c | 72 +++++++++++++++++++++++++++++++------
2 files changed, 69 insertions(+), 14 deletions(-)
diff --git a/hw/virtio/vhost-iova-tree.h b/hw/virtio/vhost-iova-tree.h
index 589e86bd91..92e2d992b3 100644
--- a/hw/virtio/vhost-iova-tree.h
+++ b/hw/virtio/vhost-iova-tree.h
@@ -22,16 +22,17 @@ typedef struct VhostDMAMap {
} VhostDMAMap;
typedef enum VhostDMAMapNewRC {
+ VHOST_DMA_MAP_NO_SPACE = -3,
VHOST_DMA_MAP_OVERLAP = -2,
VHOST_DMA_MAP_INVALID = -1,
VHOST_DMA_MAP_OK = 0,
} VhostDMAMapNewRC;
/**
- * VhostIOVATree
- *
- * Store and search IOVA -> Translated mappings and the reverse, from
- * translated address to IOVA.
+ * VhostIOVATree, able to:
+ * - Translate iova address
+ * - Reverse translate iova address (from translated to iova)
+ * - Allocate IOVA regions for translated range (potentially slow operation)
*
* Note that it cannot remove nodes.
*/
@@ -54,5 +55,7 @@ const VhostDMAMap *vhost_iova_tree_find_taddr(const VhostIOVATree *iova_rm,
const VhostDMAMap *map);
VhostDMAMapNewRC vhost_iova_tree_insert(VhostIOVATree *iova_rm,
VhostDMAMap *map);
+VhostDMAMapNewRC vhost_iova_tree_alloc(VhostIOVATree *iova_rm,
+ VhostDMAMap *map);
#endif
diff --git a/hw/virtio/vhost-iova-tree.c b/hw/virtio/vhost-iova-tree.c
index 2900390a1e..7699d96bbb 100644
--- a/hw/virtio/vhost-iova-tree.c
+++ b/hw/virtio/vhost-iova-tree.c
@@ -187,8 +187,30 @@ const VhostDMAMap *vhost_iova_tree_find_taddr(const VhostIOVATree *tree,
vhost_iova_tree_cmp_iova);
}
+static bool vhost_iova_tree_find_iova_hole(const GArray *iova_map,
+ const VhostDMAMap *map,
+ const VhostDMAMap **prev_elem)
+{
+ size_t i;
+ hwaddr iova = 0;
+
+ *prev_elem = NULL;
+ for (i = 0; i < iova_map->len; i++) {
+ const VhostDMAMap *next = &g_array_index(iova_map, typeof(*next), i);
+ hwaddr hole_end = next->iova;
+ if (map->size < hole_end - iova) {
+ return true;
+ }
+
+ iova = next->iova + next->size + 1;
+ *prev_elem = next;
+ }
+
+ return ((hwaddr)-1 - iova) > iova_map->len;
+}
+
/**
- * Insert a new map
+ * Insert a new map - internal
*
* @tree The iova tree
* @map The iova map
@@ -197,10 +219,13 @@ const VhostDMAMap *vhost_iova_tree_find_taddr(const VhostIOVATree *tree,
* - VHOST_DMA_MAP_OK if the map fits in the container
* - VHOST_DMA_MAP_INVALID if the map does not make sense (like size overflow)
* - VHOST_DMA_MAP_OVERLAP if the tree already contains that map
- * Can query the assignated iova in map.
+ * - VHOST_DMA_MAP_NO_SPACE if iova_rm cannot allocate more space.
+ *
+ * It returns assignated iova in map->iova if return value is VHOST_DMA_MAP_OK.
*/
-VhostDMAMapNewRC vhost_iova_tree_insert(VhostIOVATree *tree,
- VhostDMAMap *map)
+static VhostDMAMapNewRC vhost_iova_tree_insert_int(VhostIOVATree *tree,
+ VhostDMAMap *map,
+ bool allocate)
{
const VhostDMAMap *qemu_prev, *iova_prev;
int find_prev_rc;
@@ -210,12 +235,27 @@ VhostDMAMapNewRC vhost_iova_tree_insert(VhostIOVATree *tree,
return VHOST_DMA_MAP_INVALID;
}
- /* Check for duplicates, and save position for insertion */
- find_prev_rc = vhost_iova_tree_find_prev(tree->iova_taddr_map,
- vhost_iova_tree_cmp_iova, map,
- &iova_prev);
- if (find_prev_rc == VHOST_DMA_MAP_OVERLAP) {
- return VHOST_DMA_MAP_OVERLAP;
+ if (allocate) {
+ /* Search for a hole in iova space big enough */
+ bool fit = vhost_iova_tree_find_iova_hole(tree->iova_taddr_map, map,
+ &iova_prev);
+ if (!fit) {
+ return VHOST_DMA_MAP_NO_SPACE;
+ }
+
+ map->iova = iova_prev ? (iova_prev->iova + iova_prev->size) + 1 : 0;
+ } else {
+ if (map->iova + map->size < map->iova) {
+ return VHOST_DMA_MAP_INVALID;
+ }
+
+ /* Check for duplicates, and save position for insertion */
+ find_prev_rc = vhost_iova_tree_find_prev(tree->iova_taddr_map,
+ vhost_iova_tree_cmp_iova, map,
+ &iova_prev);
+ if (find_prev_rc == VHOST_DMA_MAP_OVERLAP) {
+ return VHOST_DMA_MAP_OVERLAP;
+ }
}
find_prev_rc = vhost_iova_tree_find_prev(tree->taddr_iova_map,
@@ -229,3 +269,15 @@ VhostDMAMapNewRC vhost_iova_tree_insert(VhostIOVATree *tree,
vhost_iova_tree_insert_after(tree->taddr_iova_map, qemu_prev, map);
return VHOST_DMA_MAP_OK;
}
+
+VhostDMAMapNewRC vhost_iova_tree_insert(VhostIOVATree *tree,
+ VhostDMAMap *map)
+{
+ return vhost_iova_tree_insert_int(tree, map, false);
+}
+
+VhostDMAMapNewRC vhost_iova_tree_alloc(VhostIOVATree *tree,
+ VhostDMAMap *map)
+{
+ return vhost_iova_tree_insert_int(tree, map, true);
+}
--
2.27.0
next prev parent reply other threads:[~2021-05-19 16:52 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-19 16:28 [RFC v3 00/29] vDPA software assisted live migration Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 01/29] virtio: Add virtio_queue_is_host_notifier_enabled Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 02/29] vhost: Save masked_notifier state Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 03/29] vhost: Add VhostShadowVirtqueue Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 04/29] vhost: Add x-vhost-enable-shadow-vq qmp Eugenio Pérez
2021-05-21 7:05 ` Markus Armbruster
2021-05-24 7:13 ` Eugenio Perez Martin
2021-06-08 14:23 ` Markus Armbruster
2021-06-08 15:26 ` Eugenio Perez Martin
2021-06-09 11:46 ` Markus Armbruster
2021-06-09 14:06 ` Eugenio Perez Martin
2021-05-19 16:28 ` [RFC v3 05/29] virtio: Add VIRTIO_F_QUEUE_STATE Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 06/29] virtio-net: Honor VIRTIO_CONFIG_S_DEVICE_STOPPED Eugenio Pérez
2021-05-26 1:06 ` Jason Wang
2021-05-26 1:10 ` Jason Wang
2021-06-01 7:13 ` Eugenio Perez Martin
2021-06-03 3:12 ` Jason Wang
2021-05-19 16:28 ` [RFC v3 07/29] vhost: Route guest->host notification through shadow virtqueue Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 08/29] vhost: Route host->guest " Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 09/29] vhost: Avoid re-set masked notifier in shadow vq Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 10/29] virtio: Add vhost_shadow_vq_get_vring_addr Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 11/29] vhost: Add vhost_vring_pause operation Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 12/29] vhost: add vhost_kernel_vring_pause Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 13/29] vhost: Add vhost_get_iova_range operation Eugenio Pérez
2021-05-26 1:14 ` Jason Wang
2021-05-26 17:49 ` Eugenio Perez Martin
2021-05-27 4:51 ` Jason Wang
2021-06-01 7:17 ` Eugenio Perez Martin
2021-06-03 3:13 ` Jason Wang
2021-05-19 16:28 ` [RFC v3 14/29] vhost: add vhost_has_limited_iova_range Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 15/29] vhost: Add enable_custom_iommu to VhostOps Eugenio Pérez
2021-05-31 9:01 ` Jason Wang
2021-06-01 7:49 ` Eugenio Perez Martin
2021-05-19 16:28 ` [RFC v3 16/29] vhost-vdpa: Add vhost_vdpa_enable_custom_iommu Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 17/29] vhost: Shadow virtqueue buffers forwarding Eugenio Pérez
2021-06-02 9:50 ` Jason Wang
2021-06-02 17:18 ` Eugenio Perez Martin
2021-06-03 3:34 ` Jason Wang
2021-06-04 8:37 ` Eugenio Perez Martin
2021-05-19 16:28 ` [RFC v3 18/29] vhost: Use vhost_enable_custom_iommu to unmap everything if available Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 19/29] vhost: Check for device VRING_USED_F_NO_NOTIFY at shadow virtqueue kick Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 20/29] vhost: Use VRING_AVAIL_F_NO_INTERRUPT at device call on shadow virtqueue Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 21/29] vhost: Add VhostIOVATree Eugenio Pérez
2021-05-31 9:40 ` Jason Wang
2021-06-01 8:15 ` Eugenio Perez Martin
2021-07-14 3:04 ` Jason Wang
2021-07-14 6:54 ` Eugenio Perez Martin
2021-07-14 9:14 ` Eugenio Perez Martin
2021-07-14 9:33 ` Jason Wang
2021-05-19 16:28 ` [RFC v3 22/29] vhost: Add iova_rev_maps_find_iova to IOVAReverseMaps Eugenio Pérez
2021-05-19 16:28 ` [RFC v3 23/29] vhost: Use a tree to store memory mappings Eugenio Pérez
2021-05-19 16:28 ` Eugenio Pérez [this message]
2021-05-19 16:28 ` [RFC v3 25/29] vhost: Add custom IOTLB translations to SVQ Eugenio Pérez
2021-06-02 9:51 ` Jason Wang
2021-06-02 17:51 ` Eugenio Perez Martin
2021-06-03 3:39 ` Jason Wang
2021-06-04 9:07 ` Eugenio Perez Martin
2021-05-19 16:29 ` [RFC v3 26/29] vhost: Map in vdpa-dev Eugenio Pérez
2021-05-19 16:29 ` [RFC v3 27/29] vhost-vdpa: Implement vhost_vdpa_vring_pause operation Eugenio Pérez
2021-05-19 16:29 ` [RFC v3 28/29] vhost-vdpa: never map with vDPA listener Eugenio Pérez
2021-05-19 16:29 ` [RFC v3 29/29] vhost: Start vhost-vdpa SVQ directly Eugenio Pérez
2021-05-24 9:38 ` [RFC v3 00/29] vDPA software assisted live migration Michael S. Tsirkin
2021-05-24 10:37 ` Eugenio Perez Martin
2021-05-24 11:29 ` Michael S. Tsirkin
2021-07-19 14:13 ` Stefan Hajnoczi
2021-05-25 0:09 ` Jason Wang
2021-06-02 9:59 ` 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=20210519162903.1172366-25-eperezma@redhat.com \
--to=eperezma@redhat.com \
--cc=armbru@redhat.com \
--cc=eli@mellanox.com \
--cc=hanand@xilinx.com \
--cc=jasowang@redhat.com \
--cc=ml@napatech.com \
--cc=mst@redhat.com \
--cc=parav@mellanox.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--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).