From patchwork Fri Apr 3 13:35:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 11472683 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 3207014DD for ; Fri, 3 Apr 2020 13:35:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E94372078C for ; Fri, 3 Apr 2020 13:35:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="QbzBh9e+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E94372078C 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 E3BC28E0009; Fri, 3 Apr 2020 09:35:55 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D76078E0007; Fri, 3 Apr 2020 09:35:55 -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 C662A8E0009; Fri, 3 Apr 2020 09:35:55 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0113.hostedemail.com [216.40.44.113]) by kanga.kvack.org (Postfix) with ESMTP id B012B8E0007 for ; Fri, 3 Apr 2020 09:35:55 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 6A4055DE3 for ; Fri, 3 Apr 2020 13:35:55 +0000 (UTC) X-FDA: 76666641870.27.eye34_8afa511dd6163 X-Spam-Summary: 2,0,0,671238842aea58b7,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.195:@soleen.com:.lbl8.mailshell.net-62.2.0.100 66.100.201.201,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:25,LUA_SUMMARY:none X-HE-Tag: eye34_8afa511dd6163 X-Filterd-Recvd-Size: 5509 Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by imf49.hostedemail.com (Postfix) with ESMTP for ; Fri, 3 Apr 2020 13:35:54 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id v7so7961001qkc.0 for ; Fri, 03 Apr 2020 06:35:54 -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=fGV3n8t+9BV7JTkRPUzZ2QXHvp25yaVJAKZtXq13X1k=; b=QbzBh9e+W+8iOpYg0+rGGGiU6KrpTT42G5riwwro+9vvy+mAOclzJDqQGKBZYWFEVK 0Y7WR7UKpFVgrB3UlLssjLQQzJS+DC8MZcX0LIiatPACJpJ/IqNvk+3mVyLsad+BkABl n4C0d9q5ZWEo6kYiRHX6nLpp3Z0zK5ruBmCa6xPv5CHirh0N7zn4YyotF0XL5gewijuw LjM2AbR6gi+RgiCqfmIKvxyZoUGjhmkxg2Lw5UqdtblJJiV4a0gcKOhwdmszBnSgL1sy n38Z1/glMlD6Q8ic0OU5MbyRrf5kzkmUZspLb4aGPEEhX/KArbhSuncZKrFdxWMofvj1 YXAA== 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=fGV3n8t+9BV7JTkRPUzZ2QXHvp25yaVJAKZtXq13X1k=; b=QAUXozvi7mVeYVRmLw0kBVRDdhVWV4/UhM4Ptz9ozIKazLsas5NAOUKXjLSpjpgz0R UtPgqEpgTI5WetXigQh03jXNgX1NHhMKpjQim3qJkU6O0yOr/xa8T1GdWzGcebI/5Jf0 WLflJJyXECoGba2zWZms342v3+JCBPnG452dhg28a3UzVLh/N1hE3Rp34AlAx7rpsuCL wuExG+0AgHG6He+1f0N0XvtBIEw6CdwOcnb8QfR4PhcY9ZaVIJ5rVCFYMKxZzvCyLhiR 2/DZwBvge8B0Zvp3+/JP2T5mKmp1NPC1tCTMS2dHrAy5stZfN3Mmi6ugB1HJTcMeCq4T xsXw== X-Gm-Message-State: AGi0PubdOu2YQmRaX+1HhDJXTqQXXRQUY9cRlt8o2+yip3qrCgcXFLMP 2jag+yYVN0REn+Zbu1So4zDKuw== X-Google-Smtp-Source: APiQypJCvkMVix2XYKBYT3Rs1fxbKi+KbxCQXEGCj6HEdOr2BiuHAjnK+DDnF7WjEbM/Sl2K/RLu+Q== X-Received: by 2002:ae9:dd02:: with SMTP id r2mr8129764qkf.180.1585920953238; Fri, 03 Apr 2020 06:35:53 -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 17sm6210799qkm.105.2020.04.03.06.35.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 06:35:52 -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 v3 1/3] mm: call touch_nmi_watchdog() on max order boundaries in deferred init Date: Fri, 3 Apr 2020 09:35:47 -0400 Message-Id: <20200403133549.14338-2-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200403133549.14338-1-pasha.tatashin@soleen.com> References: <20200403133549.14338-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 3c4eb750a199..e8ff6a176164 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1639,7 +1639,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++; } @@ -1669,7 +1668,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++; } @@ -1809,8 +1807,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); @@ -1894,6 +1894,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 13:35:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 11472685 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 C3F0C14DD for ; Fri, 3 Apr 2020 13:35:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 865672078C for ; Fri, 3 Apr 2020 13:35:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="gKxgUTjj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 865672078C 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 4C76D8E000A; Fri, 3 Apr 2020 09:35:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 427848E0007; Fri, 3 Apr 2020 09:35: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 2A59E8E000A; Fri, 3 Apr 2020 09:35:57 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0145.hostedemail.com [216.40.44.145]) by kanga.kvack.org (Postfix) with ESMTP id 0CDDB8E0007 for ; Fri, 3 Apr 2020 09:35:57 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B3DCF181AEF1A for ; Fri, 3 Apr 2020 13:35:56 +0000 (UTC) X-FDA: 76666641912.26.touch79_8b284215fa314 X-Spam-Summary: 2,0,0,cc5d054bfdb440ac,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.219.65:@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:28,LUA_SUMMARY:none X-HE-Tag: touch79_8b284215fa314 X-Filterd-Recvd-Size: 6800 Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Fri, 3 Apr 2020 13:35:56 +0000 (UTC) Received: by mail-qv1-f65.google.com with SMTP id ca9so3530263qvb.9 for ; Fri, 03 Apr 2020 06:35: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=xV2roW1zd//aHKXeeRMtDzonpXvqHnYcXH/dEAXKebY=; b=gKxgUTjjyK9JdLcYNwX9EauAoepcu27x6GXWjEpR46ij/dc6xlZ7wnYtViH3EQavJn HOt9nW/20SrzNtfqIRm0G2ISZkKcFAf3C1KVjNhUhp9pEiukugQ605rm9vmnPx7mkNvP ZNYIS8j0tHZyXmvLMU1BS8iBHURCmSg3JSRu0bFChoOuOp8IokGwoQkXkzHn6Xzm1H7i KS9GDYAKbLmo2cOCmgJ2EA6QYBMkreysneeVcit2+SPPDpUxjs/S2QI1rQEVhP7gmj4f iUGTxyAGbfL60BYr10LpDL9NhXno8Nt7chB+LlqVlV7B3m8doWFbLszscU0ZGkIE/VCr sTPw== 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=xV2roW1zd//aHKXeeRMtDzonpXvqHnYcXH/dEAXKebY=; b=eiQg06ixTSDMxxGeXoAgnTeDhSxDG82oqH3jrYdo2pYGMmB+GYQNP/v9txXcSSgM5Y pjIVZLaxEy/uIJC+GvVFguZi3XH0KpxAvvI8fUkHxqIdFgkD+dKb9mNbo1pg4rAKZil1 gfBh8aMLnQIp8berdtwHHSA/ZL6z5rP1wVGj2ZipPtaRs+MxEcn7bH42NtA2vu0XrxTz g4dCP7RrYeLiCBEh4CSaGEw4LM+6JRa5jU5eF1Opbg/Npxj9vcfEUU919yjKJMbzi1FO tfELTnsvOr1ArPGhdwGTFFNecc5znk7Phl6nsZFUGvHix53BM2UGg0HnBpFHYadb0M76 U44Q== X-Gm-Message-State: AGi0Pub19sUtMEJ7gPPuupVJ4IPAL5P++6Ybl+Z2be40cryZRfyzVgdc n8BvBy3mt9VJ0pmtoRKbZCzPpg== X-Google-Smtp-Source: APiQypIbv6y9E8OGazxpKwwHMm4tbcInhdZmQGRl8YFqOn9cVkWqcwO9mwtCdRPeq+IuzgWJUSlyaw== X-Received: by 2002:a0c:db86:: with SMTP id m6mr7945568qvk.116.1585920955477; Fri, 03 Apr 2020 06:35:55 -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 17sm6210799qkm.105.2020.04.03.06.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 06:35:54 -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 v3 2/3] mm: initialize deferred pages with interrupts enabled Date: Fri, 3 Apr 2020 09:35:48 -0400 Message-Id: <20200403133549.14338-3-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200403133549.14338-1-pasha.tatashin@soleen.com> References: <20200403133549.14338-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 --- 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 462f6873905a..c5bdf55da034 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -721,6 +721,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 e8ff6a176164..4a60f2427eb0 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1790,6 +1790,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; @@ -1812,8 +1819,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)); @@ -1855,17 +1860,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 13:35:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 11472687 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 46697159A for ; Fri, 3 Apr 2020 13:36:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 04C602078C for ; Fri, 3 Apr 2020 13:36:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="euX0p0KD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 04C602078C 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 080B08E000B; Fri, 3 Apr 2020 09:35:59 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 00CB58E0007; Fri, 3 Apr 2020 09:35:58 -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 DC5CE8E000B; Fri, 3 Apr 2020 09:35:58 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0058.hostedemail.com [216.40.44.58]) by kanga.kvack.org (Postfix) with ESMTP id BFE178E0007 for ; Fri, 3 Apr 2020 09:35:58 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 6CA7552B7 for ; Fri, 3 Apr 2020 13:35:58 +0000 (UTC) X-FDA: 76666641996.06.prose19_8b6767bbc2e31 X-Spam-Summary: 2,0,0,dac40927cfd56560,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:30070:30075,0,RBL:209.85.222.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:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: prose19_8b6767bbc2e31 X-Filterd-Recvd-Size: 6242 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by imf39.hostedemail.com (Postfix) with ESMTP for ; Fri, 3 Apr 2020 13:35:57 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id x3so7929585qki.4 for ; Fri, 03 Apr 2020 06:35:57 -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=t5mNk/pBsrx+7SZ7Dr7HuNaAm2sCHM+52woIf4SjdLE=; b=euX0p0KDOn8g3Gb1NEzcdIwRj0eFSMuMP0GNCXsR+rIq/KXzGri2F/Vs/jEf/Kb9Gl jTRNzJvFK8e53RNfBPpE6nkBqeOG15Zh3UG/MF+KKs/KfxM2OW77BXTAt+jQoN83/DEJ 69UvFw+oK9bXxLJakw0CYE7rWtfkcssbI1ETSOF6HC9Wg3nHvwfkishfjJHoBKoppOHh NQhbPYrBrMbFcTB0JU4KCpCFN/vmWJ/xXsSCi5bU2EGJwZwiGfwBDPioObbkSLQl6rMY fLVHxnVbmbESLJSwWMyuqRRNJbcqcaf3RoN4qx0ptzn87eLlqcECUMZJTkXVJ9hZ2geR t+nQ== 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=t5mNk/pBsrx+7SZ7Dr7HuNaAm2sCHM+52woIf4SjdLE=; b=Utf8N7ZGIXO/62XjADcLspSzE0KDPk4iu0RuRjbIZ9NiFDdjGCWDaBJhYUzQ5aipLZ fQdsY2FZ/mqrEX8vvNWCyIeXNMG+9xlhcAwq4hj3iAIRe6Vn7/PS4B6y+IiqVJQ4mt7R RhXMvcG4xKK6xW5uxd6ej68mdJVO15OBfZihSM0/GJL1WN8jJO62pQnYID8OYNB4akIP KK5ctAtRSfPRVcW+RXQknswYpc/Fs28jAQcQAWlgyjPIocUdXQOmW3l3N8uqPmh9oVwZ mKa9sMAb501ixIZlJK6XAv8FIaic2xsk0vZxVkBZT4RYFdEebb9vx2HTQtn2wU31zJp4 ijlQ== X-Gm-Message-State: AGi0PuYPV9Bsi8NOzeHAEfZYuUulEP+STXDOT/mvagVnl6bpGYi6R78z dcUhFmyIbmPROGelK12o4SJFSA== X-Google-Smtp-Source: APiQypIS+Ilc05wjUfNSDBZF6lQsnbsb8T/dby3KyfO+CIdtRbbr8ey0xj0xIdbJ3VAfjfs6tlhD2A== X-Received: by 2002:a05:620a:cc6:: with SMTP id b6mr8775786qkj.74.1585920957072; Fri, 03 Apr 2020 06:35: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 17sm6210799qkm.105.2020.04.03.06.35.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 06:35: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 v3 3/3] mm: call cond_resched() from deferred_init_memmap() Date: Fri, 3 Apr 2020 09:35:49 -0400 Message-Id: <20200403133549.14338-4-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200403133549.14338-1-pasha.tatashin@soleen.com> References: <20200403133549.14338-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 --- 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 4a60f2427eb0..445f74358997 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1816,7 +1816,7 @@ static int __init deferred_init_memmap(void *data) */ while (spfn < epfn) { nr_pages += deferred_init_maxorder(&i, zone, &spfn, &epfn); - touch_nmi_watchdog(); + sched_clock(); } zone_empty: /* Sanity check that the next zone really is unpopulated */