From patchwork Fri Aug 23 04:09:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanlong Gao X-Patchwork-Id: 269277 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 4F78C2C0089 for ; Fri, 23 Aug 2013 14:11:53 +1000 (EST) Received: from localhost ([::1]:34931 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCij1-0005VX-55 for incoming@patchwork.ozlabs.org; Fri, 23 Aug 2013 00:11:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCiiM-0005Oj-1l for qemu-devel@nongnu.org; Fri, 23 Aug 2013 00:11:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VCiiG-0004tz-Jz for qemu-devel@nongnu.org; Fri, 23 Aug 2013 00:11:09 -0400 Received: from [222.73.24.84] (port=7969 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCiiF-0004t9-CL for qemu-devel@nongnu.org; Fri, 23 Aug 2013 00:11:04 -0400 X-IronPort-AV: E=Sophos;i="4.89,938,1367942400"; d="scan'208";a="8278804" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 23 Aug 2013 12:07:47 +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 r7N4Ao5x031657; Fri, 23 Aug 2013 12:10:50 +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 2013082312090115-886572 ; Fri, 23 Aug 2013 12:09:01 +0800 From: Wanlong Gao To: qemu-devel@nongnu.org Date: Fri, 23 Aug 2013 12:09:55 +0800 Message-Id: <1377231003-2816-5-git-send-email-gaowanlong@cn.fujitsu.com> X-Mailer: git-send-email 1.8.4.rc4 In-Reply-To: <1377231003-2816-1-git-send-email-gaowanlong@cn.fujitsu.com> References: <1377231003-2816-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/23 12:09:01, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/08/23 12:09:03, Serialize complete at 2013/08/23 12:09:03 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, drjones@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 V9 04/12] NUMA: move numa related code to numa.c 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 Signed-off-by: Wanlong Gao --- cpus.c | 14 --------- include/sysemu/cpus.h | 1 - include/sysemu/sysemu.h | 2 ++ numa.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ vl.c | 57 +------------------------------------ 5 files changed, 79 insertions(+), 71 deletions(-) diff --git a/cpus.c b/cpus.c index 70cc617..8a1344e 100644 --- a/cpus.c +++ b/cpus.c @@ -1201,20 +1201,6 @@ static void tcg_exec_all(void) exit_request = 0; } -void set_numa_modes(void) -{ - CPUState *cpu; - int i; - - 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])) { - cpu->numa_node = i; - } - } - } -} - void list_cpus(FILE *f, fprintf_function cpu_fprintf, const char *optarg) { /* XXX: implement xxx_cpu_list for targets that still miss it */ diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h index 6502488..4f79081 100644 --- a/include/sysemu/cpus.h +++ b/include/sysemu/cpus.h @@ -23,7 +23,6 @@ extern int smp_threads; #define smp_threads 1 #endif -void set_numa_modes(void); void list_cpus(FILE *f, fprintf_function cpu_fprintf, const char *optarg); #endif diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 474dd9e..b42f4a1 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -134,6 +134,8 @@ extern uint64_t node_mem[MAX_NODES]; extern unsigned long *node_cpumask[MAX_NODES]; extern QemuOptsList qemu_numa_opts; int numa_init_func(QemuOpts *opts, void *opaque); +void set_numa_nodes(void); +void set_numa_modes(void); #define MAX_OPTION_ROMS 16 typedef struct QEMUOptionRom { diff --git a/numa.c b/numa.c index e6924f4..035fb86 100644 --- a/numa.c +++ b/numa.c @@ -142,3 +142,79 @@ error: return ret; } + +void set_numa_nodes(void) +{ + if (nb_numa_mem_nodes > nb_numa_nodes) { + nb_numa_nodes = nb_numa_mem_nodes; + } + + if (nb_numa_nodes > 0) { + int i; + + if (nb_numa_nodes > MAX_NODES) { + nb_numa_nodes = MAX_NODES; + } + + /* If no memory size if given for any node, assume the default case + * and distribute the available memory equally across all nodes + */ + for (i = 0; i < nb_numa_nodes; i++) { + if (node_mem[i] != 0) { + break; + } + } + + if (i == nb_numa_nodes) { + uint64_t usedmem = 0; + + /* On Linux, the each node's border has to be 8MB aligned, + * 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]; + } + node_mem[i] = ram_size - usedmem; + } + + uint64_t numa_total = 0; + for (i = 0; i < nb_numa_nodes; i++) { + numa_total += node_mem[i]; + } + if (numa_total != ram_size) { + fprintf(stderr, "qemu: numa nodes total memory size " + "should equal to ram_size\n"); + exit(1); + } + + for (i = 0; i < nb_numa_nodes; i++) { + if (!bitmap_empty(node_cpumask[i], MAX_CPUMASK_BITS)) { + break; + } + } + /* assigning the VCPUs round-robin is easier to implement, guest OSes + * must cope with this anyway, because there are BIOSes out there in + * real machines which also use this scheme. + */ + if (i == nb_numa_nodes) { + for (i = 0; i < max_cpus; i++) { + set_bit(i, node_cpumask[i % nb_numa_nodes]); + } + } + } +} + +void set_numa_modes(void) +{ + CPUState *cpu; + int i; + + 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])) { + cpu->numa_node = i; + } + } + } +} diff --git a/vl.c b/vl.c index 46d1d55..0f180fe 100644 --- a/vl.c +++ b/vl.c @@ -4141,62 +4141,7 @@ int main(int argc, char **argv, char **envp) exit(1); } - if (nb_numa_mem_nodes > nb_numa_nodes) { - nb_numa_nodes = nb_numa_mem_nodes; - } - - if (nb_numa_nodes > 0) { - int i; - - if (nb_numa_nodes > MAX_NODES) { - nb_numa_nodes = MAX_NODES; - } - - /* If no memory size if given for any node, assume the default case - * and distribute the available memory equally across all nodes - */ - for (i = 0; i < nb_numa_nodes; i++) { - if (node_mem[i] != 0) - break; - } - if (i == nb_numa_nodes) { - uint64_t usedmem = 0; - - /* On Linux, the each node's border has to be 8MB aligned, - * 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]; - } - node_mem[i] = ram_size - usedmem; - } - - uint64_t numa_total = 0; - for (i = 0; i < nb_numa_nodes; i++) { - numa_total += node_mem[i]; - } - if (numa_total != ram_size) { - fprintf(stderr, "qemu: numa nodes total memory size " - "should equal to ram_size\n"); - exit(1); - } - - for (i = 0; i < nb_numa_nodes; i++) { - if (!bitmap_empty(node_cpumask[i], MAX_CPUMASK_BITS)) { - break; - } - } - /* assigning the VCPUs round-robin is easier to implement, guest OSes - * must cope with this anyway, because there are BIOSes out there in - * real machines which also use this scheme. - */ - if (i == nb_numa_nodes) { - for (i = 0; i < max_cpus; i++) { - set_bit(i, node_cpumask[i % nb_numa_nodes]); - } - } - } + set_numa_nodes(); if (qemu_opts_foreach(qemu_find_opts("mon"), mon_init_func, NULL, 1) != 0) { exit(1);