| Message ID | 1461402396-11776-3-git-send-email-zhaoshenglong@huawei.com |
|---|---|
| State | New |
| Headers | show |
On Sat, Apr 23, 2016 at 05:06:33PM +0800, Shannon Zhao wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > When specifying NUMA for ARM machine, generate /memory node according to > NUMA topology. > > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > --- > hw/arm/boot.c | 43 +++++++++++++++++++++++++++++++++++++------ > 1 file changed, 37 insertions(+), 6 deletions(-) Reviewed-by: Andrew Jones <drjones@redhat.com> > > 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 > + * /memory@addr 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("/memory@%" 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 > >
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 + * /memory@addr 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("/memory@%" 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) {