From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDCYf-0001QQ-Md for qemu-devel@nongnu.org; Thu, 09 Jul 2015 10:12:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZDCYe-0004Mg-MC for qemu-devel@nongnu.org; Thu, 09 Jul 2015 10:12:13 -0400 Received: from mail-wi0-x22f.google.com ([2a00:1450:400c:c05::22f]:38109) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDCYe-0004Mb-Dw for qemu-devel@nongnu.org; Thu, 09 Jul 2015 10:12:12 -0400 Received: by wicmv11 with SMTP id mv11so2370672wic.1 for ; Thu, 09 Jul 2015 07:12:11 -0700 (PDT) Sender: Paolo Bonzini References: <1435956624-21609-1-git-send-email-ehabkost@redhat.com> <1435956624-21609-6-git-send-email-ehabkost@redhat.com> From: Paolo Bonzini Message-ID: <559E8139.8030809@redhat.com> Date: Thu, 9 Jul 2015 16:12:09 +0200 MIME-Version: 1.0 In-Reply-To: <1435956624-21609-6-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL 5/6] numa: Store boot memory address range in node_info List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , Peter Maydell Cc: "Michael S. Tsirkin" , qemu-devel@nongnu.org, Bharata B Rao On 03/07/2015 22:50, Eduardo Habkost wrote: > From: Bharata B Rao > > Store memory address range information of boot memory in address > range list of numa_info. > > This helps to have a common NUMA node lookup by address function that > works for both boot-time memory and hotplugged memory. > > Signed-off-by: Bharata B Rao > Reviewed-by: David Gibson > Tested-by: Igor Mammedov > Signed-off-by: Eduardo Habkost > --- > numa.c | 27 +++++++++++++++++++++++++++ > 1 file changed, 27 insertions(+) > > diff --git a/numa.c b/numa.c > index 116d1fb..a73f648 100644 > --- a/numa.c > +++ b/numa.c > @@ -56,6 +56,14 @@ void numa_set_mem_node_id(ram_addr_t addr, uint64_t size, uint32_t node) > { > struct numa_addr_range *range = g_malloc0(sizeof(*range)); > > + /* > + * Memory-less nodes can come here with 0 size in which case, > + * there is nothing to do. > + */ > + if (!size) { > + return; This leaks "range". Paolo > + } > + > range->mem_start = addr; > range->mem_end = addr + size - 1; > QLIST_INSERT_HEAD(&numa_info[node].addr, range, entry); > @@ -74,6 +82,21 @@ void numa_unset_mem_node_id(ram_addr_t addr, uint64_t size, uint32_t node) > } > } > > +static void numa_set_mem_ranges(void) > +{ > + int i; > + ram_addr_t mem_start = 0; > + > + /* > + * Deduce start address of each node and use it to store > + * the address range info in numa_info address range list > + */ > + for (i = 0; i < nb_numa_nodes; i++) { > + numa_set_mem_node_id(mem_start, numa_info[i].node_mem, i); > + mem_start += numa_info[i].node_mem; > + } > +} > + > static void numa_node_parse(NumaNodeOptions *node, QemuOpts *opts, Error **errp) > { > uint16_t nodenr; > @@ -299,6 +322,8 @@ void parse_numa_opts(MachineClass *mc) > QLIST_INIT(&numa_info[i].addr); > } > > + numa_set_mem_ranges(); > + > for (i = 0; i < nb_numa_nodes; i++) { > if (!bitmap_empty(numa_info[i].node_cpu, MAX_CPUMASK_BITS)) { > break; > @@ -323,6 +348,8 @@ void parse_numa_opts(MachineClass *mc) > } > > validate_numa_cpus(); > + } else { > + numa_set_mem_node_id(0, ram_size, 0); > } > } > >