Skip to content
This repository was archived by the owner on Nov 21, 2022. It is now read-only.

Commit 3939ef3

Browse files
soleensfrothwell
authored andcommitted
mm: initialize deferred pages with interrupts enabled
Initializing struct pages is a long task and keeping interrupts disabled for the duration of this operation introduces a number of problems. 1. jiffies are not updated for long period of time, and thus incorrect time is reported. See proposed solution and discussion here: lkml/20200311123848.118638-1-shile.zhang@linux.alibaba.com 2. It prevents farther improving deferred page initialization by allowing intra-node multi-threading. We are keeping interrupts disabled to solve a rather theoretical problem that was never observed in real world (See 3a2d7fa). Let's keep interrupts enabled. In case we ever encounter a scenario where an interrupt thread wants to allocate large amount of memory this early in boot we can deal with that by growing zone (see deferred_grow_zone()) by the needed amount before starting deferred_init_memmap() threads. Before: [ 1.232459] node 0 initialised, 12058412 pages in 1ms After: [ 1.632580] node 0 initialised, 12051227 pages in 436ms Link: http://lkml.kernel.org/r/20200403140952.17177-3-pasha.tatashin@soleen.com Fixes: 3a2d7fa ("mm: disable interrupts while initializing deferred pages") Reported-by: Shile Zhang <shile.zhang@linux.alibaba.com> Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com> Reviewed-by: Daniel Jordan <daniel.m.jordan@oracle.com> Acked-by: Michal Hocko <mhocko@suse.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Reviewed-by: David Hildenbrand <david@redhat.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: James Morris <jmorris@namei.org> Cc: Kirill Tkhai <ktkhai@virtuozzo.com> Cc: Sasha Levin <sashal@kernel.org> Cc: Yiqian Wei <yiwei@redhat.com> Cc: <stable@vger.kernel.org> [4.17+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
1 parent 846c2d5 commit 3939ef3

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

include/linux/mmzone.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,8 @@ typedef struct pglist_data {
690690
/*
691691
* Must be held any time you expect node_start_pfn,
692692
* node_present_pages, node_spanned_pages or nr_zones to stay constant.
693+
* Also synchronizes pgdat->first_deferred_pfn during deferred page
694+
* init.
693695
*
694696
* pgdat_resize_lock() and pgdat_resize_unlock() are provided to
695697
* manipulate node_size_lock without checking for CONFIG_MEMORY_HOTPLUG

mm/page_alloc.c

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1844,6 +1844,13 @@ static int __init deferred_init_memmap(void *data)
18441844
BUG_ON(pgdat->first_deferred_pfn > pgdat_end_pfn(pgdat));
18451845
pgdat->first_deferred_pfn = ULONG_MAX;
18461846

1847+
/*
1848+
* Once we unlock here, the zone cannot be grown anymore, thus if an
1849+
* interrupt thread must allocate this early in boot, zone must be
1850+
* pre-grown prior to start of deferred page initialization.
1851+
*/
1852+
pgdat_resize_unlock(pgdat, &flags);
1853+
18471854
/* Only the highest zone is deferred so find it */
18481855
for (zid = 0; zid < MAX_NR_ZONES; zid++) {
18491856
zone = pgdat->node_zones + zid;
@@ -1866,8 +1873,6 @@ static int __init deferred_init_memmap(void *data)
18661873
touch_nmi_watchdog();
18671874
}
18681875
zone_empty:
1869-
pgdat_resize_unlock(pgdat, &flags);
1870-
18711876
/* Sanity check that the next zone really is unpopulated */
18721877
WARN_ON(++zid < MAX_NR_ZONES && populated_zone(++zone));
18731878

@@ -1909,17 +1914,6 @@ deferred_grow_zone(struct zone *zone, unsigned int order)
19091914

19101915
pgdat_resize_lock(pgdat, &flags);
19111916

1912-
/*
1913-
* If deferred pages have been initialized while we were waiting for
1914-
* the lock, return true, as the zone was grown. The caller will retry
1915-
* this zone. We won't return to this function since the caller also
1916-
* has this static branch.
1917-
*/
1918-
if (!static_branch_unlikely(&deferred_pages)) {
1919-
pgdat_resize_unlock(pgdat, &flags);
1920-
return true;
1921-
}
1922-
19231917
/*
19241918
* If someone grew this zone while we were waiting for spinlock, return
19251919
* true, as there might be enough pages already.

0 commit comments

Comments
 (0)