From patchwork Tue Aug 20 01:07:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanlong Gao X-Patchwork-Id: 268337 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 D04102C0131 for ; Tue, 20 Aug 2013 11:12:15 +1000 (EST) Received: from localhost ([::1]:45474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBaUX-0002g9-Lf for incoming@patchwork.ozlabs.org; Mon, 19 Aug 2013 21:12:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBaQr-0006Dd-Lq for qemu-devel@nongnu.org; Mon, 19 Aug 2013 21:08:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VBaQi-0007dF-71 for qemu-devel@nongnu.org; Mon, 19 Aug 2013 21:08:25 -0400 Received: from [222.73.24.84] (port=64233 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBaQh-0007cV-9e for qemu-devel@nongnu.org; Mon, 19 Aug 2013 21:08:16 -0400 X-IronPort-AV: E=Sophos;i="4.89,915,1367942400"; d="scan'208";a="8245568" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 20 Aug 2013 09:05:00 +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 r7K183f4004536; Tue, 20 Aug 2013 09:08:03 +0800 Received: from G08FNSTD121251.fnst.cn.fujitsu.com ([10.167.226.75]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013082009061968-773968 ; Tue, 20 Aug 2013 09:06:19 +0800 From: Wanlong Gao To: qemu-devel@nongnu.org Date: Tue, 20 Aug 2013 09:07:12 +0800 Message-Id: <1376960839-13033-5-git-send-email-gaowanlong@cn.fujitsu.com> X-Mailer: git-send-email 1.8.4.rc1.21.gfb56570 In-Reply-To: <1376960839-13033-1-git-send-email-gaowanlong@cn.fujitsu.com> References: <1376960839-13033-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/08/20 09:06:19, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/08/20 09:06:20, Serialize complete at 2013/08/20 09:06:20 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: aliguori@us.ibm.com, ehabkost@redhat.com, lersek@redhat.com, peter.huangpeng@huawei.com, lcapitulino@redhat.com, bsd@redhat.com, hutao@cn.fujitsu.com, y-goto@jp.fujitsu.com, pbonzini@redhat.com, afaerber@suse.de, gaowanlong@cn.fujitsu.com Subject: [Qemu-devel] [PATCH V8 04/11] NUMA: 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. Reviewed-by: Eduardo Habkost Signed-off-by: Andre Przywara Signed-off-by: Wanlong Gao --- hw/i386/pc.c | 4 ++-- include/sysemu/sysemu.h | 8 ++++++-- monitor.c | 2 +- numa.c | 21 +++++++++++---------- vl.c | 7 +++---- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e8bc8ce..1a534b2 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -653,14 +653,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 b42f4a1..b683d08 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_CPUMASK_BITS 255 extern int nb_numa_nodes; extern int nb_numa_mem_nodes; -extern uint64_t node_mem[MAX_NODES]; -extern unsigned long *node_cpumask[MAX_NODES]; +typedef struct node_info { + uint64_t node_mem; + DECLARE_BITMAP(node_cpu, MAX_CPUMASK_BITS); +} NodeInfo; +extern NodeInfo numa_info[MAX_NODES]; extern QemuOptsList qemu_numa_opts; int numa_init_func(QemuOpts *opts, void *opaque); void set_numa_nodes(void); diff --git a/monitor.c b/monitor.c index 5dc0aa9..513af25 100644 --- a/monitor.c +++ b/monitor.c @@ -1826,7 +1826,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/numa.c b/numa.c index 7b37a3b..fa2e4ea 100644 --- a/numa.c +++ b/numa.c @@ -53,7 +53,7 @@ static int numa_node_parse(NumaNodeOptions *opts) } for (cpus = opts->cpus; cpus; cpus = cpus->next) { - bitmap_set(node_cpumask[nodenr], cpus->value, 1); + bitmap_set(numa_info[nodenr].node_cpu, cpus->value, 1); } if (opts->has_mem) { @@ -64,7 +64,7 @@ static int numa_node_parse(NumaNodeOptions *opts) fprintf(stderr, "qemu: invalid numa mem size: %s\n", opts->mem); return -1; } - node_mem[nodenr] = mem_size; + numa_info[nodenr].node_mem = mem_size; } return 0; @@ -88,7 +88,7 @@ static int numa_mem_parse(NumaMemOptions *opts) if (opts->has_size) { mem_size = opts->size; - node_mem[nodenr] = mem_size; + numa_info[nodenr].node_mem = mem_size; } return 0; @@ -160,7 +160,7 @@ void set_numa_nodes(void) * 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; } } @@ -172,14 +172,15 @@ void set_numa_nodes(void) * 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; } } @@ -189,7 +190,7 @@ void set_numa_nodes(void) */ 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); } } } @@ -202,7 +203,7 @@ void set_numa_modes(void) for (cpu = first_cpu; cpu != NULL; cpu = cpu->next_cpu) { 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/vl.c b/vl.c index 5f0a5e4..89bbccb 100644 --- a/vl.c +++ b/vl.c @@ -251,8 +251,7 @@ static QTAILQ_HEAD(, FWBootEntry) fw_boot_order = int nb_numa_nodes; int nb_numa_mem_nodes; -uint64_t node_mem[MAX_NODES]; -unsigned long *node_cpumask[MAX_NODES]; +NodeInfo numa_info[MAX_NODES]; uint8_t qemu_uuid[16]; @@ -2887,8 +2886,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;