From patchwork Wed Jun 27 01:31:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 10490387 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B9264602D8 for ; Wed, 27 Jun 2018 01:31:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A80251FF29 for ; Wed, 27 Jun 2018 01:31:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9AF8C289F6; Wed, 27 Jun 2018 01:31:36 +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 3161F1FF29 for ; Wed, 27 Jun 2018 01:31:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 26B226B0010; Tue, 26 Jun 2018 21:31:35 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 21BA96B0266; Tue, 26 Jun 2018 21:31:35 -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 134096B0269; Tue, 26 Jun 2018 21:31:35 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt0-f200.google.com (mail-qt0-f200.google.com [209.85.216.200]) by kanga.kvack.org (Postfix) with ESMTP id E15906B0010 for ; Tue, 26 Jun 2018 21:31:34 -0400 (EDT) Received: by mail-qt0-f200.google.com with SMTP id i7-v6so474724qtp.4 for ; Tue, 26 Jun 2018 18:31:34 -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:from:to:cc :subject:date:message-id:in-reply-to:references; bh=77cGPGQTmsKhPS1aqo4fqoPfOktFGM38yYFNWZayAl4=; b=PBUa/7fv4KdRCbpbNnB4Dq+ELzn1X/Wd5Q3yTPhoIPQqllNRDLVgOnckj1QuTrYFI+ ztz84HTmjiagGbHepzln51TUPRpyc1AewHpwcq5Ij0+opVs7iuYQy+9AuuxF45SkPS58 O9BZia0P8jg6pIXcw8/IaQjl+5bgBtpnpy9d7DRvriNKnuAldUtwDlhMxW/9W8MCL3fk YF8OT47qkM6j540J2xVJpqRbaRkOU0+E2ittKwAWbIeo08y/BoyIZNEWesXTdwoAuBVe XqSzUg1//WpZ7fyc7EGJPjk1NB/4TUuk9SuC5EjL3mA3kQqaUVCv1bz2EC+/Iyb346mp C4YQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of bhe@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: APt69E2HLPUSdNry6FAc8w0Rf3278uvGsXRiWrZs8sul5yzZBcoGuiIR QMFFKROAcp5mGglzQd3+6ZdgWFMPMyyoQz52cQsL0Ja1cBmYwaW0MD/1rb6GN994bMSeZzo8eIg DEuVTkqsOaMlDXYrcsai+RbJ8d0+OO4jNNPM6vCiMjHhUltSdWutlcDwGmfn6pph/Og== X-Received: by 2002:ac8:21fd:: with SMTP id 58-v6mr3658540qtz.246.1530063094678; Tue, 26 Jun 2018 18:31:34 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdnzz5EeU4Pp8DtWZdFE+lQ6ddbj4x1sGzEfzkNuEjAyu6TCpzJBBpk9wpYtCFX0FLOhFDf X-Received: by 2002:ac8:21fd:: with SMTP id 58-v6mr3658517qtz.246.1530063094100; Tue, 26 Jun 2018 18:31:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530063094; cv=none; d=google.com; s=arc-20160816; b=MwcgtsDSukE8n1+7eOS8r59zDr8VdtOlAyzu7nwtqJDZ+zj+8er9mExsatvC21RUbn OkpO/vXli7KBMZA4qCTCJEUirWxk65ICMdhxLjb+AmlZXTxboCc9hiFBh0lVT+RZNK37 aQgj8NVvK9tpZbet4r0tifIp9oioQtbQgFUKlDsWARO2rXd0VAzuqYmbse6cxnl9Q7fO XWOnAe7byQChX6wZNo6mTSBmCBhckAwsmlxn/e0n6DfPyX7VhKhtKvOOqPvlquc+4jaW hGs3ThJAjPf+kles/O6fvxlPj9nTx7Kfydn5HjtGFUrMlMsOSh9+IpikIq/JUr8WWU3s Aj7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=77cGPGQTmsKhPS1aqo4fqoPfOktFGM38yYFNWZayAl4=; b=kDlV0xcwOLZG8g1w+0h2dmst6J3OKH4tqbYCMMXDs7Fjv2ThqVJ30eAzYPepB0IfEw prcnszG7gMaKOX8su3bULz7ouSzohLR/fGesJLiwdB0Fv6IhdncuvDagMCK3hVokekRj Ju1dfX7z4jhkSjtvEldnM1Im6O+7uRHv0KvXTjt31vHPndvx6eIwbNRpY8G19uw+rOQw J6eDH1P4t6f9006x+RNiJYjdXqyzJt/heSW/hzE3e/xfSRX0LBgynDSMLJWIliQgRIIh iguRBm2FbWXPdxOQfgsIutDi63sFi82LN0GinDfBw60W+05B3To+7TF7Ohi0q7OS+jPW exag== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of bhe@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx3-rdu2.redhat.com. [66.187.233.73]) by mx.google.com with ESMTPS id a2-v6si2645074qkg.228.2018.06.26.18.31.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 18:31:34 -0700 (PDT) Received-SPF: pass (google.com: domain of bhe@redhat.com designates 66.187.233.73 as permitted sender) client-ip=66.187.233.73; Authentication-Results: mx.google.com; spf=pass (google.com: domain of bhe@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B3D04400B455; Wed, 27 Jun 2018 01:31:33 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-8-24.pek2.redhat.com [10.72.8.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id F25E4111764C; Wed, 27 Jun 2018 01:31:29 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, dave.hansen@intel.com, pagupta@redhat.com Cc: linux-mm@kvack.org, kirill.shutemov@linux.intel.com, Baoquan He Subject: [PATCH v5 2/4] mm/sparsemem: Defer the ms->section_mem_map clearing Date: Wed, 27 Jun 2018 09:31:14 +0800 Message-Id: <20180627013116.12411-3-bhe@redhat.com> In-Reply-To: <20180627013116.12411-1-bhe@redhat.com> References: <20180627013116.12411-1-bhe@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 27 Jun 2018 01:31:33 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 27 Jun 2018 01:31:33 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'bhe@redhat.com' RCPT:'' 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 In sparse_init(), if CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y, system will allocate one continuous memory chunk for mem maps on one node and populate the relevant page tables to map memory section one by one. If fail to populate for a certain mem section, print warning and its ->section_mem_map will be cleared to cancel the marking of being present. Like this, the number of mem sections marked as present could become less during sparse_init() execution. Here just defer the ms->section_mem_map clearing if failed to populate its page tables until the last for_each_present_section_nr() loop. This is in preparation for later optimizing the mem map allocation. Signed-off-by: Baoquan He Reviewed-by: Pavel Tatashin --- mm/sparse-vmemmap.c | 1 - mm/sparse.c | 12 ++++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index bd0276d5f66b..640e68f8324b 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -303,7 +303,6 @@ void __init sparse_mem_maps_populate_node(struct page **map_map, ms = __nr_to_section(pnum); pr_err("%s: sparsemem memory map backing failed some memory will not be available\n", __func__); - ms->section_mem_map = 0; } if (vmemmap_buf_start) { diff --git a/mm/sparse.c b/mm/sparse.c index 6314303130b0..71ad53da2cd1 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -451,7 +451,6 @@ void __init sparse_mem_maps_populate_node(struct page **map_map, ms = __nr_to_section(pnum); pr_err("%s: sparsemem memory map backing failed some memory will not be available\n", __func__); - ms->section_mem_map = 0; } } #endif /* !CONFIG_SPARSEMEM_VMEMMAP */ @@ -479,7 +478,6 @@ static struct page __init *sparse_early_mem_map_alloc(unsigned long pnum) pr_err("%s: sparsemem memory map backing failed some memory will not be available\n", __func__); - ms->section_mem_map = 0; return NULL; } #endif @@ -583,17 +581,23 @@ void __init sparse_init(void) #endif for_each_present_section_nr(0, pnum) { + struct mem_section *ms; + ms = __nr_to_section(pnum); usemap = usemap_map[pnum]; - if (!usemap) + if (!usemap) { + ms->section_mem_map = 0; continue; + } #ifdef CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER map = map_map[pnum]; #else map = sparse_early_mem_map_alloc(pnum); #endif - if (!map) + if (!map) { + ms->section_mem_map = 0; continue; + } sparse_init_one_section(__nr_to_section(pnum), pnum, map, usemap);