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 */