From patchwork Tue Jul 18 11:41:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijay Kilari X-Patchwork-Id: 9848071 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 77826602A7 for ; Tue, 18 Jul 2017 11:44:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6500326E96 for ; Tue, 18 Jul 2017 11:44:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59DA227F81; Tue, 18 Jul 2017 11:44:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_SPAM, RCVD_IN_SORBS_WEB,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D34EA26E96 for ; Tue, 18 Jul 2017 11:44:21 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXQtQ-0006Kf-Ut; Tue, 18 Jul 2017 11:42:20 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXQtO-0006Jt-RI for xen-devel@lists.xen.org; Tue, 18 Jul 2017 11:42:18 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id F2/53-03044-A14FD695; Tue, 18 Jul 2017 11:42:18 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGIsWRWlGSWpSXmKPExsXiVRvsoiv5JTf S4O8GOYslHxezODB6HN39mymAMYo1My8pvyKBNeNJ02/mgvPCFa8+7mJpYLwl0MXIxSEkMJFR 4t+dhewgDovASxaJthnzmEEcCYF+Vok/C78wdjFyAjlxEkc/f2aBsCskOo8dYQWxhQRUJTr+v 2WHsNuYJM5drgex2QRkJI48P8AEYosISEtc+3yZEWQos8A2JolN16eCNQgLeEmcXrYbrIgFaN CXI1uYQWxeAVeJjj89bF2MHEDLFCTmTLIBCXMKuEks6roEtctV4kbfStYJjAILGBlWMWoUpxa VpRbpGhrqJRVlpmeU5CZm5ugaGpjp5aYWFyemp+YkJhXrJefnbmIEhhYDEOxg/LQs4BCjJAeT kijv6gO5kUJ8SfkplRmJxRnxRaU5qcWHGGU4OJQkeEs+AeUEi1LTUyvSMnOAQQ6TluDgURLhz f8IlOYtLkjMLc5Mh0idYjTmmHRg+xcmjlcT/n9jEmLJy89LlRLnXQMySQCkNKM0D24QLPouMc pKCfMyAp0mxFOQWpSbWYIq/4pRnINRSZj3JcgUnsy8Erh9r4BOYQI6Rdg3B+SUkkSElFQD4y7 Z8N43zc7Prhyv988Usls67S1risPGLxMWPVqkrShbc3np6iSpcg+PbzMrpySv2yl3auYrVYnV 3K1JswsLpiuWdCiLVj/ljtS3MrzwhVMpqjDYcfuyi+tT22a8KNlbFWsuvjZIftn7rn3dDOvT2 Lvtwtjvh292jpX7v86q/Dbvqf5r823klFiKMxINtZiLihMBZPhUrbkCAAA= X-Env-Sender: vijay.kilari@gmail.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1500378136!65792439!1 X-Originating-IP: [74.125.83.68] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20675 invoked from network); 18 Jul 2017 11:42:17 -0000 Received: from mail-pg0-f68.google.com (HELO mail-pg0-f68.google.com) (74.125.83.68) by server-5.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 18 Jul 2017 11:42:17 -0000 Received: by mail-pg0-f68.google.com with SMTP id v190so2547049pgv.1 for ; Tue, 18 Jul 2017 04:42:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8XtRNeAs+anCsEneAQkohR+SizN/hOO8hbGDGC/3LNE=; b=C3Z9xsmGxULzmxp5fJpMCVykcVEPBSloK2UudWKytTJ6/lktYZnES0N4+WtBp7SJUl vueFq554BGtcz+L4olAhcEPcJSASyYhnG8Aq3EwJjUTRvokt+OSTnM1j1P0ltOASQqYx 2aEhM+hwam8/ogEHs+TvAJZmu6pJ98AJcpfPinI/QMZB5CP9f6UBDt9x3fL3AaOZqEYD DFxt5VA7c4bQql8lOMqyYrF/Kud3g70gMAGusfUi93UMBtagT4wi+n4FK+CAfn7/29YT /VCfrvS7IKaA1q/dNj+5ZHd2tRM6bL8Wle3h2Wb7SSAIC4lYkbtfV+oUZggNTnxTUa3K QWCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8XtRNeAs+anCsEneAQkohR+SizN/hOO8hbGDGC/3LNE=; b=kWBVYyfScRNDVQ6wLgQvRnALmxzafqae/UzqamGAqvtKJ12XfNn/z+hMCZVrFn5rzv 67Ab/TIAIlbIjv+FQnUIauZW4RJ/5Oj+E8yJfLTWqxRVZuprZ7CqXtkczcgPw1rlzJ4M Nhy8pKROk3l64oBSGFIDBajAORyDyxKOXUEBPLHgBxs8zaxEkCzX8X3hooWWbhXMPlE9 Erhrm+XaUb/lCMpmKRR3pHDN7rf+p+1775ZCuBBzCp3GOf3pJjKPj2RrOEjNczw63M7f tGk2bbKshV4hG8hP8BCWN/Zlb8nOUGFCdQPf8aYvYZQqAKTiwjz/VkAK4ZaA3arnNvri uWZQ== X-Gm-Message-State: AIVw113c/7w9XB05xaAYaLBFCCXosJXrKVWhVIG4rK3zPOfOVrVVteZ4 q61l/Rq/8p+SWLoF X-Received: by 10.84.128.76 with SMTP id 70mr1234062pla.229.1500378135796; Tue, 18 Jul 2017 04:42:15 -0700 (PDT) Received: from cavium-Vostro-2520.caveonetworks.com ([111.93.218.67]) by smtp.gmail.com with ESMTPSA id r27sm4879707pfe.0.2017.07.18.04.42.11 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 04:42:15 -0700 (PDT) From: vijay.kilari@gmail.com To: xen-devel@lists.xen.org Date: Tue, 18 Jul 2017 17:11:23 +0530 Message-Id: <1500378106-2620-2-git-send-email-vijay.kilari@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1500378106-2620-1-git-send-email-vijay.kilari@gmail.com> References: <1500378106-2620-1-git-send-email-vijay.kilari@gmail.com> Cc: kevin.tian@intel.com, sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, julien.grall@arm.com, jbeulich@suse.com, Vijaya Kumar K Subject: [Xen-devel] [RFC PATCH v3 01/24] NUMA: Make number of NUMA nodes configurable X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Vijaya Kumar K Introduce NR_NODES config option to specify number of NUMA nodes supported. By default value is set at 64 for x86 and 8 for arm. Dropped NODES_SHIFT macro. Also move NR_NODE_MEMBLKS from asm-x86/acpi.h to xen/numa.h Signed-off-by: Vijaya Kumar K --- xen/arch/Kconfig | 7 +++++++ xen/include/asm-x86/acpi.h | 1 - xen/include/asm-x86/numa.h | 2 -- xen/include/xen/config.h | 1 + xen/include/xen/numa.h | 7 ++----- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/xen/arch/Kconfig b/xen/arch/Kconfig index cf0acb7..9c2a4e2 100644 --- a/xen/arch/Kconfig +++ b/xen/arch/Kconfig @@ -6,3 +6,10 @@ config NR_CPUS default "128" if ARM ---help--- Specifies the maximum number of physical CPUs which Xen will support. + +config NR_NODES + int "Maximum number of NUMA nodes" + default "64" if X86 + default "8" if ARM + ---help--- + Specifies the maximum number of NUMA nodes which Xen will support. diff --git a/xen/include/asm-x86/acpi.h b/xen/include/asm-x86/acpi.h index 27ecc65..15be784 100644 --- a/xen/include/asm-x86/acpi.h +++ b/xen/include/asm-x86/acpi.h @@ -105,7 +105,6 @@ extern void acpi_reserve_bootmem(void); extern s8 acpi_numa; extern int acpi_scan_nodes(u64 start, u64 end); -#define NR_NODE_MEMBLKS (MAX_NUMNODES*2) #ifdef CONFIG_ACPI_SLEEP diff --git a/xen/include/asm-x86/numa.h b/xen/include/asm-x86/numa.h index bada2c0..3cf26c2 100644 --- a/xen/include/asm-x86/numa.h +++ b/xen/include/asm-x86/numa.h @@ -3,8 +3,6 @@ #include -#define NODES_SHIFT 6 - typedef u8 nodeid_t; extern int srat_rev; diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index a1d0f97..0f1a029 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -81,6 +81,7 @@ /* allow existing code to work with Kconfig variable */ #define NR_CPUS CONFIG_NR_CPUS +#define NR_NODES CONFIG_NR_NODES #ifndef CONFIG_DEBUG #define NDEBUG diff --git a/xen/include/xen/numa.h b/xen/include/xen/numa.h index 7aef1a8..6bba29e 100644 --- a/xen/include/xen/numa.h +++ b/xen/include/xen/numa.h @@ -3,14 +3,11 @@ #include -#ifndef NODES_SHIFT -#define NODES_SHIFT 0 -#endif - #define NUMA_NO_NODE 0xFF #define NUMA_NO_DISTANCE 0xFF -#define MAX_NUMNODES (1 << NODES_SHIFT) +#define MAX_NUMNODES NR_NODES +#define NR_NODE_MEMBLKS (MAX_NUMNODES * 2) #define vcpu_to_node(v) (cpu_to_node((v)->processor))