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

Commit 846c2d5

Browse files
danieljordan10sfrothwell
authored andcommitted
mm/pagealloc.c: call touch_nmi_watchdog() on max order boundaries in deferred init
Patch series "initialize deferred pages with interrupts enabled", v4. Keep interrupts enabled during deferred page initialization in order to make code more modular and allow jiffies to update. Original approach, and discussion can be found here: http://lkml.kernel.org/r/20200311123848.118638-1-shile.zhang@linux.alibaba.com This patch (of 3): deferred_init_memmap() disables interrupts the entire time, so it calls touch_nmi_watchdog() periodically to avoid soft lockup splats. Soon it will run with interrupts enabled, at which point cond_resched() should be used instead. deferred_grow_zone() makes the same watchdog calls through code shared with deferred init but will continue to run with interrupts disabled, so it can't call cond_resched(). Pull the watchdog calls up to these two places to allow the first to be changed later, independently of the second. The frequency reduces from twice per pageblock (init and free) to once per max order block. Link: http://lkml.kernel.org/r/20200403140952.17177-2-pasha.tatashin@soleen.com Fixes: 3a2d7fa ("mm: disable interrupts while initializing deferred pages") Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com> Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com> Reviewed-by: David Hildenbrand <david@redhat.com> Acked-by: Michal Hocko <mhocko@suse.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Shile Zhang <shile.zhang@linux.alibaba.com> Cc: Kirill Tkhai <ktkhai@virtuozzo.com> Cc: James Morris <jmorris@namei.org> 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 d7d84d2 commit 846c2d5

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

mm/page_alloc.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1693,7 +1693,6 @@ static void __init deferred_free_pages(unsigned long pfn,
16931693
} else if (!(pfn & nr_pgmask)) {
16941694
deferred_free_range(pfn - nr_free, nr_free);
16951695
nr_free = 1;
1696-
touch_nmi_watchdog();
16971696
} else {
16981697
nr_free++;
16991698
}
@@ -1723,7 +1722,6 @@ static unsigned long __init deferred_init_pages(struct zone *zone,
17231722
continue;
17241723
} else if (!page || !(pfn & nr_pgmask)) {
17251724
page = pfn_to_page(pfn);
1726-
touch_nmi_watchdog();
17271725
} else {
17281726
page++;
17291727
}
@@ -1863,8 +1861,10 @@ static int __init deferred_init_memmap(void *data)
18631861
* that we can avoid introducing any issues with the buddy
18641862
* allocator.
18651863
*/
1866-
while (spfn < epfn)
1864+
while (spfn < epfn) {
18671865
nr_pages += deferred_init_maxorder(&i, zone, &spfn, &epfn);
1866+
touch_nmi_watchdog();
1867+
}
18681868
zone_empty:
18691869
pgdat_resize_unlock(pgdat, &flags);
18701870

@@ -1948,6 +1948,7 @@ deferred_grow_zone(struct zone *zone, unsigned int order)
19481948
first_deferred_pfn = spfn;
19491949

19501950
nr_pages += deferred_init_maxorder(&i, zone, &spfn, &epfn);
1951+
touch_nmi_watchdog();
19511952

19521953
/* We should only stop along section boundaries */
19531954
if ((first_deferred_pfn ^ spfn) < PAGES_PER_SECTION)

0 commit comments

Comments
 (0)