[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/17] util: vfio-helpers: Factor out and fix processing of existi
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 05/17] util: vfio-helpers: Factor out and fix processing of existing ram blocks |
Date: |
Thu, 13 May 2021 18:37:25 +0100 |
From: David Hildenbrand <david@redhat.com>
Factor it out into common code when a new notifier is registered, just
as done with the memory region notifier. This keeps logic about how to
process existing ram blocks at a central place.
Just like when adding a new ram block, we have to register the max_length.
Ram blocks are only "fake resized". All memory (max_length) is mapped.
Print the warning from inside qemu_vfio_ram_block_added().
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20210429112708.12291-2-david@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
hw/core/numa.c | 14 ++++++++++++++
include/exec/cpu-common.h | 1 +
softmmu/physmem.c | 5 +++++
util/vfio-helpers.c | 29 ++++++++---------------------
4 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/hw/core/numa.c b/hw/core/numa.c
index ac6bed5817..134ebc2b72 100644
--- a/hw/core/numa.c
+++ b/hw/core/numa.c
@@ -802,9 +802,23 @@ void query_numa_node_mem(NumaNodeMem node_mem[],
MachineState *ms)
}
}
+static int ram_block_notify_add_single(RAMBlock *rb, void *opaque)
+{
+ const ram_addr_t max_size = qemu_ram_get_max_length(rb);
+ void *host = qemu_ram_get_host_addr(rb);
+ RAMBlockNotifier *notifier = opaque;
+
+ if (host) {
+ notifier->ram_block_added(notifier, host, max_size);
+ }
+ return 0;
+}
+
void ram_block_notifier_add(RAMBlockNotifier *n)
{
QLIST_INSERT_HEAD(&ram_list.ramblock_notifiers, n, next);
+ /* Notify about all existing ram blocks. */
+ qemu_ram_foreach_block(ram_block_notify_add_single, n);
}
void ram_block_notifier_remove(RAMBlockNotifier *n)
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index 5a0a2d93e0..ccabed4003 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -57,6 +57,7 @@ const char *qemu_ram_get_idstr(RAMBlock *rb);
void *qemu_ram_get_host_addr(RAMBlock *rb);
ram_addr_t qemu_ram_get_offset(RAMBlock *rb);
ram_addr_t qemu_ram_get_used_length(RAMBlock *rb);
+ram_addr_t qemu_ram_get_max_length(RAMBlock *rb);
bool qemu_ram_is_shared(RAMBlock *rb);
bool qemu_ram_is_uf_zeroable(RAMBlock *rb);
void qemu_ram_set_uf_zeroable(RAMBlock *rb);
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index 5232696571..0a05533ed0 100644
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -1694,6 +1694,11 @@ ram_addr_t qemu_ram_get_used_length(RAMBlock *rb)
return rb->used_length;
}
+ram_addr_t qemu_ram_get_max_length(RAMBlock *rb)
+{
+ return rb->max_length;
+}
+
bool qemu_ram_is_shared(RAMBlock *rb)
{
return rb->flags & RAM_SHARED;
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index 97dfa3fd57..92b9565797 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -463,8 +463,14 @@ static void qemu_vfio_ram_block_added(RAMBlockNotifier *n,
void *host, size_t size)
{
QEMUVFIOState *s = container_of(n, QEMUVFIOState, ram_notifier);
+ int ret;
+
trace_qemu_vfio_ram_block_added(s, host, size);
- qemu_vfio_dma_map(s, host, size, false, NULL);
+ ret = qemu_vfio_dma_map(s, host, size, false, NULL);
+ if (ret) {
+ error_report("qemu_vfio_dma_map(%p, %zu) failed: %s", host, size,
+ strerror(-ret));
+ }
}
static void qemu_vfio_ram_block_removed(RAMBlockNotifier *n,
@@ -477,33 +483,14 @@ static void qemu_vfio_ram_block_removed(RAMBlockNotifier
*n,
}
}
-static int qemu_vfio_init_ramblock(RAMBlock *rb, void *opaque)
-{
- void *host_addr = qemu_ram_get_host_addr(rb);
- ram_addr_t length = qemu_ram_get_used_length(rb);
- int ret;
- QEMUVFIOState *s = opaque;
-
- if (!host_addr) {
- return 0;
- }
- ret = qemu_vfio_dma_map(s, host_addr, length, false, NULL);
- if (ret) {
- fprintf(stderr, "qemu_vfio_init_ramblock: failed %p %" PRId64 "\n",
- host_addr, (uint64_t)length);
- }
- return 0;
-}
-
static void qemu_vfio_open_common(QEMUVFIOState *s)
{
qemu_mutex_init(&s->lock);
s->ram_notifier.ram_block_added = qemu_vfio_ram_block_added;
s->ram_notifier.ram_block_removed = qemu_vfio_ram_block_removed;
- ram_block_notifier_add(&s->ram_notifier);
s->low_water_mark = QEMU_VFIO_IOVA_MIN;
s->high_water_mark = QEMU_VFIO_IOVA_MAX;
- qemu_ram_foreach_block(qemu_vfio_init_ramblock, s);
+ ram_block_notifier_add(&s->ram_notifier);
}
/**
--
2.31.1
- [PULL 17/17] tests/migration: introduce multifd into guestperf, (continued)
- [PULL 17/17] tests/migration: introduce multifd into guestperf, Dr. David Alan Gilbert (git), 2021/05/11
- Re: [PULL 00/17] migration queue, Peter Maydell, 2021/05/13
- [PULL 00/17] migration queue, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 01/17] migrate/ram: remove "ram_bulk_stage" and "fpo_enabled", Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 02/17] migration/ram: Reduce unnecessary rate limiting, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 03/17] migration/ram: Optimize ram_save_host_page(), Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 04/17] migration: Drop redundant query-migrate result @blocked, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 05/17] util: vfio-helpers: Factor out and fix processing of existing ram blocks,
Dr. David Alan Gilbert (git) <=
- [PULL 06/17] numa: Teach ram block notifiers about resizeable ram blocks, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 07/17] numa: Make all callbacks of ram block notifiers optional, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 08/17] migration/ram: Handle RAM block resizes during precopy, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 10/17] migration/ram: Discard RAM when growing RAM blocks after ram_postcopy_incoming_init(), Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 09/17] exec: Relax range check in ram_block_discard_range(), Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 11/17] migration/ram: Simplify host page handling in ram_load_postcopy(), Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 13/17] migration/multifd: Print used_length of memory block, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 12/17] migration/ram: Handle RAM block resizes during postcopy, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 14/17] migration/ram: Use offset_in_ramblock() in range checks, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 15/17] tests/migration-test: Fix "true" vs true, Dr. David Alan Gilbert (git), 2021/05/13