From patchwork Tue Jul 17 10:56:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10528951 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 AF25E6020A for ; Tue, 17 Jul 2018 10:57:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A896283D1 for ; Tue, 17 Jul 2018 10:57:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E8E128429; Tue, 17 Jul 2018 10:57:04 +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=unavailable 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 2C97D283D1 for ; Tue, 17 Jul 2018 10:57:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4C5E16B0010; Tue, 17 Jul 2018 06:56:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 44DAE6B0266; Tue, 17 Jul 2018 06:56: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 1E7E06B026A; Tue, 17 Jul 2018 06:56:57 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by kanga.kvack.org (Postfix) with ESMTP id 9F4B26B0010 for ; Tue, 17 Jul 2018 06:56:56 -0400 (EDT) Received: by mail-wr1-f72.google.com with SMTP id q18-v6so261803wrr.12 for ; Tue, 17 Jul 2018 03:56:56 -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=/G133LW3AMb98SZ7TOHjyYBpeXlNPwTPfphZKp2QLFc=; b=GGgPzXaAy/SF1OsVBlxm78JrKF7wBXeePEVihZsdOrhhZtlN17Ni+uoF3optI4YUuB 7jjNT7Vm7PqEmvcJ7bUTeTnk9DJdLHhwcA6hgUH/Qd447mw/fXa+BzmKZRi8P8OOdchM H+X/FANAy86sy9/k+AgZAqNUvXdqWsRFlVZwCqTcEFUO6waU4tGBghQ5wwJSff8QVAI7 rQ7qSGn3+s17TjSKPgDCryPOAoZaJhxD0QxBz+hvNPuOS7khk7lg0zTLuqR9Dmfu7C0J B4MRNwFxEqs8SLO0mAvay/MYC8JcRuKNnRVtzt7GG16eBTIdQeSVZW5ZVpf0xrwbODSo 8AKQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com X-Gm-Message-State: AOUpUlG4MLS1Fol4VlocZauaa52vpTNzUcVm8rIugd0FBv0LEKlC5MWm iMke1DuK4x5TRiI+CcHP3B+Mg4BztlLA/H5qp3hjh86+IRCQOTxA2Xrw1Ef7YloXVihGE++SLyK nRKZftr1KiE0Hws6cEJ0tkR1fSwXS/rdXhcO4MuYVf9jwvizxFIfRMwTDHDj+53T+pE4U+J5r5l BRpn9lB6pMokveFkGKOPv+GJ9w4QBhD6EBtbjR0iM3tBluit01d3UGkW1ejt2zkkZHJfaIvaeZs AuGyGLKvWmglXRrIlnt43m/8ZH/9Wr/bmSJRDjJCBNrJ7Y/mBZ+BnJ+1QGRX1ThcBvEuozCLdrH wXzHiaCzWAcIHxHIxllWQB6HoUgcdZl/7cvO5EquEpRc+gLPYJnXwAp3/dYgDEop9LB9qT3mQQ= = X-Received: by 2002:a1c:be13:: with SMTP id o19-v6mr975078wmf.1.1531825016167; Tue, 17 Jul 2018 03:56:56 -0700 (PDT) X-Received: by 2002:a1c:be13:: with SMTP id o19-v6mr975051wmf.1.1531825015489; Tue, 17 Jul 2018 03:56:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531825015; cv=none; d=google.com; s=arc-20160816; b=IgS6RgMYzQDhjHALkcszl1lKWE7tnmzwA8hcoVydsNSbLsXzubz84xtz2RjraXVUvN nN6dqF/zVA06dFh9Hj+wTOr6/gm7XiKJDqGqDPQzsJ7Sb5xHLqtVTX8Xz8+ASzhnDKFx PXO20vFefHlvyrWgcvaJP8l09tFXF5jbP+cVz6n5f6ivgiT/gPMDKYMIU4AP8Efi+iWs /tmm4oc4Hz/iVfab9QBVfBlLWb5Rg3dpffP1WEXe1RD2F/D+e91H3O8QJ7mbaulv3Yj8 A3x7PK7nZLOPyaaKMH89oopCo83glia5SWRjdvlA0gEWijQIbRweWcBp/dOxG/Zczamy fIvg== 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=/G133LW3AMb98SZ7TOHjyYBpeXlNPwTPfphZKp2QLFc=; b=fDJjZDYxRT+/1c6ozFfsJ7i9D5JkeFvGyLouqamiqX4VVvd7yiQ8ncgEcd2pPDt6K2 SZ+D+VD9PwHSLZ9ynP0KeHLcjTajzHijrTUjKS9CytkR5Hrwjt/fFtutP/HE9gACx970 ubuJ7S3L8EC020mzFdyJ/5SiJ8zSTAZGe2sT/z1pcFDnVLz45Cf4fErAkb8Dz2wNIQSf UyjHfwZBg61FWYQbOxEiMswHtENNjhE7G4Su0/geGWO9RWbmvkTZNUKIXzqLnaVBlm7U qmvjhoAbYsNhtcOQaXdJwf1Vv1B6FRNbVuUBn7FCBJgao+J6ZgmYpf9B4mCEIEqC0Dra dzKQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@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 h45-v6sor345303wrh.8.2018.07.17.03.56.55 for (Google Transport Security); Tue, 17 Jul 2018 03:56:55 -0700 (PDT) Received-SPF: pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com X-Google-Smtp-Source: AAOMgpciRVmRDprOtbFXQ0IAcf/V/10SbWc66QyE9lYKB7h/zKqX99NInHQ/BU2E3I3Yf6aGn/+Iiw== X-Received: by 2002:a5d:4d8d:: with SMTP id b13-v6mr958518wru.80.1531825015258; Tue, 17 Jul 2018 03:56:55 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id q140-v6sm1491771wmb.35.2018.07.17.03.56.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jul 2018 03:56:54 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 3F9F7123FFC; Tue, 17 Jul 2018 12:56:53 +0200 (CEST) From: osalvador@techadventures.net To: linux-mm@kvack.org Cc: pasha.tatashin@oracle.com, mhocko@suse.com, vbabka@suse.cz, akpm@linux-foundation.org, aaron.lu@intel.com, iamjoonsoo.kim@lge.com, linux-kernel@vger.kernel.org, Oscar Salvador Subject: [RFC PATCH 3/3] mm: Make free_area_init_node call certain functions only when booting Date: Tue, 17 Jul 2018 12:56:22 +0200 Message-Id: <20180717105622.12410-4-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180717105622.12410-1-osalvador@techadventures.net> References: <20180717105622.12410-1-osalvador@techadventures.net> 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 From: Oscar Salvador If free_area_init_node got called from memhotplug code, we do not need to call calculate_node_totalpages(), as the node has no pages. We do not need to set the range for the deferred initialization either, as memmap_init_zone skips that when the context is MEMMAP_HOTPLUG. Signed-off-by: Oscar Salvador --- mm/page_alloc.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 3bf939393ca1..d2562751dbfd 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6299,8 +6299,6 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat) spin_lock_init(&pgdat->lru_lock); lruvec_init(node_lruvec(pgdat)); - pgdat->per_cpu_nodestats = &boot_nodestats; - for (j = 0; j < MAX_NR_ZONES; j++) { struct zone *zone = pgdat->node_zones + j; @@ -6386,6 +6384,21 @@ static void __ref alloc_node_mem_map(struct pglist_data *pgdat) static void __ref alloc_node_mem_map(struct pglist_data *pgdat) { } #endif /* CONFIG_FLAT_NODE_MEM_MAP */ +#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT +static void pgdat_set_deferred_range(pg_data_t *pgdat) +{ + /* + * We start only with one section of pages, more pages are added as + * needed until the rest of deferred pages are initialized. + */ + pgdat->static_init_pgcnt = min_t(unsigned long, PAGES_PER_SECTION, + pgdat->node_spanned_pages); + pgdat->first_deferred_pfn = ULONG_MAX; +} +#else +static void pgdat_set_deferred_range(pg_data_t *pgdat) {} +#endif + void __paginginit free_area_init_node(int nid, unsigned long *zones_size, unsigned long node_start_pfn, unsigned long *zholes_size) { @@ -6407,20 +6420,14 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size, #else start_pfn = node_start_pfn; #endif - calculate_node_totalpages(pgdat, start_pfn, end_pfn, - zones_size, zholes_size); - - alloc_node_mem_map(pgdat); + if (system_state == SYSTEM_BOOTING) { + calculate_node_totalpages(pgdat, start_pfn, end_pfn, + zones_size, zholes_size); + alloc_node_mem_map(pgdat); + pgdat_set_deferred_range(pgdat); + pgdat->per_cpu_nodestats = &boot_nodestats; + } -#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT - /* - * We start only with one section of pages, more pages are added as - * needed until the rest of deferred pages are initialized. - */ - pgdat->static_init_pgcnt = min_t(unsigned long, PAGES_PER_SECTION, - pgdat->node_spanned_pages); - pgdat->first_deferred_pfn = ULONG_MAX; -#endif free_area_init_core(pgdat); }