[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/7] hmp: extend "info numa" with hotplugged memory i
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 5/7] hmp: extend "info numa" with hotplugged memory information |
Date: |
Thu, 14 Sep 2017 16:04:45 +0100 |
From: Vadim Galitsyn <address@hidden>
Report amount of hotplugged memory in addition to total
amount per NUMA node.
Signed-off-by: Vadim Galitsyn <address@hidden>
Cc: Eduardo Habkost <address@hidden>
Cc: David Hildenbrand <address@hidden>
Cc: address@hidden
Message-Id: <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
include/qemu/typedefs.h | 1 +
include/sysemu/numa.h | 7 ++++++-
monitor.c | 9 ++++++---
numa.c | 18 +++++++++++++-----
4 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 39bc8351a3..163550214c 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -58,6 +58,7 @@ typedef struct MSIMessage MSIMessage;
typedef struct NetClientState NetClientState;
typedef struct NetFilterState NetFilterState;
typedef struct NICInfo NICInfo;
+typedef struct NumaNodeMem NumaNodeMem;
typedef struct PcGuestInfo PcGuestInfo;
typedef struct PCIBridge PCIBridge;
typedef struct PCIBus PCIBus;
diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h
index 610eece211..5c6df2820b 100644
--- a/include/sysemu/numa.h
+++ b/include/sysemu/numa.h
@@ -24,9 +24,14 @@ struct node_info {
uint8_t distance[MAX_NODES];
};
+struct NumaNodeMem {
+ uint64_t node_mem;
+ uint64_t node_plugged_mem;
+};
+
extern NodeInfo numa_info[MAX_NODES];
void parse_numa_opts(MachineState *ms);
-void query_numa_node_mem(uint64_t node_mem[]);
+void query_numa_node_mem(NumaNodeMem node_mem[]);
extern QemuOptsList qemu_numa_opts;
void numa_set_mem_node_id(ram_addr_t addr, uint64_t size, uint32_t node);
void numa_unset_mem_node_id(ram_addr_t addr, uint64_t size, uint32_t node);
diff --git a/monitor.c b/monitor.c
index 9239f7adde..058045b3cb 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1710,11 +1710,12 @@ static void hmp_info_mtree(Monitor *mon, const QDict
*qdict)
static void hmp_info_numa(Monitor *mon, const QDict *qdict)
{
int i;
- uint64_t *node_mem;
+ NumaNodeMem *node_mem;
CpuInfoList *cpu_list, *cpu;
cpu_list = qmp_query_cpus(&error_abort);
- node_mem = g_new0(uint64_t, nb_numa_nodes);
+ node_mem = g_new0(NumaNodeMem, nb_numa_nodes);
+
query_numa_node_mem(node_mem);
monitor_printf(mon, "%d nodes\n", nb_numa_nodes);
for (i = 0; i < nb_numa_nodes; i++) {
@@ -1727,7 +1728,9 @@ static void hmp_info_numa(Monitor *mon, const QDict
*qdict)
}
monitor_printf(mon, "\n");
monitor_printf(mon, "node %d size: %" PRId64 " MB\n", i,
- node_mem[i] >> 20);
+ node_mem[i].node_mem >> 20);
+ monitor_printf(mon, "node %d plugged: %" PRId64 " MB\n", i,
+ node_mem[i].node_plugged_mem >> 20);
}
qapi_free_CpuInfoList(cpu_list);
g_free(node_mem);
diff --git a/numa.c b/numa.c
index e32af04cd2..fe066ad2f8 100644
--- a/numa.c
+++ b/numa.c
@@ -591,11 +591,12 @@ void memory_region_allocate_system_memory(MemoryRegion
*mr, Object *owner,
}
}
-static void numa_stat_memory_devices(uint64_t node_mem[])
+static void numa_stat_memory_devices(NumaNodeMem node_mem[])
{
MemoryDeviceInfoList *info_list = NULL;
MemoryDeviceInfoList **prev = &info_list;
MemoryDeviceInfoList *info;
+ PCDIMMDeviceInfo *pcdimm_info;
qmp_pc_dimm_device_list(qdev_get_machine(), &prev);
for (info = info_list; info; info = info->next) {
@@ -603,9 +604,16 @@ static void numa_stat_memory_devices(uint64_t node_mem[])
if (value) {
switch (value->type) {
- case MEMORY_DEVICE_INFO_KIND_DIMM:
- node_mem[value->u.dimm.data->node] += value->u.dimm.data->size;
+ case MEMORY_DEVICE_INFO_KIND_DIMM: {
+ pcdimm_info = value->u.dimm.data;
+ node_mem[pcdimm_info->node].node_mem += pcdimm_info->size;
+ if (pcdimm_info->hotpluggable && pcdimm_info->hotplugged) {
+ node_mem[pcdimm_info->node].node_plugged_mem +=
+ pcdimm_info->size;
+ }
break;
+ }
+
default:
break;
}
@@ -614,7 +622,7 @@ static void numa_stat_memory_devices(uint64_t node_mem[])
qapi_free_MemoryDeviceInfoList(info_list);
}
-void query_numa_node_mem(uint64_t node_mem[])
+void query_numa_node_mem(NumaNodeMem node_mem[])
{
int i;
@@ -624,7 +632,7 @@ void query_numa_node_mem(uint64_t node_mem[])
numa_stat_memory_devices(node_mem);
for (i = 0; i < nb_numa_nodes; i++) {
- node_mem[i] += numa_info[i].node_mem;
+ node_mem[i].node_mem += numa_info[i].node_mem;
}
}
--
2.13.5
- [Qemu-devel] [PULL 0/7] hmp queue, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 2/7] hmp: fix "dump-quest-memory" segfault (arm), Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 1/7] hmp: fix "dump-quest-memory" segfault (ppc), Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 3/7] dump: do not dump non-existent guest memory, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 4/7] tests/hmp: test "none" machine with memory, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 5/7] hmp: extend "info numa" with hotplugged memory information,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 7/7] hmp: introduce 'info memory_size_summary' command, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 6/7] qmp: introduce query-memory-size-summary command, Dr. David Alan Gilbert (git), 2017/09/14
- Re: [Qemu-devel] [PULL 0/7] hmp queue, Peter Maydell, 2017/09/14