From patchwork Tue Jun 18 08:09:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanlong Gao X-Patchwork-Id: 252130 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3E21E2C029B for ; Tue, 18 Jun 2013 18:20:35 +1000 (EST) Received: from localhost ([::1]:39170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uor3t-0001Ms-Ct for incoming@patchwork.ozlabs.org; Tue, 18 Jun 2013 04:14:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uor1s-0006py-K9 for qemu-devel@nongnu.org; Tue, 18 Jun 2013 04:12:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uor1p-0001Tr-F0 for qemu-devel@nongnu.org; Tue, 18 Jun 2013 04:12:40 -0400 Received: from [222.73.24.84] (port=18122 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uor1o-0001Oz-JT for qemu-devel@nongnu.org; Tue, 18 Jun 2013 04:12:37 -0400 X-IronPort-AV: E=Sophos;i="4.87,887,1363104000"; d="scan'208";a="7587534" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 18 Jun 2013 16:09:11 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r5I8C1rF003318; Tue, 18 Jun 2013 16:12:02 +0800 Received: from G08FNSTD121251.fnst.cn.fujitsu.com ([10.167.233.84]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013061816095969-2230900 ; Tue, 18 Jun 2013 16:09:59 +0800 From: Wanlong Gao To: qemu-devel@nongnu.org Date: Tue, 18 Jun 2013 16:09:45 +0800 Message-Id: <1371542991-15911-2-git-send-email-gaowanlong@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.rc2.10.g0c2b1cf In-Reply-To: <1371542991-15911-1-git-send-email-gaowanlong@cn.fujitsu.com> References: <1371542991-15911-1-git-send-email-gaowanlong@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/18 16:09:59, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/18 16:10:02, Serialize complete at 2013/06/18 16:10:02 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: andre.przywara@amd.com, aliguori@us.ibm.com, ehabkost@redhat.com, pbonzini@redhat.com, y-goto@jp.fujitsu.com, afaerber@suse.de, gaowanlong@cn.fujitsu.com Subject: [Qemu-devel] [PATCH 1/7] Add numa_info structure to contain numa nodes info X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add the numa_info structure to contain the numa nodes memory, VCPUs information and the future added numa nodes host memory policies. Signed-off-by: Andre Przywara Signed-off-by: Wanlong Gao --- cpus.c | 2 +- hw/i386/pc.c | 4 ++-- include/sysemu/sysemu.h | 8 ++++++-- monitor.c | 2 +- vl.c | 26 +++++++++++++------------- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/cpus.c b/cpus.c index c8bc8ad..e123d3f 100644 --- a/cpus.c +++ b/cpus.c @@ -1195,7 +1195,7 @@ void set_numa_modes(void) for (env = first_cpu; env != NULL; env = env->next_cpu) { cpu = ENV_GET_CPU(env); for (i = 0; i < nb_numa_nodes; i++) { - if (test_bit(cpu->cpu_index, node_cpumask[i])) { + if (test_bit(cpu->cpu_index, numa_info[i].node_cpu)) { cpu->numa_node = i; } } diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e0fbb86..935241b 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -651,14 +651,14 @@ static FWCfgState *bochs_bios_init(void) unsigned int apic_id = x86_cpu_apic_id_from_index(i); assert(apic_id < apic_id_limit); for (j = 0; j < nb_numa_nodes; j++) { - if (test_bit(i, node_cpumask[j])) { + if (test_bit(i, numa_info[j].node_cpu)) { numa_fw_cfg[apic_id + 1] = cpu_to_le64(j); break; } } } for (i = 0; i < nb_numa_nodes; i++) { - numa_fw_cfg[apic_id_limit + 1 + i] = cpu_to_le64(node_mem[i]); + numa_fw_cfg[apic_id_limit + 1 + i] = cpu_to_le64(numa_info[i].node_mem); } fw_cfg_add_bytes(fw_cfg, FW_CFG_NUMA, numa_fw_cfg, (1 + apic_id_limit + nb_numa_nodes) * diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 2fb71af..70fd2ed 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -9,6 +9,7 @@ #include "qapi-types.h" #include "qemu/notify.h" #include "qemu/main-loop.h" +#include "qemu/bitmap.h" /* vl.c */ @@ -130,8 +131,11 @@ extern QEMUClock *rtc_clock; #define MAX_NODES 64 #define MAX_CPUMASK_BITS 255 extern int nb_numa_nodes; -extern uint64_t node_mem[MAX_NODES]; -extern unsigned long *node_cpumask[MAX_NODES]; +struct node_info { + uint64_t node_mem; + DECLARE_BITMAP(node_cpu, MAX_CPUMASK_BITS); +}; +extern struct node_info numa_info[MAX_NODES]; #define MAX_OPTION_ROMS 16 typedef struct QEMUOptionRom { diff --git a/monitor.c b/monitor.c index 70ae8f5..61dbebb 100644 --- a/monitor.c +++ b/monitor.c @@ -1819,7 +1819,7 @@ static void do_info_numa(Monitor *mon, const QDict *qdict) } monitor_printf(mon, "\n"); monitor_printf(mon, "node %d size: %" PRId64 " MB\n", i, - node_mem[i] >> 20); + numa_info[i].node_mem >> 20); } } diff --git a/vl.c b/vl.c index f94ec9c..42dec5e 100644 --- a/vl.c +++ b/vl.c @@ -250,8 +250,7 @@ static QTAILQ_HEAD(, FWBootEntry) fw_boot_order = QTAILQ_HEAD_INITIALIZER(fw_boot_order); int nb_numa_nodes; -uint64_t node_mem[MAX_NODES]; -unsigned long *node_cpumask[MAX_NODES]; +struct node_info numa_info[MAX_NODES]; uint8_t qemu_uuid[16]; @@ -1341,7 +1340,7 @@ static void numa_node_parse_cpus(int nodenr, const char *cpus) goto error; } - bitmap_set(node_cpumask[nodenr], value, endvalue-value+1); + bitmap_set(numa_info[nodenr].node_cpu, value, endvalue-value+1); return; error: @@ -1381,7 +1380,7 @@ static void numa_add(const char *optarg) } if (get_param_value(option, 128, "mem", optarg) == 0) { - node_mem[nodenr] = 0; + numa_info[nodenr].node_mem = 0; } else { int64_t sval; sval = strtosz(option, &endptr); @@ -1389,7 +1388,7 @@ static void numa_add(const char *optarg) fprintf(stderr, "qemu: invalid numa mem size: %s\n", optarg); exit(1); } - node_mem[nodenr] = sval; + numa_info[nodenr].node_mem = sval; } if (get_param_value(option, 128, "cpus", optarg) != 0) { numa_node_parse_cpus(nodenr, option); @@ -2921,8 +2920,8 @@ int main(int argc, char **argv, char **envp) translation = BIOS_ATA_TRANSLATION_AUTO; for (i = 0; i < MAX_NODES; i++) { - node_mem[i] = 0; - node_cpumask[i] = bitmap_new(MAX_CPUMASK_BITS); + numa_info[i].node_mem = 0; + bitmap_zero(numa_info[i].node_cpu, MAX_CPUMASK_BITS); } nb_numa_nodes = 0; @@ -4228,7 +4227,7 @@ int main(int argc, char **argv, char **envp) * and distribute the available memory equally across all nodes */ for (i = 0; i < nb_numa_nodes; i++) { - if (node_mem[i] != 0) + if (numa_info[i].node_mem != 0) break; } if (i == nb_numa_nodes) { @@ -4238,14 +4237,15 @@ int main(int argc, char **argv, char **envp) * the final node gets the rest. */ for (i = 0; i < nb_numa_nodes - 1; i++) { - node_mem[i] = (ram_size / nb_numa_nodes) & ~((1 << 23UL) - 1); - usedmem += node_mem[i]; + numa_info[i].node_mem = (ram_size / nb_numa_nodes) & + ~((1 << 23UL) - 1); + usedmem += numa_info[i].node_mem; } - node_mem[i] = ram_size - usedmem; + numa_info[i].node_mem = ram_size - usedmem; } for (i = 0; i < nb_numa_nodes; i++) { - if (!bitmap_empty(node_cpumask[i], MAX_CPUMASK_BITS)) { + if (!bitmap_empty(numa_info[i].node_cpu, MAX_CPUMASK_BITS)) { break; } } @@ -4255,7 +4255,7 @@ int main(int argc, char **argv, char **envp) */ if (i == nb_numa_nodes) { for (i = 0; i < max_cpus; i++) { - set_bit(i, node_cpumask[i % nb_numa_nodes]); + set_bit(i, numa_info[i % nb_numa_nodes].node_cpu); } } }