From patchwork Wed Aug 10 09:24:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9272871 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 C784560231 for ; Wed, 10 Aug 2016 09:26:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B60DA28066 for ; Wed, 10 Aug 2016 09:26:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AACFB2830A; Wed, 10 Aug 2016 09:26:29 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 EE74328066 for ; Wed, 10 Aug 2016 09:26:28 +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 1bXPkA-0005Ym-7g; Wed, 10 Aug 2016 09:24:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bXPk9-0005Ye-Ft for xen-devel@lists.xenproject.org; Wed, 10 Aug 2016 09:24:09 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 7E/AA-05127-8B2FAA75; Wed, 10 Aug 2016 09:24:08 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrBIsWRWlGSWpSXmKPExsXS6fjDS3f7p1X hBiu/G1l83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBnHp/WwFdx0qfjeeZ61gXGueRcjJ4eQQJ7E /vVHmEBsXgE7iYcNF1lAbAkBQ4mn76+zgdgsAqoSa++8YgWx2QTUJdqebQeyOThEBAwkzh1NA jGZBeIlrq6zB6kQFlCT+HXsEQvEdDuJ+4+ugE3hFLCX+NLdCNbJKyAo8XeHMEiYGaRk/0XWCY w8sxAys5BkIGwtiYe/brFA2NoSyxa+Zp4FtldaYvk/DoiwucS/6d1oSkBsJ4nu0x1MCxg5VjF qFKcWlaUW6Roa6SUVZaZnlOQmZuboGhqY6uWmFhcnpqfmJCYV6yXn525iBIYqAxDsYOyb5XyI UZKDSUmU13LLqnAhvqT8lMqMxOKM+KLSnNTiQ4waHBwC23atvsAoxZKXn5eqJMH75wNQnWBRa npqRVpmDjCaYEolOHiURHgbPwKleYsLEnOLM9MhUqcYFaXEeblBEgIgiYzSPLg2WARfYpSVEu ZlBDpKiKcgtSg3swRV/hWjOAejkjBvDsgUnsy8Erjpr4AWMwEtTlJdAbK4JBEhJdXAGMvZUK9 67K0uZ1pdbuiuLzn2dq1vxWUFJqmriMVd/mLy/D3b6jtXunWW/V56gvNIgIaq31uHGwmlbhkd QvedLp1b+yjt7pf1wszFSTMko99YVL0IvLMm/d0aeaHvJfZ/41/FBj24mW519Oqh9ItBCx+uX Xo1QdREWXdTT5JYdNqeIP+njMbHlFiKMxINtZiLihMBXT29F9sCAAA= X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1470821043!52175436!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22338 invoked from network); 10 Aug 2016 09:24:07 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-5.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 10 Aug 2016 09:24:07 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Wed, 10 Aug 2016 03:24:03 -0600 Message-Id: <57AB0ED10200007800104953@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.1 Date: Wed, 10 Aug 2016 03:24:01 -0600 From: "Jan Beulich" To: "xen-devel" References: <57AB0D5C020000780010493B@prv-mh.provo.novell.com> In-Reply-To: <57AB0D5C020000780010493B@prv-mh.provo.novell.com> Mime-Version: 1.0 Cc: George Dunlap , Andrew Cooper Subject: [Xen-devel] [PATCH 2/2] x86/NUMA: cleanup 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP - drop the only left CONFIG_NUMA conditional (this is always true) - drop struct node_data's node_id field (being always equal to the node_data[] array index used) - don't open code node_{start,end}_pfn() nor node_spanned_pages() except when used as lvalues (those could be converted too, but this seems a little awkward) - no longer open code pfn_to_paddr() in an expression being modified anyway - make dump less verbose by logging actual vs intended node IDs only when they don't match Signed-off-by: Jan Beulich x86/NUMA: cleanup - drop the only left CONFIG_NUMA conditional (this is always true) - drop struct node_data's node_id field (being always equal to the node_data[] array index used) - don't open code node_{start,end}_pfn() nor node_spanned_pages() except when used as lvalues (those could be converted too, but this seems a little awkward) - no longer open code pfn_to_paddr() in an expression being modified anyway - make dump less verbose by logging actual vs intended node IDs only when they don't match Signed-off-by: Jan Beulich --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -179,7 +179,6 @@ void __init setup_node_bootmem(nodeid_t start_pfn = start >> PAGE_SHIFT; end_pfn = end >> PAGE_SHIFT; - NODE_DATA(nodeid)->node_id = nodeid; NODE_DATA(nodeid)->node_start_pfn = start_pfn; NODE_DATA(nodeid)->node_spanned_pages = end_pfn - start_pfn; @@ -386,16 +385,15 @@ static void dump_numa(unsigned char key) for_each_online_node ( i ) { - paddr_t pa = (paddr_t)(NODE_DATA(i)->node_start_pfn + 1)<< PAGE_SHIFT; - printk("idx%d -> NODE%d start->%lu size->%lu free->%lu\n", - i, NODE_DATA(i)->node_id, - NODE_DATA(i)->node_start_pfn, - NODE_DATA(i)->node_spanned_pages, + paddr_t pa = pfn_to_paddr(node_start_pfn(i) + 1); + + printk("NODE%u start->%lu size->%lu free->%lu\n", + i, node_start_pfn(i), node_spanned_pages(i), avail_node_heap_pages(i)); /* sanity check phys_to_nid() */ - printk("phys_to_nid(%"PRIpaddr") -> %d should be %d\n", pa, - phys_to_nid(pa), - NODE_DATA(i)->node_id); + if ( phys_to_nid(pa) != i ) + printk("phys_to_nid(%"PRIpaddr") -> %d should be %u\n", + pa, phys_to_nid(pa), i); } j = cpumask_first(&cpu_online_map); --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -1386,21 +1386,21 @@ int memory_add(unsigned long spfn, unsig goto destroy_directmap; } - old_node_start = NODE_DATA(node)->node_start_pfn; - old_node_span = NODE_DATA(node)->node_spanned_pages; + old_node_start = node_start_pfn(node); + old_node_span = node_spanned_pages(node); orig_online = node_online(node); if ( !orig_online ) { dprintk(XENLOG_WARNING, "node %x pxm %x is not online\n",node, pxm); - NODE_DATA(node)->node_id = node; NODE_DATA(node)->node_start_pfn = spfn; NODE_DATA(node)->node_spanned_pages = epfn - node_start_pfn(node); node_set_online(node); - }else + } + else { - if (NODE_DATA(node)->node_start_pfn > spfn) + if (node_start_pfn(node) > spfn) NODE_DATA(node)->node_start_pfn = spfn; if (node_end_pfn(node) < epfn) NODE_DATA(node)->node_spanned_pages = epfn - node_start_pfn(node); --- a/xen/include/asm-x86/numa.h +++ b/xen/include/asm-x86/numa.h @@ -40,7 +40,6 @@ extern void srat_detect_node(int cpu); extern void setup_node_bootmem(nodeid_t nodeid, u64 start, u64 end); extern nodeid_t apicid_to_node[]; -#ifdef CONFIG_NUMA extern void init_cpu_to_node(void); static inline void clear_node_cpumask(int cpu) @@ -56,7 +55,6 @@ extern u8 *memnodemap; struct node_data { unsigned long node_start_pfn; unsigned long node_spanned_pages; - nodeid_t node_id; }; extern struct node_data node_data[]; @@ -78,11 +76,6 @@ static inline __attribute__((pure)) node NODE_DATA(nid)->node_spanned_pages) extern int valid_numa_range(u64 start, u64 end, nodeid_t node); -#else -#define init_cpu_to_node() do {} while (0) -#define clear_node_cpumask(cpu) do {} while (0) -#define valid_numa_range(start, end, node) 1 -#endif void srat_parse_regions(u64 addr); extern u8 __node_distance(nodeid_t a, nodeid_t b); Reviewed-by: Andrew Cooper --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -179,7 +179,6 @@ void __init setup_node_bootmem(nodeid_t start_pfn = start >> PAGE_SHIFT; end_pfn = end >> PAGE_SHIFT; - NODE_DATA(nodeid)->node_id = nodeid; NODE_DATA(nodeid)->node_start_pfn = start_pfn; NODE_DATA(nodeid)->node_spanned_pages = end_pfn - start_pfn; @@ -386,16 +385,15 @@ static void dump_numa(unsigned char key) for_each_online_node ( i ) { - paddr_t pa = (paddr_t)(NODE_DATA(i)->node_start_pfn + 1)<< PAGE_SHIFT; - printk("idx%d -> NODE%d start->%lu size->%lu free->%lu\n", - i, NODE_DATA(i)->node_id, - NODE_DATA(i)->node_start_pfn, - NODE_DATA(i)->node_spanned_pages, + paddr_t pa = pfn_to_paddr(node_start_pfn(i) + 1); + + printk("NODE%u start->%lu size->%lu free->%lu\n", + i, node_start_pfn(i), node_spanned_pages(i), avail_node_heap_pages(i)); /* sanity check phys_to_nid() */ - printk("phys_to_nid(%"PRIpaddr") -> %d should be %d\n", pa, - phys_to_nid(pa), - NODE_DATA(i)->node_id); + if ( phys_to_nid(pa) != i ) + printk("phys_to_nid(%"PRIpaddr") -> %d should be %u\n", + pa, phys_to_nid(pa), i); } j = cpumask_first(&cpu_online_map); --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -1386,21 +1386,21 @@ int memory_add(unsigned long spfn, unsig goto destroy_directmap; } - old_node_start = NODE_DATA(node)->node_start_pfn; - old_node_span = NODE_DATA(node)->node_spanned_pages; + old_node_start = node_start_pfn(node); + old_node_span = node_spanned_pages(node); orig_online = node_online(node); if ( !orig_online ) { dprintk(XENLOG_WARNING, "node %x pxm %x is not online\n",node, pxm); - NODE_DATA(node)->node_id = node; NODE_DATA(node)->node_start_pfn = spfn; NODE_DATA(node)->node_spanned_pages = epfn - node_start_pfn(node); node_set_online(node); - }else + } + else { - if (NODE_DATA(node)->node_start_pfn > spfn) + if (node_start_pfn(node) > spfn) NODE_DATA(node)->node_start_pfn = spfn; if (node_end_pfn(node) < epfn) NODE_DATA(node)->node_spanned_pages = epfn - node_start_pfn(node); --- a/xen/include/asm-x86/numa.h +++ b/xen/include/asm-x86/numa.h @@ -40,7 +40,6 @@ extern void srat_detect_node(int cpu); extern void setup_node_bootmem(nodeid_t nodeid, u64 start, u64 end); extern nodeid_t apicid_to_node[]; -#ifdef CONFIG_NUMA extern void init_cpu_to_node(void); static inline void clear_node_cpumask(int cpu) @@ -56,7 +55,6 @@ extern u8 *memnodemap; struct node_data { unsigned long node_start_pfn; unsigned long node_spanned_pages; - nodeid_t node_id; }; extern struct node_data node_data[]; @@ -78,11 +76,6 @@ static inline __attribute__((pure)) node NODE_DATA(nid)->node_spanned_pages) extern int valid_numa_range(u64 start, u64 end, nodeid_t node); -#else -#define init_cpu_to_node() do {} while (0) -#define clear_node_cpumask(cpu) do {} while (0) -#define valid_numa_range(start, end, node) 1 -#endif void srat_parse_regions(u64 addr); extern u8 __node_distance(nodeid_t a, nodeid_t b);