From patchwork Wed Nov 28 08:36:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 10702049 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE92D13BB for ; Wed, 28 Nov 2018 08:36:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0E6E2BA4F for ; Wed, 28 Nov 2018 08:36:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B53CB2CDA1; Wed, 28 Nov 2018 08:36:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21D412CD9E for ; Wed, 28 Nov 2018 08:36:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0FA5E6B4C04; Wed, 28 Nov 2018 03:36:43 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 083946B4C05; Wed, 28 Nov 2018 03:36:43 -0500 (EST) 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 E3F306B4C06; Wed, 28 Nov 2018 03:36:42 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by kanga.kvack.org (Postfix) with ESMTP id 9EBE06B4C04 for ; Wed, 28 Nov 2018 03:36:42 -0500 (EST) Received: by mail-pg1-f198.google.com with SMTP id r16so11757092pgr.15 for ; Wed, 28 Nov 2018 00:36:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id; bh=Js7ZDQbKjesiATVUlp/y3vZbiI4OLlnh7yDftQZZUQg=; b=dBPxn80wP7L2OnHyoZx/GAUFM36BLidO+c6UuuJbhnfa4IPTIxvnpa19NgbP/Nn4cH AqIBbiMNfN1WLh+JBCGA6uwXI3jYq6yH94mWgmVhB9SFRsyhLKvSVVb2Ely5zz2cv0Er VnZYwFCbAWpEsdH6bPFC9T+LVS4i80GhVDKYhWo/eojLqY+0gYseGNqfsdaVsl/gDFDL c+pvrwDQ+bs2nXCL86PE7inU7GQ+blrf5HYyXjPbgbqrZ7x9xCO697rCs3zi0gTGcDvV cOFYmWQwdebruzdVL8nsmB0PEb8RrtU/Ck2iAssJQpYSGDqSASZ+asEOa/b59uidv0Dm utWg== X-Gm-Message-State: AA+aEWY7euIAppXU1rJayJbveFHNdPC1XxQZRV+UrWw/AcLlfbE9qOfa RlAhIOir2El1mDpiVHvOWPvyYaj83fApCh55XjieZTzedD/S4tdkd2rb7AfYCU8L2AJutz8EkuW e4rivLDVSThZneG/6UsTxC7eXwZM0SYgN9aMLYbzE7p5rX4qn6e6cA7jAkQLLaEkaohUY63dVQL cYS8WTnhYx3jcjT2JKZ1+DP8faHfb00FD3FC3hGSbMHv64R05VsToXIDjCmL7gl+PC4yL2bW3jP Bkx0uMePGQfwyRI5R5qDSU5IhN5dYcZXSx5vWOotUtj91vBM34bxjEW8Mk/xdhz/3CLlwqA1cHK P/YNrjtCqK+f9waUmGCrCJVybak1uURbuXZFTtl1uCSHFdOuHh3LaobMZ2R1gNOz0sqkfJSQZgT 4 X-Received: by 2002:a17:902:1008:: with SMTP id b8mr25981108pla.252.1543394202165; Wed, 28 Nov 2018 00:36:42 -0800 (PST) X-Received: by 2002:a17:902:1008:: with SMTP id b8mr25981049pla.252.1543394200866; Wed, 28 Nov 2018 00:36:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543394200; cv=none; d=google.com; s=arc-20160816; b=RSr/fB7TfzdSYxNq/R2XpdEEhGR0c944SsyhxQcC9MBovPBKr18izMogsAlER9ihLT Qvu+hDASeUjpId9eNbX4FFzVokLep1DMYNlWB9dwTa3wSuOnRTOYRxfGADMbDw2ZrmEG EwQAFzsLs9dHVnvT+BQWbxYM1OLhTQ2b/y7W1tmyCWdvWPjkTTlHvgaZMaA6I/iQ1BDp jV+Sr1aG2vUY5dGh2rbotz3riOld2UZTq0CJ0auFbzWFVV4BJ/8DpJz8ksD3qQkeSqW8 Bu8e2A82ObuqYdOZjERFts2fBhGGU7HQcFrUuCr4vZr0LQbW3oImBWK1BzPoy4G+0EuF tlCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=Js7ZDQbKjesiATVUlp/y3vZbiI4OLlnh7yDftQZZUQg=; b=NQG3k1pItpjrdYWgbakmAdD4371JVMLVsNW5pCGYD84Yzxdii9C4ohGsPVX1OlkwKB ycQklrXfvgxf/5Olol9g+PoJxvYPnr8e5/lvJDIL28Mfn0pLYY2/r8CNcRvttLWMcBcc OE1JSUQ9hsj+lbeWT/AFpnOfIxY/bUC64bmHvtvW70Ntb9oBBMT4R/KLKlU9/V8i9VTg JVAoHH0HXsm3JZG5QF2tf1x2fagORsjeK6GbAC0Ph1kn/Ma4yAsnvLuHXe1YZ8m/yfEa PHaTvIP8VJ5lHWgkCunfcQMSVxHLyVn1TbX3wFYUICEH59f35syZDl1msem8ODNW+0br rjsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=N+fK6Zwa; spf=pass (google.com: domain of richard.weiyang@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=richard.weiyang@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id h192sor8335663pgc.77.2018.11.28.00.36.40 for (Google Transport Security); Wed, 28 Nov 2018 00:36:40 -0800 (PST) Received-SPF: pass (google.com: domain of richard.weiyang@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=N+fK6Zwa; spf=pass (google.com: domain of richard.weiyang@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=richard.weiyang@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Js7ZDQbKjesiATVUlp/y3vZbiI4OLlnh7yDftQZZUQg=; b=N+fK6ZwaAvgVK763wC67dz9cdzkGAse5/mkBplE1DNPZT22UPFiIksR7zYsFXPndm5 3Z2cuwQVHF2rtO8edDBRnkfa7jNFqRz5wKdeBb8wWQlhMimKSlwsvciVULSxaegHwnwJ v8gnZjBgYWrPdi7RGOeYYD0ofxQMWfRntQf1msQINeipB+HQI2VHz1j9tjLg18tMU8W3 Kf1t4h/cGehuaFydgUF7H8TxxN/P//4IQeKmMhWe4h16pO8OaM2/L5xAgNKYCcRWPnAu xlSOumTfXNLMPEshzCi27cv7zhXzj6IB8dPjLm/XLGJcP7ii+TydErczWBY0Vuyf8eKV m4AA== X-Google-Smtp-Source: AFSGD/WJ9tA5iLWht8yBW0Q1sXxNQnaaY5VcU1pAfcR4NPKTqK85i/bSbPriP2f+Pnvln1q4289JMA== X-Received: by 2002:a63:d005:: with SMTP id z5mr32185693pgf.64.1543394200345; Wed, 28 Nov 2018 00:36:40 -0800 (PST) Received: from localhost ([116.230.158.197]) by smtp.gmail.com with ESMTPSA id a17sm13469143pgm.26.2018.11.28.00.36.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 00:36:39 -0800 (PST) From: Wei Yang To: hughd@google.com, akpm@linux-foundation.org, pasha.tatashin@oracle.com, mgorman@suse.de Cc: linux-mm@kvack.org, Wei Yang Subject: [RFC PATCH] mm: update highest_memmap_pfn based on exact pfn Date: Wed, 28 Nov 2018 16:36:34 +0800 Message-Id: <20181128083634.18515-1-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.15.1 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: X-Virus-Scanned: ClamAV using ClamSMTP When DEFERRED_STRUCT_PAGE_INIT is set, page struct will not be initialized all at boot up. Some of them is postponed to defer stage. While the global variable highest_memmap_pfn is still set to the highest pfn at boot up, even some of them are not initialized. This patch adjust this behavior by update highest_memmap_pfn with the exact pfn during each iteration. Since each node has a defer thread, introduce a spin lock to protect it. Signed-off-by: Wei Yang --- mm/internal.h | 8 ++++++++ mm/memory.c | 1 + mm/nommu.c | 1 + mm/page_alloc.c | 9 ++++++--- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 6a57811ae47d..f9e19c7d9b0a 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -79,6 +79,14 @@ static inline void set_page_refcounted(struct page *page) } extern unsigned long highest_memmap_pfn; +extern spinlock_t highest_memmap_pfn_lock; +static inline void update_highest_memmap_pfn(unsigned long end_pfn) +{ + spin_lock(&highest_memmap_pfn_lock); + if (highest_memmap_pfn < end_pfn - 1) + highest_memmap_pfn = end_pfn - 1; + spin_unlock(&highest_memmap_pfn_lock); +} /* * Maximum number of reclaim retries without progress before the OOM diff --git a/mm/memory.c b/mm/memory.c index 4ad2d293ddc2..0cf9b88b51b7 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -127,6 +127,7 @@ unsigned long zero_pfn __read_mostly; EXPORT_SYMBOL(zero_pfn); unsigned long highest_memmap_pfn __read_mostly; +DEFINE_SPINLOCK(highest_memmap_pfn_lock); /* * CONFIG_MMU architectures set up ZERO_PAGE in their paging_init() diff --git a/mm/nommu.c b/mm/nommu.c index 749276beb109..610dc6e17ce5 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -48,6 +48,7 @@ struct page *mem_map; unsigned long max_mapnr; EXPORT_SYMBOL(max_mapnr); unsigned long highest_memmap_pfn; +static DEFINE_SPINLOCK(highest_memmap_pfn_lock); int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS; int heap_stack_gap = 0; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ccc86df24f28..33bb339aaef8 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1216,6 +1216,7 @@ static void __meminit init_reserved_page(unsigned long pfn) break; } __init_single_page(pfn_to_page(pfn), pfn, zid, nid); + update_highest_memmap_pfn(pfn); } #else static inline void init_reserved_page(unsigned long pfn) @@ -1540,6 +1541,7 @@ static unsigned long __init deferred_init_pages(int nid, int zid, __init_single_page(page, pfn, zid, nid); nr_pages++; } + update_highest_memmap_pfn(pfn); return (nr_pages); } @@ -5491,9 +5493,6 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, unsigned long pfn, end_pfn = start_pfn + size; struct page *page; - if (highest_memmap_pfn < end_pfn - 1) - highest_memmap_pfn = end_pfn - 1; - #ifdef CONFIG_ZONE_DEVICE /* * Honor reservation requested by the driver for this ZONE_DEVICE @@ -5550,6 +5549,8 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, cond_resched(); } } + + update_highest_memmap_pfn(pfn); } #ifdef CONFIG_ZONE_DEVICE @@ -5622,6 +5623,8 @@ void __ref memmap_init_zone_device(struct zone *zone, } } + update_highest_memmap_pfn(pfn); + pr_info("%s initialised, %lu pages in %ums\n", dev_name(pgmap->dev), size, jiffies_to_msecs(jiffies - start)); }