summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@linux.intel.com>2018-10-26 18:07:45 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-10-26 19:26:34 -0400
commitf682a97a00591def7cefbb5003dc04045028e405 (patch)
treecc526a57d98ef506d9514264439230f19c7478dd
parent85cfb245060e45640fa3447f8b0bad5e8bd3bdaf (diff)
mm: provide kernel parameter to allow disabling page init poisoning
Patch series "Address issues slowing persistent memory initialization", v5. The main thing this patch set achieves is that it allows us to initialize each node worth of persistent memory independently. As a result we reduce page init time by about 2 minutes because instead of taking 30 to 40 seconds per node and going through each node one at a time, we process all 4 nodes in parallel in the case of a 12TB persistent memory setup spread evenly over 4 nodes. This patch (of 3): On systems with a large amount of memory it can take a significant amount of time to initialize all of the page structs with the PAGE_POISON_PATTERN value. I have seen it take over 2 minutes to initialize a system with over 12TB of RAM. In order to work around the issue I had to disable CONFIG_DEBUG_VM and then the boot time returned to something much more reasonable as the arch_add_memory call completed in milliseconds versus seconds. However in doing that I had to disable all of the other VM debugging on the system. In order to work around a kernel that might have CONFIG_DEBUG_VM enabled on a system that has a large amount of memory I have added a new kernel parameter named "vm_debug" that can be set to "-" in order to disable it. Link: http://lkml.kernel.org/r/20180925201921.3576.84239.stgit@localhost.localdomain Reviewed-by: Pavel Tatashin <pavel.tatashin@microsoft.com> Signed-off-by: Alexander Duyck <alexander.h.duyck@linux.intel.com> Cc: Dave Hansen <dave.hansen@intel.com> Cc: Michal Hocko <mhocko@suse.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Documentation/admin-guide/kernel-parameters.txt12
-rw-r--r--include/linux/page-flags.h8
-rw-r--r--mm/debug.c46
-rw-r--r--mm/memblock.c5
-rw-r--r--mm/sparse.c4
5 files changed, 69 insertions, 6 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 8022d902e770..dcd082576e79 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4839,6 +4839,18 @@
4839 This is actually a boot loader parameter; the value is 4839 This is actually a boot loader parameter; the value is
4840 passed to the kernel using a special protocol. 4840 passed to the kernel using a special protocol.
4841 4841
4842 vm_debug[=options] [KNL] Available with CONFIG_DEBUG_VM=y.
4843 May slow down system boot speed, especially when
4844 enabled on systems with a large amount of memory.
4845 All options are enabled by default, and this
4846 interface is meant to allow for selectively
4847 enabling or disabling specific virtual memory
4848 debugging features.
4849
4850 Available options are:
4851 P Enable page structure init time poisoning
4852 - Disable all of the above options
4853
4842 vmalloc=nn[KMG] [KNL,BOOT] Forces the vmalloc area to have an exact 4854 vmalloc=nn[KMG] [KNL,BOOT] Forces the vmalloc area to have an exact
4843 size of <nn>. This can be used to increase the 4855 size of <nn>. This can be used to increase the
4844 minimum size (128MB on x86). It can also be used to 4856 minimum size (128MB on x86). It can also be used to
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 4d99504f6496..934f91ef3f54 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -163,6 +163,14 @@ static inline int PagePoisoned(const struct page *page)
163 return page->flags == PAGE_POISON_PATTERN; 163 return page->flags == PAGE_POISON_PATTERN;
164} 164}
165 165
166#ifdef CONFIG_DEBUG_VM
167void page_init_poison(struct page *page, size_t size);
168#else
169static inline void page_init_poison(struct page *page, size_t size)
170{
171}
172#endif
173
166/* 174/*
167 * Page flags policies wrt compound pages 175 * Page flags policies wrt compound pages
168 * 176 *
diff --git a/mm/debug.c b/mm/debug.c
index bd10aad8539a..cdacba12e09a 100644
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -13,6 +13,7 @@
13#include <trace/events/mmflags.h> 13#include <trace/events/mmflags.h>
14#include <linux/migrate.h> 14#include <linux/migrate.h>
15#include <linux/page_owner.h> 15#include <linux/page_owner.h>
16#include <linux/ctype.h>
16 17
17#include "internal.h" 18#include "internal.h"
18 19
@@ -175,4 +176,49 @@ void dump_mm(const struct mm_struct *mm)
175 ); 176 );
176} 177}
177 178
179static bool page_init_poisoning __read_mostly = true;
180
181static int __init setup_vm_debug(char *str)
182{
183 bool __page_init_poisoning = true;
184
185 /*
186 * Calling vm_debug with no arguments is equivalent to requesting
187 * to enable all debugging options we can control.
188 */
189 if (*str++ != '=' || !*str)
190 goto out;
191
192 __page_init_poisoning = false;
193 if (*str == '-')
194 goto out;
195
196 while (*str) {
197 switch (tolower(*str)) {
198 case'p':
199 __page_init_poisoning = true;
200 break;
201 default:
202 pr_err("vm_debug option '%c' unknown. skipped\n",
203 *str);
204 }
205
206 str++;
207 }
208out:
209 if (page_init_poisoning && !__page_init_poisoning)
210 pr_warn("Page struct poisoning disabled by kernel command line option 'vm_debug'\n");
211
212 page_init_poisoning = __page_init_poisoning;
213
214 return 1;
215}
216__setup("vm_debug", setup_vm_debug);
217
218void page_init_poison(struct page *page, size_t size)
219{
220 if (page_init_poisoning)
221 memset(page, PAGE_POISON_PATTERN, size);
222}
223EXPORT_SYMBOL_GPL(page_init_poison);
178#endif /* CONFIG_DEBUG_VM */ 224#endif /* CONFIG_DEBUG_VM */
diff --git a/mm/memblock.c b/mm/memblock.c
index 237944479d25..a85315083b5a 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1444,10 +1444,9 @@ void * __init memblock_virt_alloc_try_nid_raw(
1444 1444
1445 ptr = memblock_virt_alloc_internal(size, align, 1445 ptr = memblock_virt_alloc_internal(size, align,
1446 min_addr, max_addr, nid); 1446 min_addr, max_addr, nid);
1447#ifdef CONFIG_DEBUG_VM
1448 if (ptr && size > 0) 1447 if (ptr && size > 0)
1449 memset(ptr, PAGE_POISON_PATTERN, size); 1448 page_init_poison(ptr, size);
1450#endif 1449
1451 return ptr; 1450 return ptr;
1452} 1451}
1453 1452
diff --git a/mm/sparse.c b/mm/sparse.c
index 10b07eea9a6e..67ad061f7fb8 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -696,13 +696,11 @@ int __meminit sparse_add_one_section(struct pglist_data *pgdat,
696 goto out; 696 goto out;
697 } 697 }
698 698
699#ifdef CONFIG_DEBUG_VM
700 /* 699 /*
701 * Poison uninitialized struct pages in order to catch invalid flags 700 * Poison uninitialized struct pages in order to catch invalid flags
702 * combinations. 701 * combinations.
703 */ 702 */
704 memset(memmap, PAGE_POISON_PATTERN, sizeof(struct page) * PAGES_PER_SECTION); 703 page_init_poison(memmap, sizeof(struct page) * PAGES_PER_SECTION);
705#endif
706 704
707 section_mark_present(ms); 705 section_mark_present(ms);
708 sparse_init_one_section(ms, section_nr, memmap, usemap); 706 sparse_init_one_section(ms, section_nr, memmap, usemap);