From 79c20715a2bf80601dc16f9330ae901050560b9d Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 24 Jul 2015 05:25:58 +0200 Subject: [PATCH 36/58] numa: API to lookup NUMA node by address Message-id: <1437715580-14817-7-git-send-email-dgibson@redhat.com> Patchwork-id: 67123 O-Subject: [RHEL7.2 qemu-kvm-rhev PATCHv3 06/28] numa: API to lookup NUMA node by address Bugzilla: 1211117 RH-Acked-by: Laurent Vivier RH-Acked-by: Igor Mammedov RH-Acked-by: Laszlo Ersek Introduce an API numa_get_node(ram_addr_t addr, Error **errp) that returns the NUMA node to which the given address belongs to. This API works uniformly for both boot time as well as hotplugged memory. This API is needed by sPAPR PowerPC to support ibm,dynamic-reconfiguration-memory device tree node which is needed for memory hotplug. Signed-off-by: Bharata B Rao Reviewed-by: David Gibson Tested-by: Igor Mammedov Signed-off-by: Eduardo Habkost (cherry picked from commit e75e2a14d5c13ad38dcf72b69922dee2dafbb0d0) Signed-off-by: David Gibson Signed-off-by: Miroslav Rezanina --- include/sysemu/numa.h | 1 + numa.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index 7176364..a6392bc 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -31,5 +31,6 @@ void query_numa_node_mem(uint64_t 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); +uint32_t numa_get_node(ram_addr_t addr, Error **errp); #endif diff --git a/numa.c b/numa.c index 2bf44b9..2c022fd 100644 --- a/numa.c +++ b/numa.c @@ -98,6 +98,47 @@ static void numa_set_mem_ranges(void) } } +/* + * Check if @addr falls under NUMA @node. + */ +static bool numa_addr_belongs_to_node(ram_addr_t addr, uint32_t node) +{ + struct numa_addr_range *range; + + QLIST_FOREACH(range, &numa_info[node].addr, entry) { + if (addr >= range->mem_start && addr <= range->mem_end) { + return true; + } + } + return false; +} + +/* + * Given an address, return the index of the NUMA node to which the + * address belongs to. + */ +uint32_t numa_get_node(ram_addr_t addr, Error **errp) +{ + uint32_t i; + + /* For non NUMA configurations, check if the addr falls under node 0 */ + if (!nb_numa_nodes) { + if (numa_addr_belongs_to_node(addr, 0)) { + return 0; + } + } + + for (i = 0; i < nb_numa_nodes; i++) { + if (numa_addr_belongs_to_node(addr, i)) { + return i; + } + } + + error_setg(errp, "Address 0x" RAM_ADDR_FMT " doesn't belong to any " + "NUMA node", addr); + return -1; +} + static void numa_node_parse(NumaNodeOptions *node, QemuOpts *opts, Error **errp) { uint16_t nodenr; -- 1.8.3.1