mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hmp: extend "info numa" with hotplugged memory information

Browse Source 
Report amount of hotplugged memory in addition to total
amount per NUMA node.

Signed-off-by: Vadim Galitsyn <vadim.galitsyn@profitbricks.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: qemu-devel@nongnu.org
Message-Id: <20170829153022.27004-2-vadim.galitsyn@profitbricks.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Vadim Galitsyn 2017-08-29 17:30:20 +02:00 committed by Dr. David Alan Gilbert
parent 4e5c3a3742
commit 31959e82fb
4 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/qemu/typedefs.h
View File

@ -58,6 +58,7 @@ typedef struct MSIMessage MSIMessage;
typedef struct NetClientState NetClientState; typedef struct NetClientState NetClientState;
typedef struct NetFilterState NetFilterState; typedef struct NetFilterState NetFilterState;
typedef struct NICInfo NICInfo; typedef struct NICInfo NICInfo;
typedef struct NumaNodeMem NumaNodeMem;
typedef struct PcGuestInfo PcGuestInfo; typedef struct PcGuestInfo PcGuestInfo;
typedef struct PCIBridge PCIBridge; typedef struct PCIBridge PCIBridge;
typedef struct PCIBus PCIBus; typedef struct PCIBus PCIBus;

7
include/sysemu/numa.h
View File

@ -24,9 +24,14 @@ struct node_info {
uint8_t distance[MAX_NODES]; uint8_t distance[MAX_NODES];
}; };
struct NumaNodeMem {
uint64_t node_mem;
uint64_t node_plugged_mem;
};
extern NodeInfo numa_info[MAX_NODES]; extern NodeInfo numa_info[MAX_NODES];
void parse_numa_opts(MachineState *ms); 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; extern QemuOptsList qemu_numa_opts;
void numa_set_mem_node_id(ram_addr_t addr, uint64_t size, uint32_t node); 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); void numa_unset_mem_node_id(ram_addr_t addr, uint64_t size, uint32_t node);

9
monitor.c
View File

@ -1710,11 +1710,12 @@ static void hmp_info_mtree(Monitor *mon, const QDict *qdict)
static void hmp_info_numa(Monitor *mon, const QDict *qdict) static void hmp_info_numa(Monitor *mon, const QDict *qdict)
{ {
int i; int i;
uint64_t *node_mem; NumaNodeMem *node_mem;
CpuInfoList *cpu_list, *cpu; CpuInfoList *cpu_list, *cpu;
cpu_list = qmp_query_cpus(&error_abort); 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); query_numa_node_mem(node_mem);
monitor_printf(mon, "%d nodes\n", nb_numa_nodes); monitor_printf(mon, "%d nodes\n", nb_numa_nodes);
for (i = 0; i < nb_numa_nodes; i++) { 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, "\n");
monitor_printf(mon, "node %d size: %" PRId64 " MB\n", i, 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); qapi_free_CpuInfoList(cpu_list);
g_free(node_mem); g_free(node_mem);

18
numa.c
View File

@ -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 *info_list = NULL;
MemoryDeviceInfoList **prev = &info_list; MemoryDeviceInfoList **prev = &info_list;
MemoryDeviceInfoList *info; MemoryDeviceInfoList *info;
PCDIMMDeviceInfo *pcdimm_info;
qmp_pc_dimm_device_list(qdev_get_machine(), &prev); qmp_pc_dimm_device_list(qdev_get_machine(), &prev);
for (info = info_list; info; info = info->next) { for (info = info_list; info; info = info->next) {
@ -603,9 +604,16 @@ static void numa_stat_memory_devices(uint64_t node_mem[])
if (value) { if (value) {
switch (value->type) { switch (value->type) {
case MEMORY_DEVICE_INFO_KIND_DIMM: case MEMORY_DEVICE_INFO_KIND_DIMM: {
node_mem[value->u.dimm.data->node] += value->u.dimm.data->size; 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; break;
}
default: default:
break; break;
} }
@ -614,7 +622,7 @@ static void numa_stat_memory_devices(uint64_t node_mem[])
qapi_free_MemoryDeviceInfoList(info_list); qapi_free_MemoryDeviceInfoList(info_list);
} }
void query_numa_node_mem(uint64_t node_mem[]) void query_numa_node_mem(NumaNodeMem node_mem[])
{ {
int i; int i;
@ -624,7 +632,7 @@ void query_numa_node_mem(uint64_t node_mem[])
numa_stat_memory_devices(node_mem); numa_stat_memory_devices(node_mem);
for (i = 0; i < nb_numa_nodes; i++) { 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;
} }
} }