From patchwork Mon Jul 30 10:17:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10548855 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 BC38F14BC for ; Mon, 30 Jul 2018 10:18:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA09329703 for ; Mon, 30 Jul 2018 10:18:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E0FB29706; Mon, 30 Jul 2018 10:18:10 +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 358B229703 for ; Mon, 30 Jul 2018 10:18:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 591BD6B0005; Mon, 30 Jul 2018 06:18:06 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 563AA6B0006; Mon, 30 Jul 2018 06:18:06 -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 451966B0008; Mon, 30 Jul 2018 06:18:06 -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 CFA816B0005 for ; Mon, 30 Jul 2018 06:18:05 -0400 (EDT) Received: by mail-wm0-f69.google.com with SMTP id u21-v6so7641661wmc.8 for ; Mon, 30 Jul 2018 03:18:05 -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=09jE8HQnR78gKgCVm3YT0g0xgTev+DzLs5mljNQWB3Y=; b=JevUrdEJ1YaeX4DLkXWLNdQ3isPz82EDx2dyHk6x2JmXpwnC4Bem3d7NP0bbAfJP9M DVZy4Xipm2pPUmxNws7W28uoioY9jzos5OHcyS/08Gc3f923ncWd/eGXuYqYX1zuMGJV TV2Qkn7MLVHsBalLd/uQcqmfymSlMQ9Wq/0FNj+iC3breN0MPbZag3zhu6y0a9cRZiI3 wsgApCgkq90Ms1CFb7VJPk45PjR41qo5YhX49gR2ziXQBbndkHwhC7GDKfUeB/SCx0ee kUPSMlsddPdl7wfxeD3bXnjR/LXbyAd/JY0dH8XIkZQu4ZfY/tAqpddEJR5qmUDhgHHO m89Q== 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: AOUpUlFYRimhOqpGHgB4J/XuL5JK6o+L/T3wkMtCoCNelNmRah/M5iXu gSm9T7bVZzQiI/miqKXCi3hQkUqvp+R/jk5hgMdx9ny+8MpwqdLLrk+U6lNU0MmJxwgzjlq8sxg wwDNPDP/keeinREzxYIoCpu90xikIhPPJlQ/mWfOjDenenjXw3hxXa02o3jU3nIE3PCP/h42DAJ CEt5ea/cUidX4TNLg5F9/15gMT593C+f9kC558il4eJcOmNFbUTR7IOj1ObYMBxwcWwKRuoSvAn VTWgriOMYG+oOV4MSAa2LX6monr50MJkBl35rnsx2YX2h85/slMwQVhiNEshuKqT7N3bHlcSWdt Pi/nlP0rMy9FztzuUBqdvKYEqhgz7viQdsw5hCP6P1QFMLDjquMrmbmDOiEUsvNs/lrtVbLAqw= = X-Received: by 2002:a1c:8a0f:: with SMTP id m15-v6mr14825083wmd.33.1532945885365; Mon, 30 Jul 2018 03:18:05 -0700 (PDT) X-Received: by 2002:a1c:8a0f:: with SMTP id m15-v6mr14825032wmd.33.1532945884648; Mon, 30 Jul 2018 03:18:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532945884; cv=none; d=google.com; s=arc-20160816; b=CrwhwwMs6x6kGr3AKBzurgL70gBEBGL0DqwCkXroETdYQOFEkvxH0SNSAtleJu+IHP zLzyHHdaBvvBsCEagGEkd8BtsQ0jfSyrQRRBGP42nnF86FK7eHDrUlZm8ZZ6Fbu0idjF jBPXMj2vDUY7aErPlWDmtIiMHN8nJyLa70eaZjcVNz7m6b1XlDMe1W3T5f0+I12GQP/2 OeGzNZtSbHGCQzReVb2tLbnslhYFjr+7DetCfpHSbq+i3t2RW0oE7v0DPjGs+txX3YyC JpocRLdnzoIuJdZ96QaEGn6k7ivmSTJbhVLIV2sCnd1SX3wgZyPNvdEbiAgqEx+Kdy8U Fjog== 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=09jE8HQnR78gKgCVm3YT0g0xgTev+DzLs5mljNQWB3Y=; b=CwQWVZXqoeMj0CxYCoAu+qy0jSyoGAk4OWsKdI8c4CSollQzzJ82C3HIntC8i1cgB2 PEmsOCKmdvihNponSZkIfQO221OxpP9nOliT9kgvggG02/G4FrTnY0St6t0VjnadmRDh xKtHUp54RffATAti6EpUutayg1nDsu1V678bqi7Wxs9Ka8pw8T405mvB6f6BmQPPnh8c EAN7hvSNjR/IhLwGGpyaNRaR1OUpIrfzVGAW+7rSo5eBuf7blqVtI4EWcy2kqmGffvm+ H36gIq4OQcL+k3OgfyL5eDGJ4WTweIVM1O8oUAV4puobE7102jQu3xcFlDWYhBUCaKWh dWkQ== 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 l6-v6sor4479852wrp.27.2018.07.30.03.18.04 for (Google Transport Security); Mon, 30 Jul 2018 03:18:04 -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: AAOMgpcvakSxR0e1vEitRJ96u7k1p0z8ynlwV3GP9uDp1kpmxYr+UM+TlQIx/8AJgmHUOBKb/zLGdw== X-Received: by 2002:adf:f342:: with SMTP id e2-v6mr17160542wrp.161.1532945884403; Mon, 30 Jul 2018 03:18:04 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id a2-v6sm10747642wmb.6.2018.07.30.03.18.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jul 2018 03:18:03 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id B5CCB124446; Mon, 30 Jul 2018 12:18:02 +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 v5 1/4] mm/page_alloc: Move ifdefery out of free_area_init_core Date: Mon, 30 Jul 2018 12:17:54 +0200 Message-Id: <20180730101757.28058-2-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180730101757.28058-1-osalvador@techadventures.net> References: <20180730101757.28058-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 --- 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 e357189cd24a..8a73305f7c55 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6206,6 +6206,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 @@ -6220,21 +6251,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 Mon Jul 30 10:17:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10548857 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 57072A754 for ; Mon, 30 Jul 2018 10:18:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4560929703 for ; Mon, 30 Jul 2018 10:18:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 39DE329706; Mon, 30 Jul 2018 10:18:13 +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 9F88529703 for ; Mon, 30 Jul 2018 10:18:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1E8386B0006; Mon, 30 Jul 2018 06:18:07 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 147966B0008; Mon, 30 Jul 2018 06:18:07 -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 F013A6B000C; Mon, 30 Jul 2018 06:18:06 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f71.google.com (mail-wm0-f71.google.com [74.125.82.71]) by kanga.kvack.org (Postfix) with ESMTP id 960DB6B0008 for ; Mon, 30 Jul 2018 06:18:06 -0400 (EDT) Received: by mail-wm0-f71.google.com with SMTP id u21-v6so7641684wmc.8 for ; Mon, 30 Jul 2018 03:18:06 -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=r3FUumIztPDwO6lIdEH4/NlXhd3R05jzu97rMbjyVnY=; b=TbsVUYlg7pN50FEQbRyPuEtpuonpiy96hBZ4qmIDAWEDh2dQTYIKtEmKqLTCsdyEIQ 9z4KP3bJPgyfZl5oMnIoQxexfPufHYF6ATTZlMc7PunY+OTrhflQ+AOx+hqV6HwcyP6k Pl5IZ1tfk5Ootka+o6g3xjs8anLRlh//92pDDJCZgGgxugNsgPu1Q2C6juQ27DEwLrNS CZYemYJHqxcPPNpjkEkPXAtYJInvtTA9gI0ParWUpBIFAZGyA6j3/at+F13EsZPMSm1D tNBqKB4qGuVquuAAoFmDhAn0W1S86snEMoAIuJo3Q5HT07NVk3Z95/6wPzkBeKu7PPMP u8bQ== 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: AOUpUlFcwGkMCzUfiyZMkMtAc/s3CJ65klixCPuJXmNO164nvd9S7ijp 0vPtEdF2XKGS5PYAyZST0fxJRtiwknfFdYgIxbhYI1EkJ824cP3nLpe0V/UXCd9MxG3VKkrl9vW Dfr8TUbsiByeg8laU/nnxviCpeTyWwM2vk/Alle1Y5x9c6QrWFF2XCNlPhb0bngzlq7qVHgoLif uyZ/kD2fCc2VJezl3eGPX1++4Keu+k3mLbRuHDy7171RGPBEMpLNYqvafWVoeFGS1H0PIUAAz4/ h1LDaAZZYf57gpd9z7egDR529UVcOpU2/vSmktpxbJQ61t9IYz1vnae6Ot0wfZOpJwMY8ovAmdV V/aU0jLcERS5Aar3wT0fxYkCNv99XVgNATGnIWos0O8Azl/f9sAbUllcFM7t8UlxSAnLn201kg= = X-Received: by 2002:a1c:6a0b:: with SMTP id f11-v6mr14566412wmc.107.1532945886158; Mon, 30 Jul 2018 03:18:06 -0700 (PDT) X-Received: by 2002:a1c:6a0b:: with SMTP id f11-v6mr14566334wmc.107.1532945885120; Mon, 30 Jul 2018 03:18:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532945885; cv=none; d=google.com; s=arc-20160816; b=znlRM5KyIG2QUw0QvVAYbbq71oItKzWzCYPCb9/FUQWLpePs/WfLixY9No7ZRX0Lex jd9ki4e0lykYcCJyAy5F6nJAqBlb24eF0KFE6gF47uGot0GTg6U67fbgald/fbDQV/Iw nanz7gEO/uC/AXVyJPZorphdgJmULaAnjzCLFMxHY4MXmTOYhtbc6xxNTDdI21oN2N92 m2+5fG+oh4XvBgcJQy9AbbLuYVXSFHvtq0MPAaQQQ9kefbuIycLb0OsmEI87Dr7BwaU3 6YtMW/4t6XdC/msSyyh0SxUjwGU4G2RNAD21oYbaxjq9Wq5GpZILMtX183/JoBK2fpXI Q5Nw== 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=r3FUumIztPDwO6lIdEH4/NlXhd3R05jzu97rMbjyVnY=; b=cQAWooD28ycZluC0yIJsnUGm1Y3L15AxvrroKY0mNYvBP0lAZ3R9q1HejUNG99Kj9v 20u9Y2BK52E7NwZtsnv0AQv4Qknhx3XUTtK4mTMZA01rYq0vzhcTrNK3x8sQ3PpKxaeb yc23wuNF3AHvZE1bpjLuY0hSe7hX+ERzFhvS7GWzNr8Pz4GFaYd3KQ0tAGaD4N9E09Le GobkSAH+cV+V9le64IPYS2eY9XipfXId4IpPREhLi1zbcqSc9aBN2Ukj70LVFCgq/iih nspCCPmMxa+JnyAS6GwmJ+l/BWd4cG1PIrlO6v0xhBmHqFRZeTbbM2sYSSeeqM+IGA2N QRFQ== 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 w8-v6sor4657719wrn.16.2018.07.30.03.18.04 for (Google Transport Security); Mon, 30 Jul 2018 03:18:05 -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: AAOMgpeb/ufzCmRAGJBr8drTHWXEcEBSU0Cmhe26IKPgkTdbW/5tDU5cQh9YjkkJjep00KeupCYLaQ== X-Received: by 2002:a5d:514d:: with SMTP id u13-v6mr17321645wrt.162.1532945884826; Mon, 30 Jul 2018 03:18:04 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id h7-v6sm11009845wmb.48.2018.07.30.03.18.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jul 2018 03:18:03 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 0004F124447; Mon, 30 Jul 2018 12:18:02 +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 v5 2/4] mm: access zone->node via zone_to_nid() and zone_set_nid() Date: Mon, 30 Jul 2018 12:17:55 +0200 Message-Id: <20180730101757.28058-3-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180730101757.28058-1-osalvador@techadventures.net> References: <20180730101757.28058-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 --- 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 726e71475144..6954ad183159 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -940,15 +940,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 ae1a034c3e2c..17fdff3bfb41 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -842,6 +842,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 @@ -957,12 +976,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 f0fcf70bcec7..8c1c09b3852a 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 8a73305f7c55..10b754fba5fa 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2909,10 +2909,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); @@ -5287,7 +5287,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 @@ -6311,9 +6311,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 Mon Jul 30 10:17:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10548859 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 B13CD14BC for ; Mon, 30 Jul 2018 10:18:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0E9329703 for ; Mon, 30 Jul 2018 10:18:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9578A29706; Mon, 30 Jul 2018 10:18: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 3119529703 for ; Mon, 30 Jul 2018 10:18:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 478E56B0008; Mon, 30 Jul 2018 06:18:07 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 208D16B000D; Mon, 30 Jul 2018 06:18:07 -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 05CA26B000A; Mon, 30 Jul 2018 06:18:07 -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 9361F6B0006 for ; Mon, 30 Jul 2018 06:18:06 -0400 (EDT) Received: by mail-wm0-f69.google.com with SMTP id s25-v6so5264786wmh.1 for ; Mon, 30 Jul 2018 03:18:06 -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=bLjX86dg8uQeCW6TtBr2m2PymECIejY8mSgyHYdYlu0=; b=bZTMNKXAP7obbL2MTTjNGFtawH7yK+qeUWDTDTp3PB/wKwJL/PEVjoCrrbIBavd1Ur n0LLI9pPnORV9jDmXyk1absZW76vEv5DOSZZq95acF0U9Db6b01dG49VnkNp0Ng19Nbr 9NibsMVRZO1W+nB1uVyZhU5dUqqFY08OBukrE2R0WcBjZtT8m1R/R2KDb6KYOzpFSOSB gEhblTlEXSy6NvYAfcxJ22nUz5d5DCuc8OrAWaR6m1j1j6BRHzDOcIoWWFby50CzpVe5 UwtJ7YT46CChj/N5UOVi7trYkV1FQzjYI7olhacV2qjUP728lej8uVQ8EHx5/iZpkJYd L7UQ== 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: AOUpUlGFB3AdbBGXBnmZt9D+tG73Q5nHvKbDR4hDI48cFmRDSZqVtYem AttXHeB5hjt20qe9wMajNwRaH/UXZlz4KhYAZ8J9K+pznd1cytLvnzZZqt6hrwoijfEDrthfhVz +U0/nmGerTyTtCD0T8YkRk+741KpRKP0Eruh0BjWvPbKAxkeaHaHjh0tPfsCjQwSZTlqzBGVOB3 fLdxKg9KlT/5gBkWy3150OM2eR7ZmoJE+KsMhFxtUF6yZXjOpHIJVOz57HPZLMm6ntKX5cTGNvd 9OsrEf6IbBEsn1nFXvExGnnUJBLKcBkCR4mv1ChxO/KPpoMQUiYA2JBZ0eXRZ7OaoeJrdAbA1YF UqkcQht+VORKwfmsyvr1x/3DdMDzEmLScxsa5sjVryD9JXhtxbM3I56VZ1Kh62OW97gNsf8TAw= = X-Received: by 2002:adf:96c3:: with SMTP id u61-v6mr17153590wrb.72.1532945886171; Mon, 30 Jul 2018 03:18:06 -0700 (PDT) X-Received: by 2002:adf:96c3:: with SMTP id u61-v6mr17153541wrb.72.1532945885545; Mon, 30 Jul 2018 03:18:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532945885; cv=none; d=google.com; s=arc-20160816; b=HEd9CH8B1ZiYfndYBD7nDCSEiw6IikRKp2xoGqpEp8sTaLJd56phffcKLdj3mdkrJ2 UDJdEoggGPP+gvDZDte3kVM0ZGrJSqT4th2dejn1G/GKLZmLn18+BFanbwlphxYC7gnm FTBnohX1vYKSjTwTEAfSJLD756T4ExJVk+p4kJE4q9AJUQro/fCAK5Y7GQsZSA2Lp1Rx Q/nhwHB3pAjgSsikoBI3GJU10HEBpJctOlrRth3+xAw3jfbo98b1RnnyZ+5RVVnbWr+u JF07ha7WP7XQEr4vJ+HMNo4T+c/BHSgKKA9cZ99O4IIshHoHh6uyZk/1JEGPOPVvbWvk L31Q== 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=bLjX86dg8uQeCW6TtBr2m2PymECIejY8mSgyHYdYlu0=; b=IoRkJP5R31zq6EWBQgXp31ffGOnpFBNeLFgmmzU0riA0frQ6RDYvpt602lh4oeb1is 4/e1DqAnFYCJdt+heEIweH2+qpvD+7xsazR1zfSlASD8/rEPCJQji6bDQYJKyv7Um+4R 6um1ESHvATOJp4JHZ8h9JnHS1rQF+oZBo/4QXzDjwNJUlpVcF6jQf+DFfFXIDDZp+ZvO N8GOWfYpfm6Lw5rkImLwx0Cu/ZfcKzi6iIh5AtvZtAFZTKGgTOlIGKSjvZeO2802WSdD Oa/Z4DcEfE22w0Pw23mA78TZV1AOZAMtEi/E/+WJdc/mcWXA00akRx0mXFvFIn+8dDzH 3AaQ== 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 g2-v6sor4479957wru.26.2018.07.30.03.18.05 for (Google Transport Security); Mon, 30 Jul 2018 03:18:05 -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: AAOMgpfDkD8HTOD8T5QX45QcnuBXi6q6ZGk/UOmhrH3XoSmv8wsXmzIw2HQuh7a78XB+JJjI1PklUQ== X-Received: by 2002:adf:9c12:: with SMTP id f18-v6mr17387965wrc.93.1532945885293; Mon, 30 Jul 2018 03:18:05 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id 188-v6sm16724942wmv.11.2018.07.30.03.18.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jul 2018 03:18:03 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 3D248124448; Mon, 30 Jul 2018 12:18:03 +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 v5 3/4] mm/page_alloc: Inline function to handle CONFIG_DEFERRED_STRUCT_PAGE_INIT Date: Mon, 30 Jul 2018 12:17:56 +0200 Message-Id: <20180730101757.28058-4-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180730101757.28058-1-osalvador@techadventures.net> References: <20180730101757.28058-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 --- mm/page_alloc.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 10b754fba5fa..4e84a17a5030 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6376,6 +6376,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 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 __paginginit free_area_init_node(int nid, unsigned long *zones_size, unsigned long node_start_pfn, unsigned long *zholes_size) { @@ -6401,16 +6416,8 @@ void __paginginit 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 Mon Jul 30 10:17:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10548861 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 AA19414BC for ; Mon, 30 Jul 2018 10:18:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 985D029878 for ; Mon, 30 Jul 2018 10:18:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CB512987D; Mon, 30 Jul 2018 10:18: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 AF40629878 for ; Mon, 30 Jul 2018 10:18:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4359E6B000A; Mon, 30 Jul 2018 06:18:08 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3B8696B000D; Mon, 30 Jul 2018 06:18:08 -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 2582F6B000E; Mon, 30 Jul 2018 06:18:08 -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 BBC576B000A for ; Mon, 30 Jul 2018 06:18:07 -0400 (EDT) Received: by mail-wr1-f72.google.com with SMTP id w2-v6so9527559wrt.13 for ; Mon, 30 Jul 2018 03:18:07 -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=TLyg0Y04DoZ4XgeqD6bRBZIDhScpx+PZcN+xJjKpwhY=; b=pK4T8qvw5f7GtFs0CEiLlY+4rTZ/E+rmUITMHwiNSpmesL5Icb1Y7H7cKFlMDSQPY3 N8rH81QWslSZeu8epTo1j8nNe+hY15euC97cIS39jTCYaPVU8CW8oRC0kx/PWn1nANPv h3+PqHj1d39qqooBJrgXfpzAPVkeEL2btxQoc1Ttlm/w1qAJ4NVijymzpwzMSqIM/vcA vEk3WZL3rTd5a3D/p/WPy7+wp2OctEdGd6ntpZsek1/bqRZegKupxFc1BFvXrttrAflk 2yw0vUiaUnlPYkyoLsO4nu1XNO5wqBs8ys9Jd0pGm45nMMKHhXKvSD5909K8ww7n6PJ1 F8wQ== 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: AOUpUlGEVPnCP51zH71if48dTxYFJLS/dUYsr4GdfxOVxnfmsGj8W1Pr ZYk1Suusc26glsH3+P7iSx0sLV5qCzmpbFcuhje2S7kTGvezevYjBQ1RMKzhRrkKrZflLDz8VZU U5ggUQeNXMmdq4M2Lft28gfXzcBPaP4Np8hvydg6VO4yxTYi42EemFBtTVe/FUkRhtyrKALQ22d TEdlJYyiquBkPlvRI8vY+J2dJgrFzsfi1XUiawaQndWI64vyOpWZvgAWbh3ejq57q2QnX04L2vB hUzZugWoxdFC0eJgpPTC4mRker1G0Mit5Aa3c6sAhfR9SB52+TY9dkLG7NnL2VG9I//+o+9TCwm 6ZDbiU9v7KmZ+HAoaSa6ZXPyoctcvqMw8e1HIGR5MVFXkFfbX5AE1obWAcHtCETNTlj/fdp/xw= = X-Received: by 2002:a1c:8b0d:: with SMTP id n13-v6mr13920999wmd.46.1532945887284; Mon, 30 Jul 2018 03:18:07 -0700 (PDT) X-Received: by 2002:a1c:8b0d:: with SMTP id n13-v6mr13920941wmd.46.1532945886416; Mon, 30 Jul 2018 03:18:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532945886; cv=none; d=google.com; s=arc-20160816; b=Fvl/9TerjSMwyp9O9StZ1/WlcErbrHgDbIvpXiT/B1DTMDmkG1fl7Opp25hVtsFv+o eibMkLBaWic3KUT/VgLvDc/zgQdFquz+J8Nb6GSIa98X76FM7cgnBqibDlkhQav++Vdb I9lBgFb2U685L1V8oM/SBk5mepsjRbpXFMtgrnnAUjtURUOczVgNPeqdVZmD7s/o3zF5 2uoyf7OyP/S9pwrMbqtAFlCL8GqPdNxtNnWCW+dlxSzf9oZYYwRTKX26jgj6dJvANZm6 upFigJvpHisluDNAeVKHipFm8misoVownG14Iu5yPEjH4mTIZXuQvy9WA9GrIfqljyeT cF1A== 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=TLyg0Y04DoZ4XgeqD6bRBZIDhScpx+PZcN+xJjKpwhY=; b=m/15y4+xmMgK0eIgPqhYUg1b+HidOQVuikFFzoo7wAGYWdtAsgaejMZCinUarQJzZu Z2I8iw0xnXX/RQC4CSo8CEoBQHeRAUwkIN3MhqUGIXRVUWEsr+lGtMs/YwmxHhcfgt8H DryRT/Xpq2g8ypgxTdZV56XbfqO0xE/qk3uxKWmKjWTmUVTcn3v97jJj7jUV/ceDor64 1q4wNJflnNJmmIv9X2lMnV8htShpRAs4Zt9FDKjVVx7ufHqLUNOCdPMCQiWjYdFg+7B9 9HyuvNkOY5qHZxqdE2j08HL9bxUMHHRv2jeApvHEafaN273bdnMiX+ZsZlGRAuCGkDKT jdkw== 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 y199-v6sor2948100wmd.8.2018.07.30.03.18.06 for (Google Transport Security); Mon, 30 Jul 2018 03:18:06 -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: AAOMgpcIeoYDPBf9PNJRGGgdGykb1wTfI4h8Qi7UURcI+PRKUmQKj5DCVIYh+NJ+6UcWDnDiVzOUEQ== X-Received: by 2002:a1c:7c13:: with SMTP id x19-v6mr15398785wmc.27.1532945886047; Mon, 30 Jul 2018 03:18:06 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id s124-v6sm14262798wmf.47.2018.07.30.03.18.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jul 2018 03:18:05 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 79FC2124449; Mon, 30 Jul 2018 12:18:03 +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 v5 4/4] mm/page_alloc: Introduce free_area_init_core_hotplug Date: Mon, 30 Jul 2018 12:17:57 +0200 Message-Id: <20180730101757.28058-5-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180730101757.28058-1-osalvador@techadventures.net> References: <20180730101757.28058-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, since free_area_init_core/free_area_init_node will now only get called during early init, let us replace __paginginit with __init, so their code gets freed up. Signed-off-by: Oscar Salvador Reviewed-by: Pavel Tatashin Acked-by: Michal Hocko --- include/linux/mm.h | 6 ++++- mm/memory_hotplug.c | 16 ++++-------- mm/page_alloc.c | 71 +++++++++++++++++++++++++++++++++++++---------------- 3 files changed, 60 insertions(+), 33 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 6954ad183159..af3222785347 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1998,10 +1998,14 @@ 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); +#ifdef CONFIG_MEMORY_HOTPLUG +extern void __ref free_area_init_core_hotplug(int nid); +#endif + /* * Free reserved pages within range [PAGE_ALIGN(start), end & PAGE_MASK) * into the buddy system. The freed pages will be poisoned with pattern 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 4e84a17a5030..b2ccade42020 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,54 @@ 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 __paginginit 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++) { @@ -6310,13 +6345,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; @@ -6391,7 +6420,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 __paginginit 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) { pg_data_t *pgdat = NODE_DATA(nid);