From patchwork Fri Apr 3 14:09:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 11472917 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A7C6481 for ; Fri, 3 Apr 2020 14:09:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 72819206E9 for ; Fri, 3 Apr 2020 14:09:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="HpXovz4Z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 72819206E9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id AEDF68E000A; Fri, 3 Apr 2020 10:09:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A02AA8E0007; Fri, 3 Apr 2020 10:09:57 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C8C98E000A; Fri, 3 Apr 2020 10:09:57 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0219.hostedemail.com [216.40.44.219]) by kanga.kvack.org (Postfix) with ESMTP id 7A7D98E0007 for ; Fri, 3 Apr 2020 10:09:57 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 2B740180AD815 for ; Fri, 3 Apr 2020 14:09:57 +0000 (UTC) X-FDA: 76666727634.01.pan85_910f72c1f415c X-Spam-Summary: 2,0,0,c7b1e230f0a56685,d41d8cd98f00b204,pasha.tatashin@soleen.com,,RULES_HIT:41:355:379:421:541:560:800:960:966:973:988:989:1260:1345:1359:1381:1437:1535:1542:1711:1730:1747:1777:1792:2196:2198:2199:2200:2393:2559:2562:2693:2731:2898:3138:3139:3140:3141:3142:3353:3865:3866:3867:3868:3872:3874:4321:4385:5007:6117:6119:6261:6653:6737:7576:8660:9038:10004:11026:11473:11658:11914:12048:12114:12294:12297:12438:12517:12519:12555:12679:12895:12986:13148:13230:13255:14093:14096:14181:14394:14721:21080:21094:21212:21323:21444:21451:21627:21966:30012:30054:30064:30070,0,RBL:209.85.222.194:@soleen.com:.lbl8.mailshell.net-66.100.201.201 62.2.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: pan85_910f72c1f415c X-Filterd-Recvd-Size: 5512 Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by imf14.hostedemail.com (Postfix) with ESMTP for ; Fri, 3 Apr 2020 14:09:56 +0000 (UTC) Received: by mail-qk1-f194.google.com with SMTP id v7so8089390qkc.0 for ; Fri, 03 Apr 2020 07:09:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=W9m99TDQLeV99+GCRdJBO+aIjPkNrUp3PY68/9xSZMw=; b=HpXovz4ZsBVfNcJM8Huhy4y+11+eUDOZ9KZA1gVuKjNX+47IkisawrgYg0JZq62uNc HoPclkVx0CGpDY+dYSju9U5SRJeJDGjLF4whCljM0I8a0oAZyzjp5/KlakMZeYTsHYrW eGK9htc5d5zU8rI13VPh+oCtFxNlfbEjr0ooCeYmstD10MtQ9dz4LT2lc/O9rH+Y+hf5 mxwNnZy2ITWY+AuunJn+bt0q2HJJFy2e5QgIOgwrMSzpjcyz2HnLIVDxCGBFjDYFDCYg MVXE6SwTnxFK853qKheN4CpGJHjjRqMQI+D6ammU+nAf3Y2Ooor+il0aYLsMTmft7/TX ZjkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=W9m99TDQLeV99+GCRdJBO+aIjPkNrUp3PY68/9xSZMw=; b=e+xT/zXgh9/w8Lr+0BHAO0OVDHFtXjd0Yl8B06LLyPyy7G3UTYkSZEvdbiS8howEPF oGgHBEPhhQ7lKpgQTBlnuKJm3G3l9incd/BKi5FBG2o3senjEkSXTIwbepg6DnhhG3ms fXnF71A35BbH3JE5dgox2uBLyJKcyHI0l3Y7j+xmrBAQtFNulsn3onM+Oe7eZnkOYIjr 9H9EqmipVD1tifELqvb2IqBMhBmgt85FEu1N8ClkGwH10nbj3PFBlf3zHXrSe0hXDEK4 BBFm7coSvYuLckchVnJ58KYmSmTWxjR7V0caDD/0T74zj9B/zwvndzYVAwrqR89KjHHi EVbw== X-Gm-Message-State: AGi0PubCrCrVsmMzDSmrI6HMTzJC1olzUfwB5SG/iJ1IgCkKQl0EDMSw F9b8xtUZPrmpY7ere7kS6YTZW8ybIMI= X-Google-Smtp-Source: APiQypLUS0gnfceDdAcOKLZDc0EqhYDRYzr6A+EIIDB2Vk60l0JH0T9kkeyznkI3MNOTkuodsi/zBQ== X-Received: by 2002:a37:4fc5:: with SMTP id d188mr8488831qkb.220.1585922996152; Fri, 03 Apr 2020 07:09:56 -0700 (PDT) Received: from localhost.localdomain (c-73-69-118-222.hsd1.nh.comcast.net. [73.69.118.222]) by smtp.gmail.com with ESMTPSA id s56sm6917392qtk.9.2020.04.03.07.09.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 07:09:55 -0700 (PDT) From: Pavel Tatashin To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, mhocko@suse.com, linux-mm@kvack.org, dan.j.williams@intel.com, shile.zhang@linux.alibaba.com, daniel.m.jordan@oracle.com, pasha.tatashin@soleen.com, ktkhai@virtuozzo.com, david@redhat.com, jmorris@namei.org, sashal@kernel.org, vbabka@suse.cz Subject: [PATCH v4 1/3] mm: call touch_nmi_watchdog() on max order boundaries in deferred init Date: Fri, 3 Apr 2020 10:09:50 -0400 Message-Id: <20200403140952.17177-2-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200403140952.17177-1-pasha.tatashin@soleen.com> References: <20200403140952.17177-1-pasha.tatashin@soleen.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Daniel Jordan 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. Fixes: 3a2d7fa8a3d5 ("mm: disable interrupts while initializing deferred pages") Cc: stable@vger.kernel.org # 4.17+ Signed-off-by: Daniel Jordan Signed-off-by: Pavel Tatashin Reviewed-by: David Hildenbrand Acked-by: Michal Hocko Acked-by: Vlastimil Babka --- mm/page_alloc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index e5f76da8cd4e..d95bfd328107 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1633,7 +1633,6 @@ static void __init deferred_free_pages(unsigned long pfn, } else if (!(pfn & nr_pgmask)) { deferred_free_range(pfn - nr_free, nr_free); nr_free = 1; - touch_nmi_watchdog(); } else { nr_free++; } @@ -1663,7 +1662,6 @@ static unsigned long __init deferred_init_pages(struct zone *zone, continue; } else if (!page || !(pfn & nr_pgmask)) { page = pfn_to_page(pfn); - touch_nmi_watchdog(); } else { page++; } @@ -1803,8 +1801,10 @@ static int __init deferred_init_memmap(void *data) * that we can avoid introducing any issues with the buddy * allocator. */ - while (spfn < epfn) + while (spfn < epfn) { nr_pages += deferred_init_maxorder(&i, zone, &spfn, &epfn); + touch_nmi_watchdog(); + } zone_empty: pgdat_resize_unlock(pgdat, &flags); @@ -1888,6 +1888,7 @@ deferred_grow_zone(struct zone *zone, unsigned int order) first_deferred_pfn = spfn; nr_pages += deferred_init_maxorder(&i, zone, &spfn, &epfn); + touch_nmi_watchdog(); /* We should only stop along section boundaries */ if ((first_deferred_pfn ^ spfn) < PAGES_PER_SECTION) From patchwork Fri Apr 3 14:09:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 11472919 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9AA37159A for ; Fri, 3 Apr 2020 14:10:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 59CC2206E9 for ; Fri, 3 Apr 2020 14:10:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="Pv/STgoO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 59CC2206E9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id AC6718E000B; Fri, 3 Apr 2020 10:09:59 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A79738E0007; Fri, 3 Apr 2020 10:09:59 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 87AFA8E000B; Fri, 3 Apr 2020 10:09:59 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0254.hostedemail.com [216.40.44.254]) by kanga.kvack.org (Postfix) with ESMTP id 71A438E0007 for ; Fri, 3 Apr 2020 10:09:59 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 32A6B181AC9CB for ; Fri, 3 Apr 2020 14:09:59 +0000 (UTC) X-FDA: 76666727718.06.flock18_9157ca7b71052 X-Spam-Summary: 2,0,0,32bd0fbab70da336,d41d8cd98f00b204,pasha.tatashin@soleen.com,,RULES_HIT:41:69:355:379:541:800:960:973:988:989:1260:1345:1359:1381:1437:1535:1543:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:2689:2693:2731:2736:2895:2904:3138:3139:3140:3141:3142:3355:3865:3866:3867:3868:3870:3871:3872:3873:3874:4117:4321:4470:4605:5007:6261:6653:6737:7903:9038:9592:10004:11026:11473:11658:11914:12043:12048:12296:12297:12438:12517:12519:12555:12679:12895:12986:13053:13161:13221:13229:13869:14093:14096:14181:14394:14721:21080:21324:21444:21451:21627:21966:21990:30005:30034:30054:30064:30070,0,RBL:209.85.222.195:@soleen.com:.lbl8.mailshell.net-66.100.201.201 62.2.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: flock18_9157ca7b71052 X-Filterd-Recvd-Size: 6808 Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Fri, 3 Apr 2020 14:09:58 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id h14so8045265qke.5 for ; Fri, 03 Apr 2020 07:09:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=XVRAeuNidJ39fRWcp3zOg/tgGV7ciJyEMq0r6ftBFJY=; b=Pv/STgoODRaMYRiiqxBA4FU5tHdCrokh/6lo1YBeqlLcKeHM7c97JRYEXNAUAnZROs QllUwUTWuAGZHWyLGi5Aab84uIxeOrWTeM2R4dI4UW6n+5miI/RKGnScMSr40vO+fadU TBiSwbazclyZK1IkQRALY3ir1snq57CwVzflYbbEpJ/J2OkIUogEtqqqC54tdvstPUW+ XTHFIK27Sr/CO2FOINnx/cqdP3yUhGen+CITv5zSh4SF0e13rf9lwY7gLGQcPe2y+ynW CSkmBhUM13OhPLQwmaOVHIChqkMaXM6By3d9fEE5vYL0a3FjYbkaS2x4Da+0HzR9GIr5 eexg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=XVRAeuNidJ39fRWcp3zOg/tgGV7ciJyEMq0r6ftBFJY=; b=VqWhych28EQ9jUn0m/4FHyEGICqs852wH5+sL0O56LQsj5UGXDW1+90cd7q/nYjKzi Mv0H1TpEmon3SfGtD7EOF5wM5OvySAfVvloBAik01s1TenJWYNh2HaRiagzERFy+hA20 n3utcw33ZCK/VlU4v4dM2Ja3egMb1mCPM8obLnKYZ75IdYijZYcH16fUQYRUtcYBOpZj 2OgTbGKfjGmHx5mydhXgFfx7cNgI1VNVv2UF+CSpbJ6B/cq5KLa3LdwWipDvAtVDKwEz DCCOEi5/PdPOP4zDtuKHoJ2fN82ygynAYGNVrhUbbvFfeNenEtOPtAlYPElGp/DgPFRT YjTA== X-Gm-Message-State: AGi0PubIdzzI/giq4LtwPw7E2TED3EjLifdL/SgtUvZmlaZeSyyhRuLt dghLTMmHRNMZ8z32JOt29tXpqQ== X-Google-Smtp-Source: APiQypKG+RDjl6tsspH1xetr6qrHYm6ArZOqM7g6tH+MGmGM9+S4uAiHm7tgKrLhdEG9F8stXc7waQ== X-Received: by 2002:a05:620a:1502:: with SMTP id i2mr8949305qkk.279.1585922997660; Fri, 03 Apr 2020 07:09:57 -0700 (PDT) Received: from localhost.localdomain (c-73-69-118-222.hsd1.nh.comcast.net. [73.69.118.222]) by smtp.gmail.com with ESMTPSA id s56sm6917392qtk.9.2020.04.03.07.09.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 07:09:56 -0700 (PDT) From: Pavel Tatashin To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, mhocko@suse.com, linux-mm@kvack.org, dan.j.williams@intel.com, shile.zhang@linux.alibaba.com, daniel.m.jordan@oracle.com, pasha.tatashin@soleen.com, ktkhai@virtuozzo.com, david@redhat.com, jmorris@namei.org, sashal@kernel.org, vbabka@suse.cz Subject: [PATCH v4 2/3] mm: initialize deferred pages with interrupts enabled Date: Fri, 3 Apr 2020 10:09:51 -0400 Message-Id: <20200403140952.17177-3-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200403140952.17177-1-pasha.tatashin@soleen.com> References: <20200403140952.17177-1-pasha.tatashin@soleen.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 3a2d7fa8a3d5). Lets 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 Fixes: 3a2d7fa8a3d5 ("mm: disable interrupts while initializing deferred pages") Cc: stable@vger.kernel.org # 4.17+ Reported-by: Shile Zhang Signed-off-by: Pavel Tatashin Reviewed-by: Daniel Jordan Acked-by: Michal Hocko Acked-by: Vlastimil Babka Reviewed-by: David Hildenbrand --- include/linux/mmzone.h | 2 ++ mm/page_alloc.c | 20 +++++++------------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index e84d448988b6..ac6a8245f063 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -723,6 +723,8 @@ typedef struct pglist_data { /* * Must be held any time you expect node_start_pfn, * node_present_pages, node_spanned_pages or nr_zones to stay constant. + * Also synchronizes pgdat->first_deferred_pfn during deferred page + * init. * * pgdat_resize_lock() and pgdat_resize_unlock() are provided to * manipulate node_size_lock without checking for CONFIG_MEMORY_HOTPLUG diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d95bfd328107..5ffa8d7e5545 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1784,6 +1784,13 @@ static int __init deferred_init_memmap(void *data) BUG_ON(pgdat->first_deferred_pfn > pgdat_end_pfn(pgdat)); pgdat->first_deferred_pfn = ULONG_MAX; + /* + * Once we unlock here, the zone cannot be grown anymore, thus if an + * interrupt thread must allocate this early in boot, zone must be + * pre-grown prior to start of deferred page initialization. + */ + pgdat_resize_unlock(pgdat, &flags); + /* Only the highest zone is deferred so find it */ for (zid = 0; zid < MAX_NR_ZONES; zid++) { zone = pgdat->node_zones + zid; @@ -1806,8 +1813,6 @@ static int __init deferred_init_memmap(void *data) touch_nmi_watchdog(); } zone_empty: - pgdat_resize_unlock(pgdat, &flags); - /* Sanity check that the next zone really is unpopulated */ WARN_ON(++zid < MAX_NR_ZONES && populated_zone(++zone)); @@ -1849,17 +1854,6 @@ deferred_grow_zone(struct zone *zone, unsigned int order) pgdat_resize_lock(pgdat, &flags); - /* - * If deferred pages have been initialized while we were waiting for - * the lock, return true, as the zone was grown. The caller will retry - * this zone. We won't return to this function since the caller also - * has this static branch. - */ - if (!static_branch_unlikely(&deferred_pages)) { - pgdat_resize_unlock(pgdat, &flags); - return true; - } - /* * If someone grew this zone while we were waiting for spinlock, return * true, as there might be enough pages already. From patchwork Fri Apr 3 14:09:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 11472921 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D712581 for ; Fri, 3 Apr 2020 14:10:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9899F20721 for ; Fri, 3 Apr 2020 14:10:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="fOdpAHa7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9899F20721 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 968178E000C; Fri, 3 Apr 2020 10:10:00 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8EFA98E0007; Fri, 3 Apr 2020 10:10:00 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8061B8E000C; Fri, 3 Apr 2020 10:10:00 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0117.hostedemail.com [216.40.44.117]) by kanga.kvack.org (Postfix) with ESMTP id 65FEA8E0007 for ; Fri, 3 Apr 2020 10:10:00 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 27736824CA06 for ; Fri, 3 Apr 2020 14:10:00 +0000 (UTC) X-FDA: 76666727760.26.cork04_917e4dc71455f X-Spam-Summary: 2,0,0,c0fde5898f22f34c,d41d8cd98f00b204,pasha.tatashin@soleen.com,,RULES_HIT:41:355:379:541:800:960:966:973:988:989:1260:1345:1359:1381:1437:1535:1543:1711:1730:1747:1777:1792:2196:2198:2199:2200:2393:2559:2562:3138:3139:3140:3141:3142:3354:3865:3867:3870:3871:3872:3874:4117:4250:4321:4385:5007:6117:6238:6261:6653:6737:7903:8660:9038:9163:10004:11026:11658:11914:12043:12048:12114:12297:12438:12517:12519:12555:12679:12700:12737:12740:12895:12986:13148:13221:13229:13230:13846:13870:14096:14181:14394:14721:21080:21212:21444:21451:21611:21622:21740:21966:30012:30029:30054:30056:30064:30070:30075,0,RBL:209.85.160.193:@soleen.com:.lbl8.mailshell.net-66.100.201.201 62.2.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: cork04_917e4dc71455f X-Filterd-Recvd-Size: 6298 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by imf44.hostedemail.com (Postfix) with ESMTP for ; Fri, 3 Apr 2020 14:09:59 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id c14so6536804qtp.0 for ; Fri, 03 Apr 2020 07:09:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=YSPgcifDI2m5EfK4gO+hqXsXEiiDm5SMTTnpGgq8dw0=; b=fOdpAHa7t/XDhVtFgyESobW4udCrQJSVh1fy16A/UGwG3dWZWK2r0b2OpJi5GzPySW m4a/z08ztTqnwaDwCjls3K6+Gf4yCn+5wJF7qe8xXMMTVt2H3OiMdo0wyYfqnLxNyeZx BusfAaHEu13N5EU05wafYlaluwNViCAopsOaGklGcGzfJbKeXO88/jf4Lc00o162//gm oqoJj08XRJAS7sn+tt3E633zFcLmCUxE1CsFDq8caiPX1nHng+zta2ObspuQz0De9Esy XgHJ/cKjMpN/OYAj3d97/gevOFV/dAfs3josNOsbVNJVPHaHC7jsdKabROpAT0IXV/G1 vTyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=YSPgcifDI2m5EfK4gO+hqXsXEiiDm5SMTTnpGgq8dw0=; b=PvW3ffsR1JuwVzDLTA+g9bdYlhjbblFeUttqtTqd9uV+LqVZ8+kp1aYOoYY3fqAafv Xu79WwT55cEuQvA6Z+/WaEihlktOyrWHdzHYl9sftVme0/rGEM6Wg9S94cT2TLeCc5xX vAB8VGTjsxeKgtZ8Ic8gsN0VfCRXeUCPWXZ/u5Z2JIPk6eIcfczapdFY3lI4J6yWVAJa uOoAZedzXKJEIBRNgvtYUOGE2ksY8PiEsRCUCN8ZL2075kyxt2NFnufZjfGRqKuNPiMn IZWRF0PTYKTuTGw+GlfFYGyMAB+g/LDobRWscfGtCUWLMlGDKS6JcjgPxccBStnDTCwE WhaA== X-Gm-Message-State: AGi0PuaUoIphsTmidULenbE6uJeachJYRnbmfx4tCz4mwhnp0jUjm6DD zrSyJ65y03mxBlcFnJmn7PAQJw== X-Google-Smtp-Source: APiQypKxZC+0Ldt/6nkR4HdaEy9azv53IBn8kbhaopLkOkn9XgIo2LKibpG82faakXvft0QZZjlXiQ== X-Received: by 2002:ac8:23ed:: with SMTP id r42mr8459490qtr.372.1585922999142; Fri, 03 Apr 2020 07:09:59 -0700 (PDT) Received: from localhost.localdomain (c-73-69-118-222.hsd1.nh.comcast.net. [73.69.118.222]) by smtp.gmail.com with ESMTPSA id s56sm6917392qtk.9.2020.04.03.07.09.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 07:09:58 -0700 (PDT) From: Pavel Tatashin To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, mhocko@suse.com, linux-mm@kvack.org, dan.j.williams@intel.com, shile.zhang@linux.alibaba.com, daniel.m.jordan@oracle.com, pasha.tatashin@soleen.com, ktkhai@virtuozzo.com, david@redhat.com, jmorris@namei.org, sashal@kernel.org, vbabka@suse.cz Subject: [PATCH v4 3/3] mm: call cond_resched() from deferred_init_memmap() Date: Fri, 3 Apr 2020 10:09:52 -0400 Message-Id: <20200403140952.17177-4-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200403140952.17177-1-pasha.tatashin@soleen.com> References: <20200403140952.17177-1-pasha.tatashin@soleen.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Now that deferred pages are initialized with interrupts enabled we can replace touch_nmi_watchdog() with cond_resched(), as it was before 3a2d7fa8a3d5. For now, we cannot do the same in deferred_grow_zone() as it is still initializes pages with interrupts disabled. This change fixes RCU problem described: linux-mm/20200401104156.11564-2-david@redhat.com [ 60.474005] rcu: INFO: rcu_sched detected stalls on CPUs/tasks: [ 60.475000] rcu: 1-...0: (0 ticks this GP) idle=02a/1/0x4000000000000000 softirq=1/1 fqs=15000 [ 60.475000] rcu: (detected by 0, t=60002 jiffies, g=-1199, q=1) [ 60.475000] Sending NMI from CPU 0 to CPUs 1: [ 1.760091] NMI backtrace for cpu 1 [ 1.760091] CPU: 1 PID: 20 Comm: pgdatinit0 Not tainted 4.18.0-147.9.1.el8_1.x86_64 #1 [ 1.760091] Hardware name: Red Hat KVM, BIOS 1.13.0-1.module+el8.2.0+5520+4e5817f3 04/01/2014 [ 1.760091] RIP: 0010:__init_single_page.isra.65+0x10/0x4f [ 1.760091] Code: 48 83 cf 63 48 89 f8 0f 1f 40 00 48 89 c6 48 89 d7 e8 6b 18 80 ff 66 90 5b c3 31 c0 b9 10 00 00 00 49 89 f8 48 c1 e6 33 f3 ab 07 00 00 00 48 c1 e2 36 41 c7 40 34 01 00 00 00 48 c1 e0 33 41 [ 1.760091] RSP: 0000:ffffba783123be40 EFLAGS: 00000006 [ 1.760091] RAX: 0000000000000000 RBX: fffffad34405e300 RCX: 0000000000000000 [ 1.760091] RDX: 0000000000000000 RSI: 0010000000000000 RDI: fffffad34405e340 [ 1.760091] RBP: 0000000033f3177e R08: fffffad34405e300 R09: 0000000000000002 [ 1.760091] R10: 000000000000002b R11: ffff98afb691a500 R12: 0000000000000002 [ 1.760091] R13: 0000000000000000 R14: 000000003f03ea00 R15: 000000003e10178c [ 1.760091] FS: 0000000000000000(0000) GS:ffff9c9ebeb00000(0000) knlGS:0000000000000000 [ 1.760091] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1.760091] CR2: 00000000ffffffff CR3: 000000a1cf20a001 CR4: 00000000003606e0 [ 1.760091] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 1.760091] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 1.760091] Call Trace: [ 1.760091] deferred_init_pages+0x8f/0xbf [ 1.760091] deferred_init_memmap+0x184/0x29d [ 1.760091] ? deferred_free_pages.isra.97+0xba/0xba [ 1.760091] kthread+0x112/0x130 [ 1.760091] ? kthread_flush_work_fn+0x10/0x10 [ 1.760091] ret_from_fork+0x35/0x40 [ 89.123011] node 0 initialised, 1055935372 pages in 88650ms Fixes: 3a2d7fa8a3d5 ("mm: disable interrupts while initializing deferred pages") Cc: stable@vger.kernel.org # 4.17+ Reported-by: Yiqian Wei Tested-by: David Hildenbrand Signed-off-by: Pavel Tatashin Reviewed-by: Daniel Jordan Acked-by: Michal Hocko Reviewed-by: David Hildenbrand Reviewed-by: Pankaj Gupta --- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 5ffa8d7e5545..deacfe575872 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1810,7 +1810,7 @@ static int __init deferred_init_memmap(void *data) */ while (spfn < epfn) { nr_pages += deferred_init_maxorder(&i, zone, &spfn, &epfn); - touch_nmi_watchdog(); + cond_resched(); } zone_empty: /* Sanity check that the next zone really is unpopulated */