From patchwork Wed Aug 1 12:23:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10552221 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 D302113B8 for ; Wed, 1 Aug 2018 12:24:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB1872AB72 for ; Wed, 1 Aug 2018 12:24:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AEA772AB8A; Wed, 1 Aug 2018 12:24:01 +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 42E982AB72 for ; Wed, 1 Aug 2018 12:24:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EC0016B026A; Wed, 1 Aug 2018 08:23:59 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DD16D6B0006; Wed, 1 Aug 2018 08:23:59 -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 C27C36B0266; Wed, 1 Aug 2018 08:23:59 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f69.google.com (mail-wm0-f69.google.com [74.125.82.69]) by kanga.kvack.org (Postfix) with ESMTP id 643F96B0005 for ; Wed, 1 Aug 2018 08:23:59 -0400 (EDT) Received: by mail-wm0-f69.google.com with SMTP id p3-v6so3585800wmc.7 for ; Wed, 01 Aug 2018 05:23:59 -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=D64Mkwf8KbDFNcAAymsFtzvDXY06XAPrzkCh16O3amM=; b=ghRx/ivrFKYjCFLKNFT6rQv6tJM3pIv7nV3Ki/M8K+5mutAVf1EX/o5WlqzulcrYWw zCY3Rky9tp5eYNE5y1Qop4nHScSZhrIRhASDMRa0ur9GFBGbVNaw73DhT/jpGsw3p/i4 k/AlMkmfIjwW2jKbZzprZ0CojYWkIYfBeNsvxkBPlHw1HxIuPO8iKI8c204X0JmCRlsV kfuSDeXQ/CjGIvivw1SqUxbK7N2y7z+xIXUnrz1kRz3Q/upAAPQ6gprh+HGWADMp7wjZ eFWqAm1QBK22Pme2twjy9MF3MP7r+P0Ugk6wQCOk00mp8YPu1ROyFNpDF2n/ikUB/xGC Nx9w== 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: AOUpUlFpKyMzTcIFac1WtXq/iK1iV2b6xmGhKeDcZ51IRxOujpnefw/v /sJPMO54BVomgvOcb6yl8WM31Tg/Jzwph//VLnUq1sWhiu2+Zk50HiBrIimAT6cW3G/jNPqlqcN ZoHysEHzHCbJ0qU82xkPtgziy1lEvTUjTr7eDA0/Oia4ITVBiiLNjemWZ6sIfND8WzmmmPehPCm ut3mTjYElV21XcPowFRdr3qoGRgYWHIvy0Z9LjXq6Mf4upxD/tA5fXQiz8xbqwMaUrYH2EqS3SZ /WvVv6ZNYqa4Fi5QJZelIMFuZIjD00J37IFsSvexoofKS+4TodZ+UzGiVRN8pdPLE62tObZ7Pr3 dXTsQgEexUBquIcl6+UwjMsjVOL2KP3WszU3CeLimKvkNz4NTLI4ArKtaOVAJ1IMyZNHJToCbA= = X-Received: by 2002:adf:e3c5:: with SMTP id k5-v6mr24627849wrm.94.1533126238972; Wed, 01 Aug 2018 05:23:58 -0700 (PDT) X-Received: by 2002:adf:e3c5:: with SMTP id k5-v6mr24627785wrm.94.1533126236841; Wed, 01 Aug 2018 05:23:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533126236; cv=none; d=google.com; s=arc-20160816; b=jLs4ArBFvoWpmorDT7u6X4dTbvU5B3IWP2Oe2IBnxgUrwwv4bY8YzwNbzomd+Ef0+0 mh9fsLemves/RfucJvOtJQBA8HkbjFkb+kTdhhXHDI4eiCerc1/NS1RoGhvSoMP4LEEG Aj2N1CNwtT3aLaU/YW0QA/LCib8SWjfTnCtCmz3NxhhukmyOKaIWaiXbSQYkCQW6hJ4/ SRaykm4W/N7vGQqvzsqyzlvEMyzhEQmc0X+Qsr9K/veFYCnETAGHLDRQOpwHtpc6xMh5 CRIcop+sg85QsCfi6kRKDXuAjk9IuIm/fxBPxzqhOL55BVZqMtsZxRgF0EqtWW7nxirC ITew== 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=D64Mkwf8KbDFNcAAymsFtzvDXY06XAPrzkCh16O3amM=; b=UyYPTDoYT8lh3F7dKoKxOdCpo8iNxljoEEk7h13JvS5sKD5YsBS1r6JQRfo+k+9SKz byT5aOrbG3NcbyqhRLkb6azAfq8U3HXnjfrzI9NF+J3OIkGn/keaOvatNnWpwjumK9ii E45q1iKt+GxRLV0p2TeeeGqR/eP33+kJHuBC4HWvC7pQcJMnu2zyKf5kacBK+m5zP4us CscLUpp+qCAxT6FI2FrL6CpHDktnNGDzr8v0QVoRI+yfHv+M1NkLDo/ESBlEazAYm8tc HhFvQ3bMhQQmahIwFi4kU32bJaip1HDekutUzxF1VRg4SvLAxiVLhqs03+wN6yuKakHx M7kQ== 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 s4-v6sor7359511wrp.65.2018.08.01.05.23.56 for (Google Transport Security); Wed, 01 Aug 2018 05:23:56 -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: AAOMgpdjFDxaWWdeTyt7e+4z4+awOFIx6ROpYIPfHwG64sOC/bXlHEdM2SQz1BeK8g3QD34PLwHdIw== X-Received: by 2002:adf:a541:: with SMTP id j1-v6mr25580112wrb.155.1533126236593; Wed, 01 Aug 2018 05:23:56 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id d42-v6sm2445508wma.0.2018.08.01.05.23.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 05:23:56 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id B222712453F; Wed, 1 Aug 2018 14:23:54 +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, david@redhat.com, Oscar Salvador Subject: [PATCH v6 1/5] mm/page_alloc: Move ifdefery out of free_area_init_core Date: Wed, 1 Aug 2018 14:23:44 +0200 Message-Id: <20180801122348.21588-2-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180801122348.21588-1-osalvador@techadventures.net> References: <20180801122348.21588-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 Moving the #ifdefs out of the function makes it easier to follow. Signed-off-by: Oscar Salvador Acked-by: Michal Hocko Reviewed-by: Pavel Tatashin Acked-by: Vlastimil Babka --- mm/page_alloc.c | 50 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 02e4b84038f8..f5e36713c5d4 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6196,6 +6196,37 @@ static unsigned long __paginginit calc_memmap_size(unsigned long spanned_pages, return PAGE_ALIGN(pages * sizeof(struct page)) >> PAGE_SHIFT; } +#ifdef CONFIG_NUMA_BALANCING +static void pgdat_init_numabalancing(struct pglist_data *pgdat) +{ + spin_lock_init(&pgdat->numabalancing_migrate_lock); + pgdat->numabalancing_migrate_nr_pages = 0; + pgdat->numabalancing_migrate_next_window = jiffies; +} +#else +static void pgdat_init_numabalancing(struct pglist_data *pgdat) {} +#endif + +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +static void pgdat_init_split_queue(struct pglist_data *pgdat) +{ + spin_lock_init(&pgdat->split_queue_lock); + INIT_LIST_HEAD(&pgdat->split_queue); + pgdat->split_queue_len = 0; +} +#else +static void pgdat_init_split_queue(struct pglist_data *pgdat) {} +#endif + +#ifdef CONFIG_COMPACTION +static void pgdat_init_kcompactd(struct pglist_data *pgdat) +{ + init_waitqueue_head(&pgdat->kcompactd_wait); +} +#else +static void pgdat_init_kcompactd(struct pglist_data *pgdat) {} +#endif + /* * Set up the zone data structures: * - mark all pages reserved @@ -6210,21 +6241,14 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat) int nid = pgdat->node_id; pgdat_resize_init(pgdat); -#ifdef CONFIG_NUMA_BALANCING - spin_lock_init(&pgdat->numabalancing_migrate_lock); - pgdat->numabalancing_migrate_nr_pages = 0; - pgdat->numabalancing_migrate_next_window = jiffies; -#endif -#ifdef CONFIG_TRANSPARENT_HUGEPAGE - spin_lock_init(&pgdat->split_queue_lock); - INIT_LIST_HEAD(&pgdat->split_queue); - pgdat->split_queue_len = 0; -#endif + + pgdat_init_numabalancing(pgdat); + pgdat_init_split_queue(pgdat); + pgdat_init_kcompactd(pgdat); + init_waitqueue_head(&pgdat->kswapd_wait); init_waitqueue_head(&pgdat->pfmemalloc_wait); -#ifdef CONFIG_COMPACTION - init_waitqueue_head(&pgdat->kcompactd_wait); -#endif + pgdat_page_ext_init(pgdat); spin_lock_init(&pgdat->lru_lock); lruvec_init(node_lruvec(pgdat)); From patchwork Wed Aug 1 12:23:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10552227 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 7FEFB13BB for ; Wed, 1 Aug 2018 12:24:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F16B2AB77 for ; Wed, 1 Aug 2018 12:24:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62FB72ABE6; Wed, 1 Aug 2018 12:24:09 +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 C78BE2AB77 for ; Wed, 1 Aug 2018 12:24:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 801B56B0007; Wed, 1 Aug 2018 08:24:00 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 744F36B026B; Wed, 1 Aug 2018 08:24:00 -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 40E056B0006; Wed, 1 Aug 2018 08:24:00 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f70.google.com (mail-wm0-f70.google.com [74.125.82.70]) by kanga.kvack.org (Postfix) with ESMTP id BE71C6B0008 for ; Wed, 1 Aug 2018 08:23:59 -0400 (EDT) Received: by mail-wm0-f70.google.com with SMTP id q24-v6so3590601wmq.9 for ; Wed, 01 Aug 2018 05:23:59 -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=ornNtZGLjdDbInVqSj+nx7qc7v1pmCahLcgawCtYU7A=; b=TNhIDlwFjtLmNS3rwQCoHl1u2i7yqpOFL4R5CPslssrKDIFxuQ7sqwH52c8UfdhmDk sQmHaRg2xlxODm8C5LPyopHlPEViH5M1Pf5AYR/TCWVntPquBMbG1ixBdpzihsd0uD5G hvkZs9q/yfnh4JTKabap1prkJjHVZWKnObrUfeOVe+FBuDFnL5H3rStT65EMVDHzc++7 /qJgb7xz5JIrBcEJW1fprGTeYnaQhmweK2jbsHOWMkWMfG0MBmhnRiQQu5vHhR82OoMO rPlfp3FiWm5UyX9prYTj4qTqyEUZoU4cPo+8wIsAdIwvhd9CO7kHuDTMUotbpXD49ZKq edkw== 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: AOUpUlGCfXb6BIk1c5YV2Zdzhy/K+5lyeGLF5R8hcW+yq66kkKg+1L7B 2JuF2LplNQFgd7vyMzA5lNqHLI7Cz5y048oY+H8vb+eCWkZW6esSB8qxBdKOrWB3xsNERqpLNp7 0jd235ArlTIVRozif9uHZF+5OrDil6gMTbrXFnIf+VyFq9b7Jt85UudNh7z7xJSjQqQx+j+6cBr fwFvGVG2H0u/ZlV2oP8RJ/VrlGndPBgP9JB8irN6M66vYSOjkDnB8FGfDdcSKJK9wZabfGekaXb zjweilrUiROgVNpNXeNGrzA4mfDMMgh7pNKxRqSd4GEV+SnnmZs+hERj2wg3fvMc49JSCeQq0OY fTQBxrxOB+mZJV1wpcjNZsPtsdQZgeGOfYrTDYRzpMbbq1VCu22BU1n77TOBZAEfRKo81aDs4Q= = X-Received: by 2002:adf:ffc7:: with SMTP id x7-v6mr24745870wrs.137.1533126239263; Wed, 01 Aug 2018 05:23:59 -0700 (PDT) X-Received: by 2002:adf:ffc7:: with SMTP id x7-v6mr24745818wrs.137.1533126238048; Wed, 01 Aug 2018 05:23:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533126238; cv=none; d=google.com; s=arc-20160816; b=U5YAx7RCtmPAqSSCWSRZOzqrWv7jixqt5e/vz69UXrRrWdaaFWgP7P2YLHos3DmQA9 pPOu0m6ZnTFap4oKCTo8jKcx01eO0ZYdrW0ikmt3NTR00mPLc73kiHDh1MNQiX7LtnTs qh95+B9ySrB2rycZkeBooGJ2WAvMavd+gxS0GTgXXeEpCkgRNpakOH8vnRwlIy7ykqRE RgX5BtHlIKFrTUPqn79YNANUVo73MYOucNkP/HweWJYvIyTiVzXMeY6y0HJl9dZ3UpLF mPFo41wTdVdX/QSK/ePf1cC6k0hhYDVzp6WWV5w2kN1nVqrhcTSAekqiYyrXVI200he4 eOuQ== 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=ornNtZGLjdDbInVqSj+nx7qc7v1pmCahLcgawCtYU7A=; b=R/RjjXa+9eQQ3CZQCG0IfoSzpMIWXdI15iz+Xe6VTgD/HKKnJwmLBOVs+rmVv5OOl5 112vbfhkwC2XNry9lqE/m9uiNZdiE5adZgGipbimwHLYwxm+jPqq2Ii2f0/ewFinChrC YTnaDKCHAY0SuFSTCGZmfW5e551uzLOxc2Sm5SHUMY86OkyYb964KkUYM3RUEB9pufVk nkcXEEHA8hAsSy6wYHssMdHjMv0tt54cy8C9UU0iaYBpKwo769R50y8KiN8MkfOLGuPt ITBlZHRoPa2/hoUXUuFEZvrY6q+8UUBie/n9WtAHsHU3YhJyTGlZ228vZnou9On6XKMW +IfA== 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 203-v6sor1461572wme.25.2018.08.01.05.23.57 for (Google Transport Security); Wed, 01 Aug 2018 05:23:58 -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: AAOMgpdADN54w3AEgylfn2uo+tjdYllrnKQ3Ko8nlYwAujih9Xn79Ffrw5H1PySEQPrATJl0SRFBpg== X-Received: by 2002:a1c:8313:: with SMTP id f19-v6mr2493425wmd.144.1533126237749; Wed, 01 Aug 2018 05:23:57 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id a14-v6sm4891640wmb.44.2018.08.01.05.23.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 05:23:56 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id EFDAD124540; Wed, 1 Aug 2018 14:23:54 +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, david@redhat.com, Oscar Salvador Subject: [PATCH v6 2/5] mm: access zone->node via zone_to_nid() and zone_set_nid() Date: Wed, 1 Aug 2018 14:23:45 +0200 Message-Id: <20180801122348.21588-3-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180801122348.21588-1-osalvador@techadventures.net> References: <20180801122348.21588-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: Pavel Tatashin zone->node is configured only when CONFIG_NUMA=y, so it is a good idea to have inline functions to access this field in order to avoid ifdef's in c files. Signed-off-by: Pavel Tatashin Signed-off-by: Oscar Salvador Reviewed-by: Oscar Salvador Acked-by: Michal Hocko Acked-by: Vlastimil Babka --- include/linux/mm.h | 9 --------- include/linux/mmzone.h | 26 ++++++++++++++++++++------ mm/mempolicy.c | 4 ++-- mm/mm_init.c | 9 ++------- mm/page_alloc.c | 10 ++++------ 5 files changed, 28 insertions(+), 30 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 644c6329336b..70edbc3f21a8 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -957,15 +957,6 @@ static inline int page_zone_id(struct page *page) return (page->flags >> ZONEID_PGSHIFT) & ZONEID_MASK; } -static inline int zone_to_nid(struct zone *zone) -{ -#ifdef CONFIG_NUMA - return zone->node; -#else - return 0; -#endif -} - #ifdef NODE_NOT_IN_PAGE_FLAGS extern int page_to_nid(const struct page *page); #else diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 83b1d11e90eb..805b990b27ab 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -841,6 +841,25 @@ static inline bool populated_zone(struct zone *zone) return zone->present_pages; } +#ifdef CONFIG_NUMA +static inline int zone_to_nid(struct zone *zone) +{ + return zone->node; +} + +static inline void zone_set_nid(struct zone *zone, int nid) +{ + zone->node = nid; +} +#else +static inline int zone_to_nid(struct zone *zone) +{ + return 0; +} + +static inline void zone_set_nid(struct zone *zone, int nid) {} +#endif + extern int movable_zone; #ifdef CONFIG_HIGHMEM @@ -956,12 +975,7 @@ static inline int zonelist_zone_idx(struct zoneref *zoneref) static inline int zonelist_node_idx(struct zoneref *zoneref) { -#ifdef CONFIG_NUMA - /* zone_to_nid not available in this context */ - return zoneref->zone->node; -#else - return 0; -#endif /* CONFIG_NUMA */ + return zone_to_nid(zoneref->zone); } struct zoneref *__next_zones_zonelist(struct zoneref *z, diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 4861ba738d6f..da858f794eb6 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1784,7 +1784,7 @@ unsigned int mempolicy_slab_node(void) zonelist = &NODE_DATA(node)->node_zonelists[ZONELIST_FALLBACK]; z = first_zones_zonelist(zonelist, highest_zoneidx, &policy->v.nodes); - return z->zone ? z->zone->node : node; + return z->zone ? zone_to_nid(z->zone) : node; } default: @@ -2326,7 +2326,7 @@ int mpol_misplaced(struct page *page, struct vm_area_struct *vma, unsigned long node_zonelist(numa_node_id(), GFP_HIGHUSER), gfp_zone(GFP_HIGHUSER), &pol->v.nodes); - polnid = z->zone->node; + polnid = zone_to_nid(z->zone); break; default: diff --git a/mm/mm_init.c b/mm/mm_init.c index 5b72266b4b03..6838a530789b 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -53,13 +53,8 @@ void __init mminit_verify_zonelist(void) zone->name); /* Iterate the zonelist */ - for_each_zone_zonelist(zone, z, zonelist, zoneid) { -#ifdef CONFIG_NUMA - pr_cont("%d:%s ", zone->node, zone->name); -#else - pr_cont("0:%s ", zone->name); -#endif /* CONFIG_NUMA */ - } + for_each_zone_zonelist(zone, z, zonelist, zoneid) + pr_cont("%d:%s ", zone_to_nid(zone), zone->name); pr_cont("\n"); } } diff --git a/mm/page_alloc.c b/mm/page_alloc.c index f5e36713c5d4..295977c6acae 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2915,10 +2915,10 @@ static inline void zone_statistics(struct zone *preferred_zone, struct zone *z) if (!static_branch_likely(&vm_numa_stat_key)) return; - if (z->node != numa_node_id()) + if (zone_to_nid(z) != numa_node_id()) local_stat = NUMA_OTHER; - if (z->node == preferred_zone->node) + if (zone_to_nid(z) == zone_to_nid(preferred_zone)) __inc_numa_state(z, NUMA_HIT); else { __inc_numa_state(z, NUMA_MISS); @@ -5284,7 +5284,7 @@ int local_memory_node(int node) z = first_zones_zonelist(node_zonelist(node, GFP_KERNEL), gfp_zone(GFP_KERNEL), NULL); - return z->zone->node; + return zone_to_nid(z->zone); } #endif @@ -6301,9 +6301,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat) * And all highmem pages will be managed by the buddy system. */ zone->managed_pages = freesize; -#ifdef CONFIG_NUMA - zone->node = nid; -#endif + zone_set_nid(zone, nid); zone->name = zone_names[j]; zone->zone_pgdat = pgdat; spin_lock_init(&zone->lock); From patchwork Wed Aug 1 12:23:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10552225 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 D590213BB for ; Wed, 1 Aug 2018 12:24:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C60282AB72 for ; Wed, 1 Aug 2018 12:24:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA56F2AB8A; Wed, 1 Aug 2018 12:24:06 +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 32EE62AB72 for ; Wed, 1 Aug 2018 12:24:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 557676B0008; Wed, 1 Aug 2018 08:24:00 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 287676B0266; Wed, 1 Aug 2018 08:24:00 -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 EBC1A6B0005; Wed, 1 Aug 2018 08:23:59 -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 8738F6B0007 for ; Wed, 1 Aug 2018 08:23:59 -0400 (EDT) Received: by mail-wr1-f72.google.com with SMTP id d1-v6so14483794wrr.4 for ; Wed, 01 Aug 2018 05:23:59 -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=jEl6v+KhyseIxz3P6IpGKnaa00NRWn3MiUa39SO2/ao=; b=ijCM8Rausqh5HG72mzHOunZkt16C6GYNYWaxazSf0UXIVNod8jvLr7B0/WwtVF373f Ez0wZx7jQk90kMQjYcK2EL1SmVct86lOWfamkxIsPe6Dd0oUpOzijDp08omlW3wQQcV7 rfZJW+4a58TbST4BRyY35kZ2LLm+ioYZzbyqo3KDj1n27Qy9N2VhBjxk0YVHo7CVeTh+ Z2Xhlx+rTqngtzLap7MT3v0EeGPJz5R0FG3vTF7C8TaDqo6OqP6B1JW8D8wjrlvY5//y jKUTY8E0MlItE9F9LZV4iun/ervsinjrS7VYQSw6dUe/qXAU3rLEWs80hS/sgX7fABXf SzCg== 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: AOUpUlGRSuye6iEXwgAnWMZHhfMlflHvAgIEmfpO+UmJs6aVed6V6ZC/ d2uewZ73aUD8VfTsrpIpa+eQK/FX8SNUwK1CxWOxpy2aLbqj2QyNgpnCOCQgRTcplNWY7eU1Zdp xJNqwNa+RVYrqxMLTCtWR0TRy6oU1+NCQMl1uM5e9cBmc183SyqD5wd5+Wvc49TEH+MQcGRg7ib ovjH9306KtrtLZ//4YdYvv3zXIvcv7MGyGnJ8AlG1Rodg/125nQhxdyXWX+U+77NwlnflZJg4lv YvRf81LJtygRvnQ1sWCzga12a64ciTqtaCpKE/f3PlKF19cVRCu/UuiB6Lx7/GvAvs+paU2TC6c hiCPN+N7StxFBnJd9jpf7KcjK+FXLXZihLw9sbXpiTBvHk+Ufc7t+VJQ6KOKOnlRaPNjlpS8cQ= = X-Received: by 2002:adf:f60a:: with SMTP id t10-v6mr22291795wrp.170.1533126239026; Wed, 01 Aug 2018 05:23:59 -0700 (PDT) X-Received: by 2002:adf:f60a:: with SMTP id t10-v6mr22291742wrp.170.1533126237447; Wed, 01 Aug 2018 05:23:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533126237; cv=none; d=google.com; s=arc-20160816; b=zgLzVjHi/iDkyBq8ueUKsuZCrXS1vHD8TzjvcVcx1A870ig3J8a/4Ddj40Ytq0c3Hr CGU1fBE/6MHzztHluf0KUQYlPGCUi6B1CiInd3qpsgm0FQX4djaHrcUzlm8FFKKLib2K Mf7bLeZ0B7pQpOr01YbRCC4/SaCDg9zb7ktMT4I/7a4U5eIyI+yWovQWNE9MpsxKwfcn 3oPx2rJwNV2g4DzZ4rDK7uso6YCZ1rzlMxhnXvuTRFLkc/DwzTOZ9l98jHukuerQH9NL LNB7aEZUukg/G5R8WLgVMZ5UefPXRELi4tY/4R7u1t6ToB1xRCXYB1rl3tRCqSnsZHXJ /0xw== 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=jEl6v+KhyseIxz3P6IpGKnaa00NRWn3MiUa39SO2/ao=; b=bIxYoURT36uN7UZAZ2U487WNFhGwmQK3HWOFDRPNY9a9XKpFWntD7nTlB86i5OJoDF 7a1IskcJL4RVYMpnW6r+7rigbqNghX/PKE/FLDHDUfhH1G+HCKTJSVGspkRnZH7YxQRG TGVmrR/WbDf7N1WLnXuhjSGikBsu1tLU46hONMOp9Xcssc0CpgAKX0S9s8upNDstcL2/ pTGKqbuFuRz0rea/8qxIINCTYs6ZlMKWgDpjZqqqJXelVS/JlTyNVhzuV+H8syCw6271 WzvUXX0cQBjLC40pUEpBzp6K/rgRJvfau/vMBtEAczCGt4QZfA9u5m6YBOTQ8sjkdZLc 3SaA== 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 l138-v6sor1396043wma.65.2018.08.01.05.23.57 for (Google Transport Security); Wed, 01 Aug 2018 05:23:57 -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: AAOMgpeStQvSCKJlejEJI91o5Pl/98PLDSxrNtJvKLEtlgvJXumWAN9tFkf8nNvnJvPGM/1zxMm7nA== X-Received: by 2002:a1c:b609:: with SMTP id g9-v6mr2451453wmf.73.1533126237152; Wed, 01 Aug 2018 05:23:57 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id j3-v6sm24749220wrt.70.2018.08.01.05.23.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 05:23:56 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 39549124541; Wed, 1 Aug 2018 14:23:55 +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, david@redhat.com Subject: [PATCH v6 3/5] mm: remove __paginginit Date: Wed, 1 Aug 2018 14:23:46 +0200 Message-Id: <20180801122348.21588-4-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180801122348.21588-1-osalvador@techadventures.net> References: <20180801122348.21588-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: Pavel Tatashin __paginginit is the same thing as __meminit except for platforms without sparsemem, there it is defined as __init. Remove __paginginit and use __meminit. Use __ref in one single function that merges __meminit and __init sections: setup_usemap(). Signed-off-by: Pavel Tatashin Reviewed-by: Oscar Salvador --- mm/internal.h | 12 ------------ mm/page_alloc.c | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 33c22754d282..87256ae1bef8 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -389,18 +389,6 @@ static inline struct page *mem_map_next(struct page *iter, return iter + 1; } -/* - * FLATMEM and DISCONTIGMEM configurations use alloc_bootmem_node, - * so all functions starting at paging_init should be marked __init - * in those cases. SPARSEMEM, however, allows for memory hotplug, - * and alloc_bootmem_node is not used. - */ -#ifdef CONFIG_SPARSEMEM -#define __paginginit __meminit -#else -#define __paginginit __init -#endif - /* Memory initialisation debug and verification */ enum mminit_level { MMINIT_WARNING, diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 295977c6acae..607f98f8816d 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6122,7 +6122,7 @@ static unsigned long __init usemap_size(unsigned long zone_start_pfn, unsigned l return usemapsize / 8; } -static void __init setup_usemap(struct pglist_data *pgdat, +static void __ref setup_usemap(struct pglist_data *pgdat, struct zone *zone, unsigned long zone_start_pfn, unsigned long zonesize) @@ -6142,7 +6142,7 @@ static inline void setup_usemap(struct pglist_data *pgdat, struct zone *zone, #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE /* Initialise the number of pages represented by NR_PAGEBLOCK_BITS */ -void __paginginit set_pageblock_order(void) +void __meminit set_pageblock_order(void) { unsigned int order; @@ -6170,14 +6170,14 @@ void __paginginit set_pageblock_order(void) * include/linux/pageblock-flags.h for the values of pageblock_order based on * the kernel config */ -void __paginginit set_pageblock_order(void) +void __meminit set_pageblock_order(void) { } #endif /* CONFIG_HUGETLB_PAGE_SIZE_VARIABLE */ -static unsigned long __paginginit calc_memmap_size(unsigned long spanned_pages, - unsigned long present_pages) +static unsigned long __meminit calc_memmap_size(unsigned long spanned_pages, + unsigned long present_pages) { unsigned long pages = spanned_pages; @@ -6235,7 +6235,7 @@ static void pgdat_init_kcompactd(struct pglist_data *pgdat) {} * * NOTE: pgdat should get zeroed by caller. */ -static void __paginginit free_area_init_core(struct pglist_data *pgdat) +static void __meminit free_area_init_core(struct pglist_data *pgdat) { enum zone_type j; int nid = pgdat->node_id; @@ -6366,8 +6366,9 @@ 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 */ -void __paginginit free_area_init_node(int nid, unsigned long *zones_size, - unsigned long node_start_pfn, unsigned long *zholes_size) +void __meminit free_area_init_node(int nid, unsigned long *zones_size, + unsigned long node_start_pfn, + unsigned long *zholes_size) { pg_data_t *pgdat = NODE_DATA(nid); unsigned long start_pfn = 0; @@ -6412,7 +6413,7 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size, * may be accessed (for example page_to_pfn() on some configuration accesses * flags). We must explicitly zero those struct pages. */ -void __paginginit zero_resv_unavail(void) +void __meminit zero_resv_unavail(void) { phys_addr_t start, end; unsigned long pfn; From patchwork Wed Aug 1 12:23:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10552229 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 317E413B8 for ; Wed, 1 Aug 2018 12:24:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 202A72AB8A for ; Wed, 1 Aug 2018 12:24:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 145B02AC1E; Wed, 1 Aug 2018 12:24:12 +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 9EAB42AB8A for ; Wed, 1 Aug 2018 12:24:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A15C86B0006; Wed, 1 Aug 2018 08:24:00 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 98D906B0266; Wed, 1 Aug 2018 08:24:00 -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 793D86B0006; Wed, 1 Aug 2018 08:24:00 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f70.google.com (mail-wm0-f70.google.com [74.125.82.70]) by kanga.kvack.org (Postfix) with ESMTP id 0ACFA6B0007 for ; Wed, 1 Aug 2018 08:24:00 -0400 (EDT) Received: by mail-wm0-f70.google.com with SMTP id y13-v6so3620652wma.1 for ; Wed, 01 Aug 2018 05:23:59 -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=oO/r0b2f7XB/e6iVHlV69GT6OlFJSDIymKWsErYI290=; b=uh6VpsSDw8azc7b0ZuNHQUNdUq06hbY6kwOtn6dB2JH/UHOVrYysiPOUVcMnqFrxy6 bhwVirLB+djzLnhQiZhZ601qQhrRE1eM1Sr5sLPLfou8Y61+2rb/816yOTIIuCAka5c+ C6JCrWFWxq604rgdFzHxuRMfxJK+Fn35Pp5H9L7ego0oFerbyv+5g4o8/QA4aIg27xP8 1CWiR47B7yR7L2gICDZ9YJoh1jHSV8FDtyeIOpbQExBH5CFKXfM5ExBc+MLJ8GO8nXgm jNyy5Kfrx0puT5uKq/UQ0GdZ40WcjMCqGcLAF77QqT23CqZWg7kVmbV1A9c87loGxAnV 2oPQ== 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: AOUpUlHRN5axovSm73bTgla4DwHcWeCUFe4kQ6L9No33Bf9co+EZPGjw v9sQ6/FjvInalva/cyLLbTJ2ns22Q8/eKI+E09DviM0DEP6nHXBgfwaNdTRkjhBhZLpMnK+N1Ee xopO8Jaf/cPpvpnm8ts8hhEpFYmWNl8TPdj1nQJsHewC9qdQT8Uec+/ofePsxsNP9zNcj6qLtHx VWCoNAH3zLBP0W/CnOE+P+EeeAi5807j56LGjza+Z+fSUUlsVe7iJeHZ/xA+wniHZ8JDAlZz/ek 0eSvDEoL3Ruf43eM7yeaqzm8R9coseR9IfAcKQ7OKwVowG6gfBir5vApHpIBxPjSPg7YVRCBWxV RhTUSltoTgwGirHVmcMVg661AB0Ly3uiDV/UuFWw2/snWZFIyxKljldln7if2YC65FmeUrSdlA= = X-Received: by 2002:a1c:c3c4:: with SMTP id t187-v6mr2727254wmf.123.1533126239596; Wed, 01 Aug 2018 05:23:59 -0700 (PDT) X-Received: by 2002:a1c:c3c4:: with SMTP id t187-v6mr2727219wmf.123.1533126238718; Wed, 01 Aug 2018 05:23:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533126238; cv=none; d=google.com; s=arc-20160816; b=t/8DWRvB9LhJqfGesawcvwrjoE9aE7wlINUO6uCpYl3zmyF2jWqSl/q7pQGPZAVvq0 BLXIygWMmubk/6O6JhxZp8BGrrDhSnoOVaPOKwLY9mmx9B9NIqDFrk0sqQDLCsa5U0+R bXuAY1E7SdBJkOVltkXs0a3p2qMxmdoPkfRujJmsjZLbh2loVxfbEX5tDLUuV+3I5Vly PDSu5tvk54n/eZKvjLK5YR9CEL2eAod7tX6t8ETt7Z1j4/MDfp/fv0GaK2pM811iuQA+ fmpHqavxN1hnZcNY3B7+jRFYMCIqvmrW7SqMVSEIaGCVVPXDIoBOWxLlh97I+cgx3oVi E6ug== 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=oO/r0b2f7XB/e6iVHlV69GT6OlFJSDIymKWsErYI290=; b=VjCyMmDW2VeVSwNbgdSExQU0ChFy7Cr/LZLCRMwX00PSJomqcFZWNwez11SD/0QXzm R5HvoENs9tNhswXqDb52A8ay/ZM4XnBFn2V+fk5rmCqquyjDAhEsaJKVTcCevxtv/WpH ysl2eVsSYH0rpXPHGqdP2nx/hQZVFISIrNZqJ8wU+pWDStQULzk1XUHTN7pgBBgWwRHx ZR3jBTD1Op4M3QX44YUAwqns5b6/wRTlXmP+Il9WzKMOPIKisvpUAdNvw4HhznQmI4s+ 6leT8tblqkG3R8sQNz3wIESpyNUGjSSIEscaAWcAcxtlmcpfoKdhMrhlgVmZ9zsF+zU3 z9ug== 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 l138-v6sor1396053wma.65.2018.08.01.05.23.58 for (Google Transport Security); Wed, 01 Aug 2018 05:23:58 -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: AAOMgpdwKtW4RSPjIIzre19SBdCLL2SBkcN3WtX94xVqaMazVDQ3gARceeTHShFhQBhk8mRG+CMKUg== X-Received: by 2002:a1c:4d16:: with SMTP id o22-v6mr2506449wmh.49.1533126238433; Wed, 01 Aug 2018 05:23:58 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id l16-v6sm1090486wmc.38.2018.08.01.05.23.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 05:23:56 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 73865124542; Wed, 1 Aug 2018 14:23:55 +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, david@redhat.com, Oscar Salvador Subject: [PATCH v6 4/5] mm/page_alloc: Inline function to handle CONFIG_DEFERRED_STRUCT_PAGE_INIT Date: Wed, 1 Aug 2018 14:23:47 +0200 Message-Id: <20180801122348.21588-5-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180801122348.21588-1-osalvador@techadventures.net> References: <20180801122348.21588-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 Let us move the code between CONFIG_DEFERRED_STRUCT_PAGE_INIT to an inline function. Not having an ifdef in the function makes the code more readable. Signed-off-by: Oscar Salvador Acked-by: Michal Hocko Reviewed-by: Pavel Tatashin Acked-by: Vlastimil Babka --- mm/page_alloc.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 607f98f8816d..56ee8c029759 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6366,6 +6366,22 @@ 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 inline 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 inline void pgdat_set_deferred_range(pg_data_t *pgdat) {} +#endif + void __meminit free_area_init_node(int nid, unsigned long *zones_size, unsigned long node_start_pfn, unsigned long *zholes_size) @@ -6392,16 +6408,8 @@ void __meminit free_area_init_node(int nid, unsigned long *zones_size, zones_size, zholes_size); alloc_node_mem_map(pgdat); + pgdat_set_deferred_range(pgdat); -#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); } From patchwork Wed Aug 1 12:23:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10552231 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 912DB13BB for ; Wed, 1 Aug 2018 12:24:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F3702AB77 for ; Wed, 1 Aug 2018 12:24:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71E4D2ABE6; Wed, 1 Aug 2018 12:24:15 +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 76DCC2AB77 for ; Wed, 1 Aug 2018 12:24:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 91E426B0010; Wed, 1 Aug 2018 08:24:01 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 82BC36B0266; Wed, 1 Aug 2018 08:24:01 -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 6CD0E6B0269; Wed, 1 Aug 2018 08:24:01 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by kanga.kvack.org (Postfix) with ESMTP id F3C836B0010 for ; Wed, 1 Aug 2018 08:24:00 -0400 (EDT) Received: by mail-wr1-f69.google.com with SMTP id k15-v6so14420630wrq.1 for ; Wed, 01 Aug 2018 05:24:00 -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=2IJV0Bsp7d2bZQN1MM9VgazQPVFDOqJ3IbNa35la5Is=; b=oWS1Wp81ytGCp/ySCDeNGIvEEdaNTJ3SuPAi0dsk6E1silS6G1Cjwct6o3Odr4o1zf /3NPkm04ykTduXj0WUBKoceAfYjRA4g3wrrmQfRHueveQdKz9CZ5F1qffxAj8rOlOVCX Kc5NjkfCO4DuRadkfgP5W1SLZrUmypKtLeWNNAyW2vMTqn6eBYMRSNpz/oh5OjwTqrJx ZpsW1/zBXF6gpDiu1w9dMbK9jrqZgwu+NF7uxSvre07OYEWLXZFr1D3HN2Moqq42nHkr sETRW7Pe3Qw1dKsIkGCSRA8HDJTFfzkcpXXNJybjwUEk10X7VDO2m5/tKUXrXwa+urWW Hb9w== 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: AOUpUlFDyasDFZxZXfh6xrHIA6FEIx5m3XKa0iZaXYxTzVaEMS8n6cGe z6RnFajedqhGoCpGO5tak/WztQvtSZiwFCrSuobjHbmbigsXh6l5Rndqc5sAMqOdPiYyonYdgZf JSV46xI4DMMw6oDnT2UnRD+Zeqhsh50MGQIceOPt38xDtChhk2PMyUJE/g06cdOqrG+WLUC0mCA XIP0ZE//xcaM8TkeJZMloayJOMUmPt+NVVOiJ1cIHxgm9fdcqKPQupTL17GnoypjBUvwyJKxPwN pabpXhDh0yajSVd/a7gHuh8Ri3pdL47+S1NHXioRlf+qeWjdtDuQa7N7ErGx+OJxrzYcBUooHRF AJsxoFOhhdqN4fQNsOuQum2cxJjq/EEyGd6P6qg2cxJq/MwAgVtbQy1VA9RwF+2cCRjBXqL+dw= = X-Received: by 2002:a1c:dcf:: with SMTP id 198-v6mr2632418wmn.131.1533126240524; Wed, 01 Aug 2018 05:24:00 -0700 (PDT) X-Received: by 2002:a1c:dcf:: with SMTP id 198-v6mr2632374wmn.131.1533126239442; Wed, 01 Aug 2018 05:23:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533126239; cv=none; d=google.com; s=arc-20160816; b=v7MazpbH9vGgUYiIdD11gBSfRXvxzvGUar0l/zcYol3yIZK9fzXQkTdnjqrAlXWIr+ uH+ORM3Q+Y5ESzOn7SzBbQJUXqVQh6MfWBzSUdrYXtO2vxrdepgxBZph64BM5zT+/fqW gEwrzY/dhxrpYmhZGZmyd7rdABjFeOMvc0FanzF8CaU1CokCLGxdy9Py4YQW4dRQNPsi NTBJSTLNyw3AYqyxssTNDGnkVuclenYYVyBOt3fjE1x6snzp+et53/9BBaJxuvuMx67+ VsCVjrZiYfVGfXCGrCx6sMu+R2Zfean0y1km6O/GG9SLWsmPmkAyWxfDBQh99vXMAqSN 7AEg== 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=2IJV0Bsp7d2bZQN1MM9VgazQPVFDOqJ3IbNa35la5Is=; b=jYYd3jMVdtDBG66BOoX85l3nErtufnuXhoXmuWHN12UUNeMVrguwvBnohKxfxt7b2B ycNAPSb3JhjvfgK10D9+d3PG3lgZbhKrETlcPweBlJbWpOpzM8gchNviwEwweA54J9qD U4Fzeo6/5+xyeWmeOpiNkcsZOLnlaInnGj+TBldjuHU5JCc7k/IObUBKrtFtk9fkghG+ 2wdj3TRC4XI3igJPDuUJ0+2gJteCiHFeZ/QrqSVZb21wOthQtwjVyePOij3nXn2s4VNH +2McFsdFOQMxslv1bKXfKpXdZLdK7Oz7gTtVRJH7so+Vp2MBQcRAdrjOAjHOyUQeiIlT rCyQ== 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 v123-v6sor1320143wme.27.2018.08.01.05.23.59 for (Google Transport Security); Wed, 01 Aug 2018 05:23:59 -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: AAOMgpfIYPmnKYTR3h2cqNMLcEcmOhv6IqFe9XO6TXBqLyao7R4KZ9qWjQ79B63sw5OcvIWXy61DTA== X-Received: by 2002:a1c:14c3:: with SMTP id 186-v6mr2430261wmu.21.1533126239047; Wed, 01 Aug 2018 05:23:59 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id f18-v6sm13755095wrt.64.2018.08.01.05.23.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 05:23:57 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id AFC72124543; Wed, 1 Aug 2018 14:23:55 +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, david@redhat.com, Oscar Salvador Subject: [PATCH v6 5/5] mm/page_alloc: Introduce free_area_init_core_hotplug Date: Wed, 1 Aug 2018 14:23:48 +0200 Message-Id: <20180801122348.21588-6-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180801122348.21588-1-osalvador@techadventures.net> References: <20180801122348.21588-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 does two things: First, moves the node/zone initializtion to their own function, so it allows us to create a small version of free_area_init_core, 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 These two functions are: pgdat_init_internals() and zone_init_internals(). The second thing this patch does, is to introduce free_area_init_core_hotplug(), the memhotplug version of free_area_init_core(): Currently, we call free_area_init_node() from the memhotplug path. In there, we set some pgdat's fields, and call calculate_node_totalpages(). calculate_node_totalpages() calculates the # of pages the node has. Since the node is either new, or we are re-using it, the zones belonging to this node should not have any pages, so there is no point to calculate this now. Actually, we re-set these values to 0 later on with the calls to: reset_node_managed_pages() reset_node_present_pages() The # of pages per node and the # of pages per zone will be calculated when onlining the pages: online_pages()->move_pfn_range()->move_pfn_range_to_zone()->resize_zone_range() online_pages()->move_pfn_range()->move_pfn_range_to_zone()->resize_pgdat_range() Also, with this change, only pgdat_init_internals() and zone_init_internals() should be kept around after initialization, since they can be called from memory-hotplug code. So let us reconvert all the other functions from __meminit to __init, as we do not need them after initialization: zero_resv_unavail set_pageblock_order calc_memmap_size free_area_init_core free_area_init_node Signed-off-by: Oscar Salvador Reviewed-by: Pavel Tatashin Acked-by: Michal Hocko Acked-by: Vlastimil Babka --- include/linux/memory_hotplug.h | 1 + include/linux/mm.h | 2 +- mm/memory_hotplug.c | 16 +++------ mm/page_alloc.c | 78 +++++++++++++++++++++++++++++------------- 4 files changed, 61 insertions(+), 36 deletions(-) diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 4e9828cda7a2..34a28227068d 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -319,6 +319,7 @@ static inline int offline_pages(unsigned long start_pfn, unsigned long nr_pages) static inline void remove_memory(int nid, u64 start, u64 size) {} #endif /* CONFIG_MEMORY_HOTREMOVE */ +extern void __ref free_area_init_core_hotplug(int nid); extern int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn, void *arg, int (*func)(struct memory_block *, void *)); extern int add_memory(int nid, u64 start, u64 size); diff --git a/include/linux/mm.h b/include/linux/mm.h index 70edbc3f21a8..90d75e4fcc2a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2012,7 +2012,7 @@ static inline spinlock_t *pud_lock(struct mm_struct *mm, pud_t *pud) extern void __init pagecache_init(void); extern void free_area_init(unsigned long * zones_size); -extern void free_area_init_node(int nid, unsigned long * zones_size, +extern void __init free_area_init_node(int nid, unsigned long * zones_size, unsigned long zone_start_pfn, unsigned long *zholes_size); extern void free_initmem(void); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 4eb6e824a80c..9eea6e809a4e 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -982,8 +982,6 @@ static void reset_node_present_pages(pg_data_t *pgdat) static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start) { struct pglist_data *pgdat; - unsigned long zones_size[MAX_NR_ZONES] = {0}; - unsigned long zholes_size[MAX_NR_ZONES] = {0}; unsigned long start_pfn = PFN_DOWN(start); pgdat = NODE_DATA(nid); @@ -1006,8 +1004,11 @@ static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start) /* we can use NODE_DATA(nid) from here */ + pgdat->node_id = nid; + pgdat->node_start_pfn = start_pfn; + /* init node's zones as empty zones, we don't have any present pages.*/ - free_area_init_node(nid, zones_size, start_pfn, zholes_size); + free_area_init_core_hotplug(nid); pgdat->per_cpu_nodestats = alloc_percpu(struct per_cpu_nodestat); /* @@ -1017,18 +1018,11 @@ static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start) build_all_zonelists(pgdat); /* - * zone->managed_pages is set to an approximate value in - * free_area_init_core(), which will cause - * /sys/device/system/node/nodeX/meminfo has wrong data. - * So reset it to 0 before any memory is onlined. - */ - reset_node_managed_pages(pgdat); - - /* * When memory is hot-added, all the memory is in offline state. So * clear all zones' present_pages because they will be updated in * online_pages() and offline_pages(). */ + reset_node_managed_pages(pgdat); reset_node_present_pages(pgdat); return pgdat; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 56ee8c029759..47cbc0fd1e4c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6142,7 +6142,7 @@ static inline void setup_usemap(struct pglist_data *pgdat, struct zone *zone, #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE /* Initialise the number of pages represented by NR_PAGEBLOCK_BITS */ -void __meminit set_pageblock_order(void) +void __init set_pageblock_order(void) { unsigned int order; @@ -6170,13 +6170,13 @@ void __meminit set_pageblock_order(void) * include/linux/pageblock-flags.h for the values of pageblock_order based on * the kernel config */ -void __meminit set_pageblock_order(void) +void __init set_pageblock_order(void) { } #endif /* CONFIG_HUGETLB_PAGE_SIZE_VARIABLE */ -static unsigned long __meminit calc_memmap_size(unsigned long spanned_pages, +static unsigned long __init calc_memmap_size(unsigned long spanned_pages, unsigned long present_pages) { unsigned long pages = spanned_pages; @@ -6227,19 +6227,8 @@ 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 __meminit free_area_init_core(struct pglist_data *pgdat) +static void __meminit pgdat_init_internals(struct pglist_data *pgdat) { - enum zone_type j; - int nid = pgdat->node_id; - pgdat_resize_init(pgdat); pgdat_init_numabalancing(pgdat); @@ -6252,7 +6241,54 @@ static void __meminit 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 __meminit 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 + * - init pgdat internals + * - init all zones belonging to this node + * + * NOTE: this function is only called during memory hotplug + */ +#ifdef CONFIG_MEMORY_HOTPLUG +void __ref free_area_init_core_hotplug(int nid) +{ + enum zone_type z; + pg_data_t *pgdat = NODE_DATA(nid); + + pgdat_init_internals(pgdat); + for (z = 0; z < MAX_NR_ZONES; z++) + zone_init_internals(&pgdat->node_zones[z], z, nid, 0); +} +#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. + * NOTE: this function is only called during early init. + */ +static void __init 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++) { @@ -6300,13 +6336,7 @@ static void __meminit 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; @@ -6382,7 +6412,7 @@ static inline void pgdat_set_deferred_range(pg_data_t *pgdat) static inline void pgdat_set_deferred_range(pg_data_t *pgdat) {} #endif -void __meminit free_area_init_node(int nid, unsigned long *zones_size, +void __init free_area_init_node(int nid, unsigned long *zones_size, unsigned long node_start_pfn, unsigned long *zholes_size) { @@ -6421,7 +6451,7 @@ void __meminit free_area_init_node(int nid, unsigned long *zones_size, * may be accessed (for example page_to_pfn() on some configuration accesses * flags). We must explicitly zero those struct pages. */ -void __meminit zero_resv_unavail(void) +void __init zero_resv_unavail(void) { phys_addr_t start, end; unsigned long pfn;