[v2,16/16] virtio-mem: Mark memslot alias memory regions unmergeable

Commit Message

David Hildenbrand Aug. 25, 2023, 1:21 p.m. UTC

Let's mark the memslot alias memory regions as unmergable, such that
flatview and vhost won't merge adjacent memory region aliases and we can
atomically map/unmap individual aliases without affecting adjacent
alias memory regions.

This handles vhost and vfio in multiple-memslot mode correctly (which do
not support atomic memslot updates) and avoids the temporary removal of
large memslots, which can be an expensive operation. For example, vfio
might have to unpin + repin a lot of memory, which is undesired.

Signed-off-by: David Hildenbrand <[e-mail]>
---
 hw/virtio/virtio-mem.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Philippe Mathieu-Daudé Aug. 28, 2023, 10:44 p.m. UTC | #1

On 25/8/23 15:21, David Hildenbrand wrote:
> Let's mark the memslot alias memory regions as unmergable, such that
> flatview and vhost won't merge adjacent memory region aliases and we can
> atomically map/unmap individual aliases without affecting adjacent
> alias memory regions.
> 
> This handles vhost and vfio in multiple-memslot mode correctly (which do
> not support atomic memslot updates) and avoids the temporary removal of
> large memslots, which can be an expensive operation. For example, vfio
> might have to unpin + repin a lot of memory, which is undesired.
> 
> Signed-off-by: David Hildenbrand <[e-mail]>
> ---
>   hw/virtio/virtio-mem.c | 6 ++++++
>   1 file changed, 6 insertions(+)

Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>

Patch

diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index 724fcb189a..50770b577a 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -959,6 +959,12 @@  static void virtio_mem_prepare_memslots(VirtIOMEM *vmem)
         memory_region_init_alias(&vmem->memslots[idx], OBJECT(vmem), name,
                                  &vmem->memdev->mr, memslot_offset,
                                  memslot_size);
+        /*
+         * We want to be able to atomically and efficiently activate/deactivate
+         * individual memslots without affecting adjacent memslots in memory
+         * notifiers.
+         */
+        memory_region_set_unmergeable(&vmem->memslots[idx], true);
     }
 }