[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 2/5] ARM: Add numa-node-id for /memory node
From: |
Shannon Zhao |
Subject: |
[Qemu-devel] [PATCH v6 2/5] ARM: Add numa-node-id for /memory node |
Date: |
Sat, 23 Apr 2016 17:06:33 +0800 |
From: Shannon Zhao <address@hidden>
When specifying NUMA for ARM machine, generate /memory node according to
NUMA topology.
Signed-off-by: Shannon Zhao <address@hidden>
---
hw/arm/boot.c | 43 +++++++++++++++++++++++++++++++++++++------
1 file changed, 37 insertions(+), 6 deletions(-)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 5975fbf..cbc65a7 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -14,6 +14,7 @@
#include "hw/arm/linux-boot-if.h"
#include "sysemu/kvm.h"
#include "sysemu/sysemu.h"
+#include "sysemu/numa.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
@@ -405,6 +406,9 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info
*binfo,
void *fdt = NULL;
int size, rc;
uint32_t acells, scells;
+ char *nodename;
+ unsigned int i;
+ hwaddr mem_base, mem_len;
if (binfo->dtb_filename) {
char *filename;
@@ -456,12 +460,39 @@ static int load_dtb(hwaddr addr, const struct
arm_boot_info *binfo,
goto fail;
}
- rc = qemu_fdt_setprop_sized_cells(fdt, "/memory", "reg",
- acells, binfo->loader_start,
- scells, binfo->ram_size);
- if (rc < 0) {
- fprintf(stderr, "couldn't set /memory/reg\n");
- goto fail;
+ if (nb_numa_nodes > 0) {
+ /*
+ * Turn the /memory node created before into a NOP node, then create
+ * /address@hidden nodes for all numa nodes respectively.
+ */
+ qemu_fdt_nop_node(fdt, "/memory");
+ mem_base = binfo->loader_start;
+ for (i = 0; i < nb_numa_nodes; i++) {
+ mem_len = numa_info[i].node_mem;
+ nodename = g_strdup_printf("/address@hidden" PRIx64, mem_base);
+ qemu_fdt_add_subnode(fdt, nodename);
+ qemu_fdt_setprop_string(fdt, nodename, "device_type", "memory");
+ rc = qemu_fdt_setprop_sized_cells(fdt, nodename, "reg",
+ acells, mem_base,
+ scells, mem_len);
+ if (rc < 0) {
+ fprintf(stderr, "couldn't set %s/reg for node %d\n", nodename,
+ i);
+ goto fail;
+ }
+
+ qemu_fdt_setprop_cell(fdt, nodename, "numa-node-id", i);
+ mem_base += mem_len;
+ g_free(nodename);
+ }
+ } else {
+ rc = qemu_fdt_setprop_sized_cells(fdt, "/memory", "reg",
+ acells, binfo->loader_start,
+ scells, binfo->ram_size);
+ if (rc < 0) {
+ fprintf(stderr, "couldn't set /memory/reg\n");
+ goto fail;
+ }
}
if (binfo->kernel_cmdline && *binfo->kernel_cmdline) {
--
2.0.4
- [Qemu-devel] [PATCH v6 0/5] ARM: Add NUMA support for machine virt, Shannon Zhao, 2016/04/23
- [Qemu-devel] [PATCH v6 5/5] ACPI: Virt: Generate SRAT table, Shannon Zhao, 2016/04/23
- [Qemu-devel] [PATCH v6 2/5] ARM: Add numa-node-id for /memory node,
Shannon Zhao <=
- [Qemu-devel] [PATCH v6 3/5] ACPI: Add GICC Affinity Structure, Shannon Zhao, 2016/04/23
- [Qemu-devel] [PATCH v6 1/5] ARM: Virt: Set numa-node-id for CPUs, Shannon Zhao, 2016/04/23
- [Qemu-devel] [PATCH v6 4/5] ACPI: move acpi_build_srat_memory to common place, Shannon Zhao, 2016/04/23
- Re: [Qemu-devel] [PATCH v6 0/5] ARM: Add NUMA support for machine virt, Andrew Jones, 2016/04/24