From: Stefano Stabellini <sstabellini@kernel.org>
To: Wei Chen <wei.chen@arm.com>
Cc: xen-devel@lists.xenproject.org, sstabellini@kernel.org,
julien@xen.org, jbeulich@suse.com, Bertrand.Marquis@arm.com
Subject: Re: [XEN RFC PATCH 34/40] xen: move numa_scan_nodes from x86 to common
Date: Mon, 30 Aug 2021 18:26:54 -0700 (PDT) [thread overview]
Message-ID: <alpine.DEB.2.21.2108301825200.17851@sstabellini-ThinkPad-T480s> (raw)
In-Reply-To: <20210811102423.28908-35-wei.chen@arm.com>
On Wed, 11 Aug 2021, Wei Chen wrote:
> After the previous patches preparations, numa_scan_nodes can be
> used by Arm and x86. So we move this function from x86 to common.
> As node_cover_memory will not be used cross files, we restore its
> static attribute in this patch.
>
> Signed-off-by: Wei Chen <wei.chen@arm.com>
> ---
> xen/arch/x86/srat.c | 52 ------------------------------------
> xen/common/numa.c | 54 +++++++++++++++++++++++++++++++++++++-
> xen/include/asm-x86/acpi.h | 3 ---
> xen/include/xen/numa.h | 3 ++-
> 4 files changed, 55 insertions(+), 57 deletions(-)
>
> diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c
> index c979939fdd..c9f019c307 100644
> --- a/xen/arch/x86/srat.c
> +++ b/xen/arch/x86/srat.c
> @@ -361,58 +361,6 @@ void __init srat_parse_regions(u64 addr)
> pfn_pdx_hole_setup(mask >> PAGE_SHIFT);
> }
>
> -/* Use the information discovered above to actually set up the nodes. */
> -int __init numa_scan_nodes(u64 start, u64 end)
> -{
> - int i;
> - nodemask_t all_nodes_parsed;
> -
> - /* First clean up the node list */
> - for (i = 0; i < MAX_NUMNODES; i++)
> - cutoff_node(i, start, end);
> -
> -#ifdef CONFIG_ACPI_NUMA
> - if (acpi_numa <= 0)
> - return -1;
> -#endif
> -
> - if (!nodes_cover_memory()) {
> - bad_srat();
> - return -1;
> - }
> -
> - memnode_shift = compute_hash_shift(node_memblk_range, num_node_memblks,
> - memblk_nodeid);
> -
> - if (memnode_shift < 0) {
> - printk(KERN_ERR
> - "SRAT: No NUMA node hash function found. Contact maintainer\n");
> - bad_srat();
> - return -1;
> - }
> -
> - nodes_or(all_nodes_parsed, memory_nodes_parsed, processor_nodes_parsed);
> -
> - /* Finally register nodes */
> - for_each_node_mask(i, all_nodes_parsed)
> - {
> - u64 size = nodes[i].end - nodes[i].start;
> - if ( size == 0 )
> - printk(KERN_WARNING "SRAT: Node %u has no memory. "
> - "BIOS Bug or mis-configured hardware?\n", i);
> -
> - setup_node_bootmem(i, nodes[i].start, nodes[i].end);
> - }
> - for (i = 0; i < nr_cpu_ids; i++) {
> - if (cpu_to_node[i] == NUMA_NO_NODE)
> - continue;
> - if (!nodemask_test(cpu_to_node[i], &processor_nodes_parsed))
> - numa_set_node(i, NUMA_NO_NODE);
> - }
> - numa_init_array();
> - return 0;
> -}
> -
> static unsigned node_to_pxm(nodeid_t n)
> {
> unsigned i;
> diff --git a/xen/common/numa.c b/xen/common/numa.c
> index 4152bbe83b..8ca13e27d1 100644
> --- a/xen/common/numa.c
> +++ b/xen/common/numa.c
> @@ -195,7 +195,7 @@ void __init cutoff_node(int i, u64 start, u64 end)
>
> /* Sanity check to catch more bad SRATs (they are amazingly common).
> Make sure the PXMs cover all memory. */
> -int __init nodes_cover_memory(void)
> +static int __init nodes_cover_memory(void)
> {
> int i;
> uint32_t nr_banks = arch_meminfo_get_nr_bank();
> @@ -271,6 +271,58 @@ void __init numa_init_array(void)
> }
> }
>
> +/* Use the information discovered above to actually set up the nodes. */
> +int __init numa_scan_nodes(u64 start, u64 end)
> +{
> + int i;
> + nodemask_t all_nodes_parsed;
> +
> + /* First clean up the node list */
> + for (i = 0; i < MAX_NUMNODES; i++)
> + cutoff_node(i, start, end);
> +
> +#ifdef CONFIG_ACPI_NUMA
> + if (acpi_numa <= 0)
> + return -1;
> +#endif
> +
> + if (!nodes_cover_memory()) {
> + bad_srat();
> + return -1;
> + }
> +
> + memnode_shift = compute_hash_shift(node_memblk_range, num_node_memblks,
> + memblk_nodeid);
> +
> + if (memnode_shift < 0) {
> + printk(KERN_ERR
> + "SRAT: No NUMA node hash function found. Contact maintainer\n");
> + bad_srat();
> + return -1;
> + }
> +
> + nodes_or(all_nodes_parsed, memory_nodes_parsed, processor_nodes_parsed);
> +
> + /* Finally register nodes */
> + for_each_node_mask(i, all_nodes_parsed)
> + {
> + u64 size = nodes[i].end - nodes[i].start;
> + if ( size == 0 )
> + printk(KERN_WARNING "SRAT: Node %u has no memory. "
> + "BIOS Bug or mis-configured hardware?\n", i);
Not all archs have a BIOS so I'd say "firmware bug". Like last time, we
usually don't do code changes together with code movement, but in this
case it might be OK. I am also happy with a separate patch to adjust the
two comments (this one and the one in the previous patch).
next prev parent reply other threads:[~2021-08-31 1:27 UTC|newest]
Thread overview: 196+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-11 10:23 [XEN RFC PATCH 00/40] Add device tree based NUMA support to Arm64 Wei Chen
2021-08-11 10:23 ` [XEN RFC PATCH 01/40] tools: Fix -Werror=maybe-uninitialized for xlu_pci_parse_bdf Wei Chen
2021-08-11 10:49 ` Jan Beulich
2021-08-13 6:28 ` Wei Chen
2021-08-11 10:23 ` [XEN RFC PATCH 02/40] xen/arm: Print a 64-bit number in hex from early uart Wei Chen
2021-08-19 13:05 ` Julien Grall
2021-08-20 1:13 ` Wei Chen
2021-08-11 10:23 ` [XEN RFC PATCH 03/40] xen/x86: Initialize memnodemapsize while faking NUMA node Wei Chen
2021-08-12 15:32 ` Jan Beulich
2021-08-13 7:26 ` Wei Chen
2021-08-13 8:29 ` Jan Beulich
2021-08-11 10:23 ` [XEN RFC PATCH 04/40] xen/arm: return default DMA bit width when platform is not set Wei Chen
2021-08-11 10:54 ` Jan Beulich
2021-08-13 6:54 ` Wei Chen
2021-08-13 6:56 ` Jan Beulich
2021-08-19 13:28 ` Julien Grall
2021-08-20 2:04 ` Wei Chen
2021-08-20 8:20 ` Julien Grall
2021-08-20 9:37 ` Wei Chen
2021-08-20 11:18 ` Julien Grall
2021-08-20 11:58 ` Wei Chen
2021-08-11 10:23 ` [XEN RFC PATCH 05/40] xen/arm: Fix lowmem_bitsize when arch_get_dma_bitsize return 0 Wei Chen
2021-08-19 13:32 ` Julien Grall
2021-08-20 2:05 ` Wei Chen
2021-08-11 10:23 ` [XEN RFC PATCH 06/40] xen: decouple NUMA from ACPI in Kconfig Wei Chen
2021-08-12 15:36 ` Jan Beulich
2021-08-13 7:27 ` Wei Chen
2021-08-12 16:54 ` Julien Grall
2021-08-13 7:28 ` Wei Chen
2021-08-11 10:23 ` [XEN RFC PATCH 07/40] xen/arm: use !CONFIG_NUMA to keep fake NUMA API Wei Chen
2021-08-19 13:34 ` Julien Grall
2021-08-20 2:08 ` Wei Chen
2021-08-20 8:23 ` Julien Grall
2021-08-20 10:24 ` Wei Chen
2021-08-20 11:24 ` Julien Grall
2021-08-20 12:23 ` Wei Chen
2021-08-20 14:41 ` Julien Grall
2021-08-11 10:23 ` [XEN RFC PATCH 08/40] xen/x86: Move NUMA memory node map functions to common Wei Chen
2021-08-23 17:47 ` Julien Grall
2021-08-24 4:07 ` Wei Chen
2021-08-11 10:23 ` [XEN RFC PATCH 09/40] xen/x86: Move numa_add_cpu_node " Wei Chen
2021-08-23 17:54 ` Julien Grall
2021-08-24 4:18 ` Wei Chen
2021-08-11 10:23 ` [XEN RFC PATCH 10/40] xen/x86: Move NR_NODE_MEMBLKS macro " Wei Chen
2021-08-23 17:58 ` Julien Grall
2021-08-11 10:23 ` [XEN RFC PATCH 11/40] xen/x86: Move NUMA nodes and memory block ranges " Wei Chen
2021-08-24 17:40 ` Julien Grall
2021-08-25 0:57 ` Wei Chen
2021-08-11 10:23 ` [XEN RFC PATCH 12/40] xen/x86: Move numa_initmem_init " Wei Chen
2021-08-25 10:21 ` Julien Grall
2021-08-25 11:15 ` Wei Chen
2021-08-25 13:26 ` Julien Grall
2021-08-11 10:23 ` [XEN RFC PATCH 13/40] xen/arm: introduce numa_set_node for Arm Wei Chen
2021-08-25 10:36 ` Julien Grall
2021-08-25 12:07 ` Wei Chen
2021-08-25 13:24 ` Julien Grall
2021-08-26 5:13 ` Wei Chen
2021-08-11 10:23 ` [XEN RFC PATCH 14/40] xen/arm: set NUMA nodes max number to 64 by default Wei Chen
2021-08-25 13:28 ` Julien Grall
2021-08-25 13:36 ` Jan Beulich
2021-08-26 2:26 ` Wei Chen
2021-08-11 10:23 ` [XEN RFC PATCH 15/40] xen/x86: move NUMA API from x86 header to common header Wei Chen
2021-08-11 10:23 ` [XEN RFC PATCH 16/40] xen/arm: Create a fake NUMA node to use common code Wei Chen
2021-08-26 23:10 ` Stefano Stabellini
2021-08-27 1:15 ` Wei Chen
2021-08-27 6:18 ` Jan Beulich
2021-08-27 9:32 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 17/40] xen/arm: Introduce DEVICE_TREE_NUMA Kconfig for arm64 Wei Chen
2021-08-19 13:38 ` Julien Grall
2021-08-20 2:30 ` Wei Chen
2021-08-20 8:41 ` Julien Grall
2021-08-20 10:49 ` Wei Chen
2021-08-20 11:28 ` Julien Grall
2021-08-20 12:25 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 18/40] xen/arm: Keep memory nodes in dtb for NUMA when boot from EFI Wei Chen
2021-08-19 17:35 ` Julien Grall
2021-08-20 2:18 ` Wei Chen
2021-08-26 23:24 ` Stefano Stabellini
2021-08-27 7:41 ` Julien Grall
2021-08-27 23:10 ` Stefano Stabellini
2021-08-27 9:23 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 19/40] xen: fdt: Introduce a helper to check fdt node type Wei Chen
2021-08-25 13:39 ` Julien Grall
2021-08-26 6:00 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 20/40] xen/arm: implement node distance helpers for Arm64 Wei Chen
2021-08-26 23:52 ` Stefano Stabellini
2021-08-27 9:30 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 21/40] xen/arm: introduce device_tree_numa as a switch for device tree NUMA Wei Chen
2021-08-19 17:45 ` Julien Grall
2021-08-20 2:21 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 22/40] xen/arm: introduce a helper to parse device tree processor node Wei Chen
2021-08-19 18:09 ` Julien Grall
2021-08-23 8:42 ` Wei Chen
2021-08-19 18:10 ` Julien Grall
2021-08-23 8:47 ` Wei Chen
2021-08-23 10:59 ` Julien Grall
2021-08-24 4:09 ` Wei Chen
2021-08-19 18:13 ` Julien Grall
2021-08-20 2:23 ` Wei Chen
2021-08-20 8:44 ` Julien Grall
2021-08-20 11:53 ` Wei Chen
2021-08-27 0:06 ` Stefano Stabellini
2021-08-27 9:31 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 23/40] xen/arm: introduce a helper to parse device tree memory node Wei Chen
2021-08-25 13:48 ` Julien Grall
2021-08-26 6:35 ` Wei Chen
2021-08-26 8:21 ` Julien Grall
2021-08-26 11:54 ` Wei Chen
2021-08-28 1:06 ` Stefano Stabellini
2021-08-28 3:56 ` Wei Chen
2021-08-28 10:33 ` Julien Grall
2021-08-28 13:58 ` Wei Chen
2021-09-08 7:34 ` Wei Chen
2021-09-08 22:31 ` Stefano Stabellini
2021-09-09 3:54 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 24/40] xen/arm: introduce a helper to parse device tree NUMA distance map Wei Chen
2021-08-25 13:56 ` Julien Grall
2021-08-26 7:01 ` Wei Chen
2021-08-31 0:48 ` Stefano Stabellini
2021-08-31 10:17 ` Wei Chen
2021-08-31 21:36 ` Stefano Stabellini
2021-09-01 11:04 ` Wei Chen
2021-09-01 16:21 ` Stefano Stabellini
2021-09-02 2:30 ` Wei Chen
2021-09-02 15:19 ` Stefano Stabellini
2021-09-02 6:00 ` Jan Beulich
2021-09-02 14:14 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 25/40] xen/arm: unified entry to parse all NUMA data from device tree Wei Chen
2021-08-31 0:54 ` Stefano Stabellini
2021-08-31 17:47 ` Julien Grall
2021-09-01 18:30 ` Stefano Stabellini
2021-09-02 2:48 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 26/40] xen/arm: Add boot and secondary CPU to NUMA system Wei Chen
2021-08-25 16:58 ` Julien Grall
2021-08-26 7:24 ` Wei Chen
2021-08-26 8:49 ` Julien Grall
2021-08-26 9:39 ` Jan Beulich
2021-08-26 12:08 ` Wei Chen
2021-08-26 12:26 ` Jan Beulich
2021-08-11 10:24 ` [XEN RFC PATCH 27/40] xen/arm: build CPU NUMA node map while creating cpu_logical_map Wei Chen
2021-08-25 17:06 ` Julien Grall
2021-08-26 7:26 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 28/40] xen/x86: decouple nodes_cover_memory with E820 map Wei Chen
2021-08-31 1:07 ` Stefano Stabellini
2021-08-31 10:19 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 29/40] xen/arm: implement Arm arch helpers Arm to get memory map info Wei Chen
2021-08-25 17:09 ` Julien Grall
2021-08-26 7:27 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 30/40] xen: move NUMA memory and CPU parsed nodemasks to common Wei Chen
2021-08-25 17:16 ` Julien Grall
2021-08-26 7:29 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 31/40] xen/x86: move nodes_cover_memory " Wei Chen
2021-08-31 1:16 ` Stefano Stabellini
2021-08-31 13:43 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 32/40] xen/x86: make acpi_scan_nodes to be neutral Wei Chen
2021-08-27 14:08 ` Julien Grall
2021-08-28 2:11 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 33/40] xen: export bad_srat and srat_disabled to extern Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 34/40] xen: move numa_scan_nodes from x86 to common Wei Chen
2021-08-27 14:14 ` Julien Grall
2021-08-28 2:12 ` Wei Chen
2021-08-31 1:26 ` Stefano Stabellini [this message]
2021-08-31 13:43 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 35/40] xen: enable numa_scan_nodes for device tree based NUMA Wei Chen
2021-08-27 14:19 ` Julien Grall
2021-08-28 2:13 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 36/40] xen/arm: keep guest still be NUMA unware Wei Chen
2021-08-27 14:28 ` Julien Grall
2021-08-28 2:19 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 37/40] xen: introduce an arch helper to do NUMA init failed fallback Wei Chen
2021-08-27 14:30 ` Julien Grall
2021-08-28 3:09 ` Wei Chen
2021-08-28 3:45 ` Wei Chen
2021-08-30 9:52 ` Jan Beulich
2021-08-30 10:38 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 38/40] xen/arm: enable device tree based NUMA in system init Wei Chen
2021-08-27 14:32 ` Julien Grall
2021-08-28 3:17 ` Wei Chen
2021-08-28 10:45 ` Julien Grall
2021-08-28 14:02 ` Wei Chen
2021-08-31 1:50 ` Stefano Stabellini
2021-08-31 13:43 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 39/40] xen/x86: move numa_setup to common to support NUMA switch in command line Wei Chen
2021-08-27 14:37 ` Julien Grall
2021-08-28 3:22 ` Wei Chen
2021-08-31 1:53 ` Stefano Stabellini
2021-08-31 13:44 ` Wei Chen
2021-08-11 10:24 ` [XEN RFC PATCH 40/40] xen/x86: move dump_numa info hotkey to common Wei Chen
2021-08-11 10:41 ` [XEN RFC PATCH 00/40] Add device tree based NUMA support to Arm64 Jan Beulich
2021-08-13 2:33 ` Wei Chen
2021-08-13 6:53 ` Jan Beulich
2021-08-19 13:42 ` Julien Grall
2021-08-19 14:05 ` Bertrand Marquis
2021-08-19 17:11 ` Julien Grall
2021-08-26 0:09 ` Stefano Stabellini
2021-08-26 7:31 ` Wei Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.21.2108301825200.17851@sstabellini-ThinkPad-T480s \
--to=sstabellini@kernel.org \
--cc=Bertrand.Marquis@arm.com \
--cc=jbeulich@suse.com \
--cc=julien@xen.org \
--cc=wei.chen@arm.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).