From patchwork Wed Sep 26 23:28:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Duyck X-Patchwork-Id: 10617035 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 472A6175A for ; Wed, 26 Sep 2018 23:29:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 357BE2B1E5 for ; Wed, 26 Sep 2018 23:29:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2956C2B1EB; Wed, 26 Sep 2018 23:29:18 +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=-2.9 required=2.0 tests=BAYES_00,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 7E4252B1E5 for ; Wed, 26 Sep 2018 23:29:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2DFB08E0005; Wed, 26 Sep 2018 19:29:13 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 215638E0001; Wed, 26 Sep 2018 19:29:13 -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 12C638E0005; Wed, 26 Sep 2018 19:29:13 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id CB3AF8E0001 for ; Wed, 26 Sep 2018 19:29:12 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id e6-v6so762349pge.5 for ; Wed, 26 Sep 2018 16:29:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:subject:from :to:cc:date:message-id:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=qCWWV9zfq63SntA09Ql+Y4V/UVx9YhMvS19LxFLBtwc=; b=duoeiiXr4WYhvF99lrSA6E2Ssvr6AM0L/zlfeBV09+y6Eo3ypnJlxzJXE8vqmC09J8 ynvsB3Oxd1o7EsGeXm105pSU7BZl4l9CoghILUK97hJZvBV7O1XMKFIX0KsQdUvR2y9e uXOtk79TelWZtJSrsPxpaQf7ivTUg4+fTj8WeWE2RyqCFULFR2sHJ01QGbqsGnBG0gcF fPcpxdxQOXkL0wJL5IWcTDmvAG+HEtLRsoh47HklGXWFuHHuaoiCcaSN20UV6bh2CDBf 7LSOpzTfTSZYUhiFDbRNC8HiYLh6w0pkykqsvmTcWkgPxXa+nalfxywZe9VAD32wZH5G gbvQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of alexander.h.duyck@linux.intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=alexander.h.duyck@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: ABuFfojzrHMVw3sXTKB9lSQHopf5PWU5qPQL5tiXgdpeAArOyyv3dhcj wIynj1n/z6u2+W0dCkfooWrHyMOUdufKKBZ1hAq8JGP6pTv6/40QWNEyiXuKTRsZ5FKP56w0aze GdFyhona6E3TufKLsGzM20dWgy6ZpxUqwhFNvKaR50y1Qojx39YaVwQ6EWHbgF6RRFA== X-Received: by 2002:a62:3644:: with SMTP id d65-v6mr8319177pfa.133.1538004552500; Wed, 26 Sep 2018 16:29:12 -0700 (PDT) X-Google-Smtp-Source: ACcGV60XBzQpldita8Ld6bQpUYfTJ4SixBtYs16nQxAB3TgGSpsWbrN3dO71wMvrVip89Xt4iPMA X-Received: by 2002:a62:3644:: with SMTP id d65-v6mr8319107pfa.133.1538004551374; Wed, 26 Sep 2018 16:29:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538004551; cv=none; d=google.com; s=arc-20160816; b=hHfj/pDzOhGgIF9jZg2STyLyJqKH2TqjiP4WhBCiSsfFpf5zHCYZAbM4hPi79k8Sry 7L8xDzizjfGts+ldh75+FwFd8fZmhxJKY8TNqT+eZfsVWb9Z9WUnkSu7qJ9LU+sDZzDF Al7D2qiVYVrBHP+GGR+p6c2ZbyZVRzX/z23L2oYafLlNrs9UGrO1odtqV3wlIifR4qeI fJtAko0loaEpsl6Vv2iAg304ZYIenuYiUFtZVt2uT92NhG7ivPKeAOPbPTlHiNrtaYz0 3jLXbEcufqAO2hJckPfkKGCmTRNQn4Injln3Phdy726J1SoGOVLLX10t2J7hIb1Q1knY Viaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:subject; bh=qCWWV9zfq63SntA09Ql+Y4V/UVx9YhMvS19LxFLBtwc=; b=NIZ2e0XsAkgXZzqHrR+EArs+XwFhlnrQOiNLJakoRH6QUgyCWxClv8H+MxfpePsowg RO/xvPcm78E2XctFvHrj4x16POfGw2BHyVgi/h64f00E3cCcZT1UI8LsFyqxOwMyOGIp GBTGoP2L6OZcSecCx2MM9w/fw/FYgNro/LFfMeTo/qzm/PE5qkcI+wFQ8OEA5ef69zEX 6V2NRLOFkWO3p/W0q3KGE9D14RzHsJIi9Mwsib0YZje6JYBmexgqfN6pyFnTfiOqSkHL /Abf4uAP6CCEgO16matKQUcBjZBz+RsMKgNtimZ0QTCiJlBt/0sEymku9QQ26Cwvl4D4 KexA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of alexander.h.duyck@linux.intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=alexander.h.duyck@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga12.intel.com (mga12.intel.com. [192.55.52.136]) by mx.google.com with ESMTPS id d7-v6si360746pln.68.2018.09.26.16.29.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Sep 2018 16:29:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of alexander.h.duyck@linux.intel.com designates 192.55.52.136 as permitted sender) client-ip=192.55.52.136; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of alexander.h.duyck@linux.intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=alexander.h.duyck@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Sep 2018 16:29:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,308,1534834800"; d="scan'208";a="86873226" Received: from ahduyck-mobl.amr.corp.intel.com (HELO localhost.localdomain) ([10.7.198.154]) by orsmga003.jf.intel.com with ESMTP; 26 Sep 2018 16:28:32 -0700 Subject: [RFC mm PATCH 2/5] mm: Drop meminit_pfn_in_nid as it is redundant From: Alexander Duyck To: sparclinux@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: pavel.tatashin@microsoft.com, mhocko@suse.com, dave.jiang@intel.com, alexander.h.duyck@linux.intel.com, dan.j.williams@intel.com, willy@infradead.org, mingo@kernel.org, khalid.aziz@oracle.com, rppt@linux.vnet.ibm.com, vbabka@suse.cz, akpm@linux-foundation.org, ldufour@linux.vnet.ibm.com, davem@davemloft.net, kirill.shutemov@linux.intel.com Date: Wed, 26 Sep 2018 16:28:32 -0700 Message-ID: <20180926232831.17365.77851.stgit@localhost.localdomain> In-Reply-To: <20180926232117.17365.72207.stgit@localhost.localdomain> References: <20180926232117.17365.72207.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 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 As best as I can tell the meminit_pfn_in_nid call is completely redundant. The deferred memory initialization is already making use of for_each_free_mem_range which in turn will call into __next_mem_range which will only return a memory range if it matches the node ID provided assuming it is not NUMA_NO_NODE. I am operating on the assumption that there are no zones or pgdata_t structures that have a NUMA node of NUMA_NO_NODE associated with them. If that is the case then __next_mem_range will never return a memory range that doesn't match the zone's node ID and as such the check is redundant. So one piece I would like to verfy on this is if this works for ia64. Technically it was using a different approach to get the node ID, but it seems to have the node ID also encoded into the memblock. So I am assuming this is okay, but would like to get confirmation on that. Signed-off-by: Alexander Duyck --- mm/page_alloc.c | 50 ++++++++++++++------------------------------------ 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 7ec0997ded39..1d6e95df3412 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1305,36 +1305,22 @@ int __meminit early_pfn_to_nid(unsigned long pfn) #endif #ifdef CONFIG_NODES_SPAN_OTHER_NODES -static inline bool __meminit __maybe_unused -meminit_pfn_in_nid(unsigned long pfn, int node, - struct mminit_pfnnid_cache *state) +/* Only safe to use early in boot when initialisation is single-threaded */ +static inline bool __meminit early_pfn_in_nid(unsigned long pfn, int node) { int nid; - nid = __early_pfn_to_nid(pfn, state); + nid = __early_pfn_to_nid(pfn, &early_pfnnid_cache); if (nid >= 0 && nid != node) return false; return true; } -/* Only safe to use early in boot when initialisation is single-threaded */ -static inline bool __meminit early_pfn_in_nid(unsigned long pfn, int node) -{ - return meminit_pfn_in_nid(pfn, node, &early_pfnnid_cache); -} - #else - static inline bool __meminit early_pfn_in_nid(unsigned long pfn, int node) { return true; } -static inline bool __meminit __maybe_unused -meminit_pfn_in_nid(unsigned long pfn, int node, - struct mminit_pfnnid_cache *state) -{ - return true; -} #endif @@ -1463,21 +1449,13 @@ static inline void __init pgdat_init_report_one_done(void) * * Then, we check if a current large page is valid by only checking the validity * of the head pfn. - * - * Finally, meminit_pfn_in_nid is checked on systems where pfns can interleave - * within a node: a pfn is between start and end of a node, but does not belong - * to this memory node. */ -static inline bool __init -deferred_pfn_valid(int nid, unsigned long pfn, - struct mminit_pfnnid_cache *nid_init_state) +static inline bool __init deferred_pfn_valid(unsigned long pfn) { if (!pfn_valid_within(pfn)) return false; if (!(pfn & (pageblock_nr_pages - 1)) && !pfn_valid(pfn)) return false; - if (!meminit_pfn_in_nid(pfn, nid, nid_init_state)) - return false; return true; } @@ -1485,15 +1463,14 @@ static inline void __init pgdat_init_report_one_done(void) * Free pages to buddy allocator. Try to free aligned pages in * pageblock_nr_pages sizes. */ -static void __init deferred_free_pages(int nid, int zid, unsigned long pfn, +static void __init deferred_free_pages(unsigned long pfn, unsigned long end_pfn) { - struct mminit_pfnnid_cache nid_init_state = { }; unsigned long nr_pgmask = pageblock_nr_pages - 1; unsigned long nr_free = 0; for (; pfn < end_pfn; pfn++) { - if (!deferred_pfn_valid(nid, pfn, &nid_init_state)) { + if (!deferred_pfn_valid(pfn)) { deferred_free_range(pfn - nr_free, nr_free); nr_free = 0; } else if (!(pfn & nr_pgmask)) { @@ -1513,17 +1490,18 @@ static void __init deferred_free_pages(int nid, int zid, unsigned long pfn, * by performing it only once every pageblock_nr_pages. * Return number of pages initialized. */ -static unsigned long __init deferred_init_pages(int nid, int zid, +static unsigned long __init deferred_init_pages(struct zone *zone, unsigned long pfn, unsigned long end_pfn) { - struct mminit_pfnnid_cache nid_init_state = { }; unsigned long nr_pgmask = pageblock_nr_pages - 1; + int nid = zone_to_nid(zone); unsigned long nr_pages = 0; + int zid = zone_idx(zone); struct page *page = NULL; for (; pfn < end_pfn; pfn++) { - if (!deferred_pfn_valid(nid, pfn, &nid_init_state)) { + if (!deferred_pfn_valid(pfn)) { page = NULL; continue; } else if (!page || !(pfn & nr_pgmask)) { @@ -1586,12 +1564,12 @@ static int __init deferred_init_memmap(void *data) for_each_free_mem_range(i, nid, MEMBLOCK_NONE, &spa, &epa, NULL) { spfn = max_t(unsigned long, first_init_pfn, PFN_UP(spa)); epfn = min_t(unsigned long, zone_end_pfn(zone), PFN_DOWN(epa)); - nr_pages += deferred_init_pages(nid, zid, spfn, epfn); + nr_pages += deferred_init_pages(zone, spfn, epfn); } for_each_free_mem_range(i, nid, MEMBLOCK_NONE, &spa, &epa, NULL) { spfn = max_t(unsigned long, first_init_pfn, PFN_UP(spa)); epfn = min_t(unsigned long, zone_end_pfn(zone), PFN_DOWN(epa)); - deferred_free_pages(nid, zid, spfn, epfn); + deferred_free_pages(spfn, epfn); } pgdat_resize_unlock(pgdat, &flags); @@ -1680,7 +1658,7 @@ static int __init deferred_init_memmap(void *data) while (spfn < epfn && nr_pages < nr_pages_needed) { t = ALIGN(spfn + PAGES_PER_SECTION, PAGES_PER_SECTION); first_deferred_pfn = min(t, epfn); - nr_pages += deferred_init_pages(nid, zid, spfn, + nr_pages += deferred_init_pages(zone, spfn, first_deferred_pfn); spfn = first_deferred_pfn; } @@ -1692,7 +1670,7 @@ static int __init deferred_init_memmap(void *data) for_each_free_mem_range(i, nid, MEMBLOCK_NONE, &spa, &epa, NULL) { spfn = max_t(unsigned long, first_init_pfn, PFN_UP(spa)); epfn = min_t(unsigned long, first_deferred_pfn, PFN_DOWN(epa)); - deferred_free_pages(nid, zid, spfn, epfn); + deferred_free_pages(spfn, epfn); if (first_deferred_pfn == epfn) break;