From patchwork Wed Jul 25 22:01:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10544865 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 A3A09180E for ; Wed, 25 Jul 2018 22:02:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 927892A88B for ; Wed, 25 Jul 2018 22:02:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 86A802A8A0; Wed, 25 Jul 2018 22:02:05 +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 F2E892A88B for ; Wed, 25 Jul 2018 22:02:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EFB406B000C; Wed, 25 Jul 2018 18:01:55 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id EABA36B000D; Wed, 25 Jul 2018 18:01:55 -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 CB4A36B000E; Wed, 25 Jul 2018 18:01:55 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f72.google.com (mail-wm0-f72.google.com [74.125.82.72]) by kanga.kvack.org (Postfix) with ESMTP id 649636B000C for ; Wed, 25 Jul 2018 18:01:55 -0400 (EDT) Received: by mail-wm0-f72.google.com with SMTP id f13-v6so3682577wmb.4 for ; Wed, 25 Jul 2018 15:01:55 -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=Id+mrqjnu26knFarWg2kIgattDnTOoEqy5e1QbH6y3s=; b=XSpmgQbt8fzO9Sm0ZLXt4BoetcdbsEpG8ShWC86QP+RUNIpoiWQb0jK/1qV7zQOUlf 0AP8yyFFRCaABXRtnBSIh54uPQEEPYJsZBbIDfKKi8HiFV0+7fvPL0Hn1YxOzGLewcmz sP+IYu1i5t9479f4iqNy3x6kwpvZihEw77EzuTuWuqB6oZTu9ONfKkAGHIG4zALFcSy8 HZyF+A+5yLGCx7ZU8HuSBJyb4+oYtuppCMcNOCVeYG1QQWXHcSY3fSOh7AeBra5123oY wXKxe3F/oIpXc413aLsbcyslTxLSRnwdle1Ra5Rw0aJwHabHsM2sKFedIgg75xY3/IPQ uFwA== 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: AOUpUlFRnVR5nttmKSxeJKTLPZgSQO0L6ZQ4ODFotVFbMSl8vyAMpjoV 1IFA4wP9UyJuZWQH34bJTz3GzkHI7+WtKYB/rk93Ijle3XonAVsqEbpnTgdJMGZksERwcaGDOEP FcrHygNzC/a1OAJBYI5XaTrd4OXFCDzenMZCE6eRkkfwarzQ+g0hDX4Ab0BUAIfUFtVjZIGVZWy us5XvgZ8imWpVnRtjh8DpfKIfoQsl3ichnNyEnaqgkzoNjW7OgjJdkBg0Bis8WHotE8/VQquKgp ZHb9ta2OCIOXECfYsLMN2Qu1fAtESpxWQxCVDqJ6N7KjCyH5RUONTBYNy/6pKndjKlrFJI0EOS7 GVXrvgS9zStYLmoftC3uXrEHOdd8e0l1omH1FC15VDfoPdw/9XrqypBbD1wRAuVunhQ6YSTRhQ= = X-Received: by 2002:adf:c5d3:: with SMTP id v19-v6mr15940139wrg.169.1532556114979; Wed, 25 Jul 2018 15:01:54 -0700 (PDT) X-Received: by 2002:adf:c5d3:: with SMTP id v19-v6mr15940109wrg.169.1532556114165; Wed, 25 Jul 2018 15:01:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532556114; cv=none; d=google.com; s=arc-20160816; b=mAbYlJNnci71UQ/McZnylM1fCoHznYxLS4rVDZrnv0dtIqe1rm/poZ4xH7uMoazkji OrkEm7vyTF7Yz+J/uutYcWB28WwKLEtHHl3+hSWULb1fTSWFZhkPeS7xYc41+zM5yR9W wyHPQQDGjgk9itasg4SMZUgQq8JhLh2A2ffgp38KUE6VTpiVNTzbkbaS2Lm1JajIkaO0 l/qyJ4JzBXy54k8uPUyHOzChWPJhuGHVVkUbETfZPkTAmNqzm6v0IJYgcY40h2p5gdIH fenAfldhGLHrsMkAyzV0fvwDLKiDB0dQLLqkiCskFNycQJxoycmTtC92gKkXIhIBdQoi SSLA== 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=Id+mrqjnu26knFarWg2kIgattDnTOoEqy5e1QbH6y3s=; b=CRXdC0pGy+KX3fjkZVdb6xhbDi6yCZOHf0df0eANRXR+mJmIjP213RHoFuyrZyV2wb NAXo/LxY+bMatIUc6h8LmvO0nxqCj9KaVBrQs7MhJW0iKumsXMymvdCkE5lG7EO2w4vQ xU8/o1jJBa3QwLSQ+dffcLVk4P9mWN940/nVlZXbwUcxEVEBth+w2Zrzv9OgqnP3a538 WuGId32Bivyo21xY9JQgYnOign795eBWhGsQkrOWkfmjjU14wmW+/xcwYPvo9a67aSp2 T16FyRlkeOCiD6Ljd+cRe6vcss1IvpKMsQ6/V/H9MGEYJJ5wSVj8vFcFh2FfwYf70I/x zW1g== 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 g18-v6sor1449666wmd.76.2018.07.25.15.01.54 for (Google Transport Security); Wed, 25 Jul 2018 15:01:54 -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: AAOMgpdXr7ZpURGDvQ4QrP7r+GbCiIHafp2RLqyBFS+hqwXk2LaB+lf1hP14ke09aY+/SPFKpK4Tfg== X-Received: by 2002:a1c:9e89:: with SMTP id h131-v6mr5450015wme.13.1532556113866; Wed, 25 Jul 2018 15:01:53 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id e204-v6sm5183748wma.8.2018.07.25.15.01.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jul 2018 15:01:53 -0700 (PDT) Received: from d104.suse.de (charybdis-ext.suse.de [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 1E390124367; Thu, 26 Jul 2018 00:01:51 +0200 (CEST) From: osalvador@techadventures.net To: akpm@linux-foundation.org Cc: mhocko@suse.com, vbabka@suse.cz, pasha.tatashin@oracle.com, mgorman@techsingularity.net, aaron.lu@intel.com, iamjoonsoo.kim@lge.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, dan.j.williams@intel.com, Oscar Salvador Subject: [PATCH v3 4/5] mm/page_alloc: Move initialization of node and zones to an own function Date: Thu, 26 Jul 2018 00:01:43 +0200 Message-Id: <20180725220144.11531-5-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180725220144.11531-1-osalvador@techadventures.net> References: <20180725220144.11531-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 Currently, whenever a new node is created/re-used from the memhotplug path, we call free_area_init_node()->free_area_init_core(). But there is some code that we do not really need to run when we are coming from such path. free_area_init_core() performs the following actions: 1) Initializes pgdat internals, such as spinlock, waitqueues and more. 2) Account # nr_all_pages and nr_kernel_pages. These values are used later on when creating hash tables. 3) Account number of managed_pages per zone, substracting dma_reserved and memmap pages. 4) Initializes some fields of the zone structure data 5) Calls init_currently_empty_zone to initialize all the freelists 6) Calls memmap_init to initialize all pages belonging to certain zone When called from memhotplug path, free_area_init_core() only performs actions #1 and #4. Action #2 is pointless as the zones do not have any pages since either the node was freed, or we are re-using it, eitherway all zones belonging to this node should have 0 pages. For the same reason, action #3 results always in manages_pages being 0. Action #5 and #6 are performed later on when onlining the pages: online_pages()->move_pfn_range_to_zone()->init_currently_empty_zone() online_pages()->move_pfn_range_to_zone()->memmap_init_zone() This patch moves the node/zone initializtion to their own function, so it allows us to create a small version of free_area_init_core(next patch), where we only perform: 1) Initialization of pgdat internals, such as spinlock, waitqueues and more 4) Initialization of some fields of the zone structure data This patch only introduces these two functions. Signed-off-by: Oscar Salvador --- mm/page_alloc.c | 50 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 4e84a17a5030..a455dc85da19 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6237,21 +6237,9 @@ static void pgdat_init_kcompactd(struct pglist_data *pgdat) static void pgdat_init_kcompactd(struct pglist_data *pgdat) {} #endif -/* - * Set up the zone data structures: - * - mark all pages reserved - * - mark all memory queues empty - * - clear the memory bitmaps - * - * NOTE: pgdat should get zeroed by caller. - */ -static void __paginginit free_area_init_core(struct pglist_data *pgdat) +static void __paginginit pgdat_init_internals(struct pglist_data *pgdat) { - enum zone_type j; - int nid = pgdat->node_id; - pgdat_resize_init(pgdat); - pgdat_init_numabalancing(pgdat); pgdat_init_split_queue(pgdat); pgdat_init_kcompactd(pgdat); @@ -6262,7 +6250,35 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat) pgdat_page_ext_init(pgdat); spin_lock_init(&pgdat->lru_lock); lruvec_init(node_lruvec(pgdat)); +} + +static void zone_init_internals(struct zone *zone, enum zone_type idx, int nid, + unsigned long remaining_pages) +{ + zone->managed_pages = remaining_pages; + zone_set_nid(zone, nid); + zone->name = zone_names[idx]; + zone->zone_pgdat = NODE_DATA(nid); + spin_lock_init(&zone->lock); + zone_seqlock_init(zone); + zone_pcp_init(zone); +} + +/* + * Set up the zone data structures: + * - mark all pages reserved + * - mark all memory queues empty + * - clear the memory bitmaps + * + * NOTE: pgdat should get zeroed by caller. + * NOTE: this function is only called during early init. + */ +static void __paginginit free_area_init_core(struct pglist_data *pgdat) +{ + enum zone_type j; + int nid = pgdat->node_id; + pgdat_init_internals(pgdat); pgdat->per_cpu_nodestats = &boot_nodestats; for (j = 0; j < MAX_NR_ZONES; j++) { @@ -6310,13 +6326,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat) * when the bootmem allocator frees pages into the buddy system. * And all highmem pages will be managed by the buddy system. */ - zone->managed_pages = freesize; - zone_set_nid(zone, nid); - zone->name = zone_names[j]; - zone->zone_pgdat = pgdat; - spin_lock_init(&zone->lock); - zone_seqlock_init(zone); - zone_pcp_init(zone); + zone_init_internals(zone, j, nid, freesize); if (!size) continue;