[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 05/15] kvm: Return number of free memslots
From: |
David Hildenbrand |
Subject: |
[PATCH v1 05/15] kvm: Return number of free memslots |
Date: |
Fri, 16 Jun 2023 11:26:44 +0200 |
Let's return the number of free slots instead of only checking if there
is a free slot. While at it, check all address spaces, which will also
consider SMM under x86 correctly.
Make the stub return UINT_MAX, such that we can call the function
unconditionally.
This is a preparation for memory devices that consume multiple memslots.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
accel/kvm/kvm-all.c | 33 ++++++++++++++++++++-------------
accel/stubs/kvm-stub.c | 4 ++--
hw/mem/memory-device.c | 2 +-
include/sysemu/kvm.h | 2 +-
include/sysemu/kvm_int.h | 1 +
5 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 94d672010e..33295239ca 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -181,6 +181,24 @@ unsigned int kvm_get_max_memslots(void)
return s->nr_slots;
}
+unsigned int kvm_get_free_memslots(void)
+{
+ unsigned int used_slots = 0;
+ KVMState *s = kvm_state;
+ int i;
+
+ kvm_slots_lock();
+ for (i = 0; i < s->nr_as; i++) {
+ if (!s->as[i].ml) {
+ continue;
+ }
+ used_slots = MAX(used_slots, s->as[i].ml->nr_used_slots);
+ }
+ kvm_slots_unlock();
+
+ return s->nr_slots - used_slots;
+}
+
/* Called with KVMMemoryListener.slots_lock held */
static KVMSlot *kvm_get_free_slot(KVMMemoryListener *kml)
{
@@ -196,19 +214,6 @@ static KVMSlot *kvm_get_free_slot(KVMMemoryListener *kml)
return NULL;
}
-bool kvm_has_free_slot(MachineState *ms)
-{
- KVMState *s = KVM_STATE(ms->accelerator);
- bool result;
- KVMMemoryListener *kml = &s->memory_listener;
-
- kvm_slots_lock();
- result = !!kvm_get_free_slot(kml);
- kvm_slots_unlock();
-
- return result;
-}
-
/* Called with KVMMemoryListener.slots_lock held */
static KVMSlot *kvm_alloc_slot(KVMMemoryListener *kml)
{
@@ -1384,6 +1389,7 @@ static void kvm_set_phys_mem(KVMMemoryListener *kml,
}
start_addr += slot_size;
size -= slot_size;
+ kml->nr_used_slots--;
} while (size);
return;
}
@@ -1409,6 +1415,7 @@ static void kvm_set_phys_mem(KVMMemoryListener *kml,
ram_start_offset += slot_size;
ram += slot_size;
size -= slot_size;
+ kml->nr_used_slots++;
} while (size);
}
diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c
index 506bc8c9e4..fd0b8ae8bb 100644
--- a/accel/stubs/kvm-stub.c
+++ b/accel/stubs/kvm-stub.c
@@ -113,9 +113,9 @@ unsigned int kvm_get_max_memslots(void)
return UINT_MAX;
}
-bool kvm_has_free_slot(MachineState *ms)
+unsigned int kvm_get_free_memslots(void)
{
- return false;
+ return UINT_MAX;
}
void kvm_init_cpu_signals(CPUState *cpu)
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 0d007e559c..cee90d5182 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -133,7 +133,7 @@ static void memory_device_check_addable(MachineState *ms,
MemoryRegion *mr,
const uint64_t size = memory_region_size(mr);
/* we will need a new memory slot for kvm and vhost */
- if (kvm_enabled() && !kvm_has_free_slot(ms)) {
+ if (!kvm_get_free_memslots()) {
error_setg(errp, "hypervisor has no free memory slots left");
return;
}
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 7a999eff52..8bf6ef5a07 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -214,7 +214,7 @@ typedef struct KVMRouteChange {
/* external API */
unsigned int kvm_get_max_memslots(void);
-bool kvm_has_free_slot(MachineState *ms);
+unsigned int kvm_get_free_memslots(void);
bool kvm_has_sync_mmu(void);
int kvm_has_vcpu_events(void);
int kvm_has_robust_singlestep(void);
diff --git a/include/sysemu/kvm_int.h b/include/sysemu/kvm_int.h
index 511b42bde5..8b09e78b12 100644
--- a/include/sysemu/kvm_int.h
+++ b/include/sysemu/kvm_int.h
@@ -40,6 +40,7 @@ typedef struct KVMMemoryUpdate {
typedef struct KVMMemoryListener {
MemoryListener listener;
KVMSlot *slots;
+ int nr_used_slots;
int as_id;
QSIMPLEQ_HEAD(, KVMMemoryUpdate) transaction_add;
QSIMPLEQ_HEAD(, KVMMemoryUpdate) transaction_del;
--
2.40.1
- [PATCH v1 00/15] virtio-mem: Expose device memory through multiple memslots, David Hildenbrand, 2023/06/16
- [PATCH v1 01/15] memory-device: Track the required memslots in DeviceMemoryState, David Hildenbrand, 2023/06/16
- [PATCH v1 02/15] kvm: Add stub for kvm_get_max_memslots(), David Hildenbrand, 2023/06/16
- [PATCH v1 03/15] vhost: Add vhost_get_max_memslots(), David Hildenbrand, 2023/06/16
- [PATCH v1 04/15] memory-device, vhost: Add a memslot soft limit for memory devices, David Hildenbrand, 2023/06/16
- [PATCH v1 05/15] kvm: Return number of free memslots,
David Hildenbrand <=
- [PATCH v1 06/15] vhost: Return number of free memslots, David Hildenbrand, 2023/06/16
- [PATCH v1 07/15] memory-device: Support memory devices that statically consume multiple memslots, David Hildenbrand, 2023/06/16
- [PATCH v1 08/15] memory-device: Track the actually used memslots in DeviceMemoryState, David Hildenbrand, 2023/06/16
- [PATCH v1 09/15] memory-device, vhost: Support memory devices that dynamically consume multiple memslots, David Hildenbrand, 2023/06/16
- [PATCH v1 10/15] pc-dimm: Provide pc_dimm_get_free_slots() to query free ram slots, David Hildenbrand, 2023/06/16
- [PATCH v1 11/15] memory-device: Support memory-devices with auto-detection of the number of memslots, David Hildenbrand, 2023/06/16
- [PATCH v1 12/15] memory: Clarify mapping requirements for RamDiscardManager, David Hildenbrand, 2023/06/16
- [PATCH v1 13/15] virtio-mem: Expose device memory via multiple memslots if enabled, David Hildenbrand, 2023/06/16
- [PATCH v1 15/15] virtio-mem: Mark memslot alias memory regions unmergeable, David Hildenbrand, 2023/06/16
- [PATCH v1 14/15] memory, vhost: Allow for marking memory device memory regions unmergeable, David Hildenbrand, 2023/06/16