From: Michal Hocko <mhocko@kernel.org>
To: Pingfan Liu <kernelfans@gmail.com>
Cc: Vlastimil Babka <vbabka@suse.cz>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Mike Rapoport <rppt@linux.vnet.ibm.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: Re: [PATCH] mm/alloc: fallback to first node if the wanted node offline
Date: Thu, 6 Dec 2018 09:28:06 +0100 [thread overview]
Message-ID: <20181206082806.GB1286@dhcp22.suse.cz> (raw)
In-Reply-To: <CAFgQCTv5-jeqwRVkJuDHvv0vq6uCzfdV2ZmVAU3eUzn2w2ReEQ@mail.gmail.com>
On Thu 06-12-18 11:07:33, Pingfan Liu wrote:
> On Wed, Dec 5, 2018 at 5:40 PM Vlastimil Babka <vbabka@suse.cz> wrote:
> >
> > On 12/5/18 10:29 AM, Pingfan Liu wrote:
> > >> [ 0.007418] Early memory node ranges
> > >> [ 0.007419] node 1: [mem 0x0000000000001000-0x000000000008efff]
> > >> [ 0.007420] node 1: [mem 0x0000000000090000-0x000000000009ffff]
> > >> [ 0.007422] node 1: [mem 0x0000000000100000-0x000000005c3d6fff]
> > >> [ 0.007422] node 1: [mem 0x00000000643df000-0x0000000068ff7fff]
> > >> [ 0.007423] node 1: [mem 0x000000006c528000-0x000000006fffffff]
> > >> [ 0.007424] node 1: [mem 0x0000000100000000-0x000000047fffffff]
> > >> [ 0.007425] node 5: [mem 0x0000000480000000-0x000000087effffff]
> > >>
> > >> There is clearly no node2. Where did the driver get the node2 from?
> >
> > I don't understand these tables too much, but it seems the other nodes
> > exist without them:
> >
> > [ 0.007393] SRAT: PXM 2 -> APIC 0x20 -> Node 2
> >
> > Maybe the nodes are hotplugable or something?
> >
> I also not sure about it, and just have a hurry look at acpi spec. I
> will reply it on another email, and Cced some acpi guys about it
>
> > > Since using nr_cpus=4 , the node2 is not be instanced by x86 initalizing code.
> >
> > Indeed, nr_cpus seems to restrict what nodes we allocate and populate
> > zonelists for.
>
> Yes, in init_cpu_to_node(), since nr_cpus limits the possible cpu,
> which affects the loop for_each_possible_cpu(cpu) and skip the node2
> in this case.
THanks for pointing this out. It made my life easier. So It think the
bug is that we call init_memory_less_node from this path. I suspect
numa_register_memblks is the right place to do this. So I admit I
am not 100% sure but could you give this a try please?
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 1308f5408bf7..4575ae4d5449 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -527,6 +527,19 @@ static void __init numa_clear_kernel_node_hotplug(void)
}
}
+static void __init init_memory_less_node(int nid)
+{
+ unsigned long zones_size[MAX_NR_ZONES] = {0};
+ unsigned long zholes_size[MAX_NR_ZONES] = {0};
+
+ free_area_init_node(nid, zones_size, 0, zholes_size);
+
+ /*
+ * All zonelists will be built later in start_kernel() after per cpu
+ * areas are initialized.
+ */
+}
+
static int __init numa_register_memblks(struct numa_meminfo *mi)
{
unsigned long uninitialized_var(pfn_align);
@@ -592,6 +605,8 @@ static int __init numa_register_memblks(struct numa_meminfo *mi)
continue;
alloc_node_data(nid);
+ if (!end)
+ init_memory_less_node(nid);
}
/* Dump memblock with node info and return. */
@@ -721,21 +736,6 @@ void __init x86_numa_init(void)
numa_init(dummy_numa_init);
}
-static void __init init_memory_less_node(int nid)
-{
- unsigned long zones_size[MAX_NR_ZONES] = {0};
- unsigned long zholes_size[MAX_NR_ZONES] = {0};
-
- /* Allocate and initialize node data. Memory-less node is now online.*/
- alloc_node_data(nid);
- free_area_init_node(nid, zones_size, 0, zholes_size);
-
- /*
- * All zonelists will be built later in start_kernel() after per cpu
- * areas are initialized.
- */
-}
-
/*
* Setup early cpu_to_node.
*
@@ -763,9 +763,6 @@ void __init init_cpu_to_node(void)
if (node == NUMA_NO_NODE)
continue;
- if (!node_online(node))
- init_memory_less_node(node);
-
numa_set_node(cpu, node);
}
}
--
Michal Hocko
SUSE Labs
next prev parent reply other threads:[~2018-12-06 8:28 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-04 3:05 [PATCH] mm/alloc: fallback to first node if the wanted node offline Pingfan Liu
2018-12-04 3:53 ` David Rientjes
2018-12-04 7:16 ` Pingfan Liu
2018-12-05 5:49 ` Pingfan Liu
2018-12-05 19:00 ` David Rientjes
2018-12-04 6:54 ` Wei Yang
2018-12-04 7:20 ` Pingfan Liu
2018-12-04 8:34 ` Wei Yang
2018-12-04 8:52 ` Pingfan Liu
2018-12-04 9:09 ` Wei Yang
2018-12-05 5:50 ` Pingfan Liu
2018-12-04 7:22 ` Michal Hocko
2018-12-04 8:20 ` Pingfan Liu
2018-12-04 8:40 ` Wei Yang
2018-12-04 8:56 ` Pingfan Liu
2018-12-04 8:56 ` Michal Hocko
2018-12-04 14:42 ` Vlastimil Babka
2018-12-05 5:38 ` Pingfan Liu
2018-12-05 9:21 ` Michal Hocko
2018-12-05 9:29 ` Pingfan Liu
2018-12-05 9:40 ` Vlastimil Babka
2018-12-06 3:07 ` Pingfan Liu
2018-12-06 8:28 ` Michal Hocko [this message]
2018-12-06 10:03 ` Pingfan Liu
2018-12-06 10:44 ` Pingfan Liu
2018-12-06 12:11 ` Michal Hocko
2018-12-07 2:56 ` Pingfan Liu
2018-12-07 7:53 ` Michal Hocko
2018-12-07 9:40 ` Pingfan Liu
2018-12-07 11:30 ` Michal Hocko
2018-12-07 13:20 ` Pingfan Liu
2018-12-07 14:22 ` Michal Hocko
2018-12-07 14:27 ` Pingfan Liu
2018-12-07 14:50 ` Michal Hocko
2018-12-07 15:56 ` Michal Hocko
2018-12-10 4:00 ` Pingfan Liu
2018-12-10 7:57 ` Pingfan Liu
2018-12-10 12:37 ` Michal Hocko
2018-12-11 8:05 ` Pingfan Liu
2018-12-11 9:44 ` Michal Hocko
2018-12-12 8:33 ` Pingfan Liu
2018-12-12 8:31 ` Pingfan Liu
2018-12-12 11:53 ` Michal Hocko
2018-12-13 8:37 ` Pingfan Liu
2018-12-13 9:04 ` Pingfan Liu
2018-12-17 13:29 ` Michal Hocko
2018-12-20 7:19 ` Pingfan Liu
2018-12-20 9:19 ` Michal Hocko
2019-01-08 14:34 ` Michal Hocko
2019-01-09 3:13 ` Pingfan Liu
2019-01-11 3:12 ` Pingfan Liu
2019-01-11 9:23 ` Michal Hocko
2018-12-17 12:57 ` Michal Hocko
2018-12-05 9:43 ` Michal Hocko
2018-12-06 3:34 ` Pingfan Liu
2018-12-06 7:23 ` Michal Hocko
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=20181206082806.GB1286@dhcp22.suse.cz \
--to=mhocko@kernel.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=bhelgaas@google.com \
--cc=kernelfans@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=rppt@linux.vnet.ibm.com \
--cc=vbabka@suse.cz \
/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).