From patchwork Fri Jul 27 14:03:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10547209 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 7DA0514E0 for ; Fri, 27 Jul 2018 14:03:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B4A028795 for ; Fri, 27 Jul 2018 14:03:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E1B22BC39; Fri, 27 Jul 2018 14:03:37 +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 D123D2BC41 for ; Fri, 27 Jul 2018 14:03:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9C68D6B0269; Fri, 27 Jul 2018 10:03:35 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8FCFB6B000E; Fri, 27 Jul 2018 10:03:35 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 79FF36B0266; Fri, 27 Jul 2018 10:03:35 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by kanga.kvack.org (Postfix) with ESMTP id 1C3646B000E for ; Fri, 27 Jul 2018 10:03:35 -0400 (EDT) Received: by mail-wr1-f71.google.com with SMTP id w2-v6so3310164wrt.13 for ; Fri, 27 Jul 2018 07:03:35 -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=GFVoVJjs6isq2AzKKaYmx3StwbqKUJT0RQsC4L9YcKpaQL9GC15TVoG7CaOqJytTNp hR4gGw+m8vd9UKI4sjF6kpGGT+vIszfjRw8uFr67/X5ZUL8YuM5Jfx4+cR034YoCLtkC iociJ5RBOv1t+iZiKPSvwGkG6TTpqYldScgV3xow+UR0m8go6RznP7f+eOdbva6AliYq VQWf/7hHdOwY2S5UU8C/+QIWvsdHlz6FXXDyXwXjiozsujeb1lRKeBtvqVr1wfrfp0Ry JZ6vQJZ1/brR+V1fffLLfNG2POARADObZr8HYVOyrxnNpiW2BNS4tPWwxbCjqgiCPvhr d9Ig== 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: AOUpUlF6KxusncJdgwBo9/w7JjCa0mX7kZzDcPe5+IZ3RllrT2lfquqY 0ZxENY4+Vz8f22tTtxO/pWT0nh3uki+BTIJVrkKsQZ8IKwBEG2T64FErVjIeh0ULWj2Ufau/s3k 8AVutjjqqnAGk1nhXnL0EW1ry3+gCdu0HprgIBH0h87MoUBhNM4370RLMpkMsfbr4mzuJr2gWCt 1iTaxpjo8XAJuwzFGfT6fZkXeYCG9O/c34N7jbfX1DQC+JbvZUHWoQ+aaUTJp97BBafAcUa4kge eXY0GugTjcpM7FOCVLDd/pE3Obifj0cQ0maydwBfMZifnQFdEp4AtLJwgKFuhIK9tNrWQrmnuJc eLWnfhYmG1bWH4ej8++V8hJxQl2GBimpXzMO/WFcb5MmmVWePQcl3tjkgh0/Pmy0JgSWbNDkYQ= = X-Received: by 2002:adf:8296:: with SMTP id 22-v6mr4808729wrc.252.1532700214665; Fri, 27 Jul 2018 07:03:34 -0700 (PDT) X-Received: by 2002:adf:8296:: with SMTP id 22-v6mr4808689wrc.252.1532700214003; Fri, 27 Jul 2018 07:03:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532700213; cv=none; d=google.com; s=arc-20160816; b=gtIkrcOFA/nvMMbGQnU2Lrjcbj3Om5H6v355Ny4pA5+TvZq4C2R4b0gyxzMGO5clT1 FN90M142C6wkpmPnFW0J2biePE/2bhq8fr9cDie2uNmH4ZBVJVahdMCIGAroSzQqkgIV tNX2qrXD5MC45x7B3zWQS533Iea+Z1BB6RNGLZJGj7a1DeNYytdIa8fPr5ioMV5+6WM0 0JYvePA2Onkr2hNZi//+HmYoePKGzSK4sNCgOPzxDc7fzH8ZPyPAR5cCz1XT+oPd6Eyx y6o228dXwNpS8FDP7qK8hv9byd+140E4D7n7GUq1kubf8U7+XfpAGFuT1pditFcZmkhS /v0Q== 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=z7IYgiHNqhkk0MyCCy3RMGQQ79Nqj9qfTBC+2jVVNnM9xYztW2AoizLFaCfVe0K4CJ EfyXysa8/uzMmtYT/jX06Srsz9mryYhxQl5zLwZ0f6D7uz/DVqJBBN54uIFp5APPE2el K480zdVth08TidJy6D4ROC+Ep4rGGAAV/9F/+DeWEL6Dc73sYD85bATe/CAfupL7H5lA aQMpXnYvaOrTNbAZXB97niHoOXpgMqt7EP8+rn288JmzpZz5Qp7jp5Nhh66Ym6QxSvZ9 HwMSlGz3Sua7ImHQCXmPdLY02RJ96OMmGmWOGgpCpIsxxio1Ti4tmleCHwReKJER+UJ/ Grqg== 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 o7-v6sor910116wmh.47.2018.07.27.07.03.33 for (Google Transport Security); Fri, 27 Jul 2018 07:03:33 -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: AAOMgpfnYfgeyb1lK5pdIFr1c+xnkt449YTC2ibUtk9nV1wQnfxsctvKIEdyZI/Vfl6LGJmQDXsxCQ== X-Received: by 2002:a1c:9215:: with SMTP id u21-v6mr4315769wmd.106.1532700213727; Fri, 27 Jul 2018 07:03:33 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id n17-v6sm3453450wmc.13.2018.07.27.07.03.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Jul 2018 07:03:32 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 71EC5124405; Fri, 27 Jul 2018 16:03:31 +0200 (CEST) From: osalvador@techadventures.net To: akpm@linux-foundation.org Cc: mhocko@suse.com, vbabka@suse.cz, pasha.tatashin@oracle.com, mgorman@techsingularity.net, aaron.lu@intel.com, iamjoonsoo.kim@lge.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, dan.j.williams@intel.com, Oscar Salvador Subject: [PATCH v4 1/4] mm/page_alloc: Move ifdefery out of free_area_init_core Date: Fri, 27 Jul 2018 16:03:22 +0200 Message-Id: <20180727140325.11881-2-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180727140325.11881-1-osalvador@techadventures.net> References: <20180727140325.11881-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 Fri Jul 27 14:03:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10547215 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 45E1C174A for ; Fri, 27 Jul 2018 14:03:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 343FC2BC39 for ; Fri, 27 Jul 2018 14:03:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 288322BC41; Fri, 27 Jul 2018 14:03:45 +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 8B91F2BC39 for ; Fri, 27 Jul 2018 14:03:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 903DD6B0010; Fri, 27 Jul 2018 10:03:37 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8D8F06B026B; Fri, 27 Jul 2018 10:03:37 -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 72B356B026C; Fri, 27 Jul 2018 10:03:37 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f72.google.com (mail-wm0-f72.google.com [74.125.82.72]) by kanga.kvack.org (Postfix) with ESMTP id 12FF76B0010 for ; Fri, 27 Jul 2018 10:03:37 -0400 (EDT) Received: by mail-wm0-f72.google.com with SMTP id s25-v6so1278726wmh.1 for ; Fri, 27 Jul 2018 07:03:37 -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=JT7v5QF2oJe5x2yU1x5usaGWiTc/ZoSCQrZGaxi1qgxKA8QqPKVHr6f7a+ZfVi3QXt iPlv+tK3P9BaoIHDZYvgbvmIMhl5AKx1p8OwTFwl8zR87JjR/BgHWzD5T6PqiItyFYDp azWRIYJZ8uIaCmpZY9LZ2IKPwwfzag8s99NpHDpaLfmHADdtjQqK/K7TtcyYS9uXNw7K XXsdzJv2mRHtQSX3UpBe8eQ6lM8xi6PUInOSG1Lb3NF8Wr5mSc6gYWkheoZVqX8Tb+ET 6tkVSgqTc2J/cRL6WaIBtOH2THhYoYx6fqBBOBI6Zv9rg2VTOEHLPvm/dPiqPz4rriBm gprw== 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: AOUpUlHZtAIAV6e3UcvRt5hKxdNYzMVvwx78w+AzEIxkweSWTJy7jase JM4LJllxYxtxDZxF/bPr/l3SwExdytlnC8T3D20JjpbR10JIotqzIN8uZcfUT0FdY9gHb5ZpIV2 ERlW2e8asBAKpy7tHnRJ7OqYHkllr/uhY3wyRT19/37HeMy/8dUPej0vWaqrCTAUphu2f4+H1Jo uKDXeQAIxPCSPE7+RhRmkV25NALwvcrOMxrBWE8y8Yo7+LD2SbShl6VcHT/SZIeasdGKh9aOMst p4aDV8VPNj1i29bUwf95q+OotIUqXRBUv/Xy8zESQce5I7xOVl18B5OebIW4FG8cwKmi57NdIM/ JJADZsaFmtOaZh0krxV8TgkTRnergOsK5BuSVomsYTeDqoU2lFnBKPVi2krXBEBFUSlLPCEk8Q= = X-Received: by 2002:a1c:8e08:: with SMTP id q8-v6mr4711544wmd.137.1532700216615; Fri, 27 Jul 2018 07:03:36 -0700 (PDT) X-Received: by 2002:a1c:8e08:: with SMTP id q8-v6mr4711474wmd.137.1532700215318; Fri, 27 Jul 2018 07:03:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532700215; cv=none; d=google.com; s=arc-20160816; b=so4b+qT4So2P0W0W/0S8ZMJQayEol5/mYvbPMOIWw5Y69XhcFMms5xWXBfftWloNvD 5Kfv4qf6PZ5L7wbJNos/nclzwX0Mqt8Ra/xhTjkjAOX4zOu5S3de4WS3FVEB3c8SywrG RjliQ5rfXd64Do6w16/W8ifPvZcthmN0jurVg7lQr56fO6zSD3Ft2pOlhxWMk4xFZYDL nWY9aG90dZnF4a4gV7q8nYRRn3FqNhFAn3ShxuHW4NmSNL435U0v88d6U0Gq5lNG0n8U XXq0Sp/eVTabxoaMFr8kDs8PIuht53wNcLRF75ZN9Tcht34FOw0CgbxafBZi76nqD871 /JeA== 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=bn8mrZy1g4PUCG/kEMTD2S5ViXiP7J6ScAS1Qzkc3TERQk2K45PjVuas8/gDQsh0va VmZ6snh3tcXew6/oN3orJNdOp4GjWeVZKjzLtZbRJ84d2NUlG5fNazr7rDHz1iQ44XfW f5QLrMJslLFwiSAINkE3hTBfxofbwuETJ/LcHWdNJIooAu+TPlkKfHDZsJ0mau6hFv1q 9N2SQSVv7l5hdnVRk9kTwZ4AH8uCczOuyt1O0PzsUSMZbgUddmLTjeoXjkORDbIQ780w s/pYmO3TItV8/Ux0K2Jh6U2lKB180ICneUbGHQgowAbq5LMWkQnm65hoPQOJF7A94Cx4 4gJg== 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 b11-v6sor1728633wrw.35.2018.07.27.07.03.35 for (Google Transport Security); Fri, 27 Jul 2018 07:03:35 -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: AAOMgpc2oRKahwTzpqyQdfrA/ycGXlMEtY+0/wUdqxVn6BihI6UQUSvu6a8TlVZXTeXog+sJy6YLZA== X-Received: by 2002:adf:a599:: with SMTP id g25-v6mr5109662wrc.88.1532700215035; Fri, 27 Jul 2018 07:03:35 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id d8-v6sm4077313wrv.68.2018.07.27.07.03.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Jul 2018 07:03:33 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id ABEFF124406; Fri, 27 Jul 2018 16:03:31 +0200 (CEST) From: osalvador@techadventures.net To: akpm@linux-foundation.org Cc: mhocko@suse.com, vbabka@suse.cz, pasha.tatashin@oracle.com, mgorman@techsingularity.net, aaron.lu@intel.com, iamjoonsoo.kim@lge.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, dan.j.williams@intel.com, Oscar Salvador Subject: [PATCH v4 2/4] mm: access zone->node via zone_to_nid() and zone_set_nid() Date: Fri, 27 Jul 2018 16:03:23 +0200 Message-Id: <20180727140325.11881-3-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180727140325.11881-1-osalvador@techadventures.net> References: <20180727140325.11881-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 Fri Jul 27 14:03:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10547213 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 9570814E0 for ; Fri, 27 Jul 2018 14:03:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8452F28795 for ; Fri, 27 Jul 2018 14:03:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 78BF52BC3B; Fri, 27 Jul 2018 14:03:42 +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 073A82BC39 for ; Fri, 27 Jul 2018 14:03:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AD6196B000D; Fri, 27 Jul 2018 10:03:36 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A5F496B0010; Fri, 27 Jul 2018 10:03:36 -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 8B6AF6B0266; Fri, 27 Jul 2018 10:03:36 -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 128CF6B000D for ; Fri, 27 Jul 2018 10:03:36 -0400 (EDT) Received: by mail-wr1-f72.google.com with SMTP id s15-v6so3186416wrn.16 for ; Fri, 27 Jul 2018 07:03:36 -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=sJaBK64BfPpSr1Yp85VZSd96S25x9wJ9VtefF+3JA5p8YQxT/lhIQN+nj5xRJDFbaZ 7rpxuur6AkL0R+ASx5Lh1O/3b5z3f67MhXVN43UjnEBjJhnfMJ1X6u2RJvAB/3FBqIw6 yQhDOGeSzrg+RUQ8578mtzAdJ+pXh99t3maX4tEQ7IdR2gmbZcQ9mY9/xQr6vt1GM738 WS/52g948902gYx1HjRZ6nb/jagNhN3hJM9Pq5hwpLJyS9jF5dzIHBzzJ/f1r4tCxO7y QNQma7v43hvgfpLuyStlAW9wANLLPsV9pGkR7Lv7lvj+UXcWWQUA9JEyaaxCg2DqQdaR V+bA== 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: AOUpUlFQvvlZI8lPP4ZWuA7nm3gRY9gUg4umw9ZfIuQvqEuGpke3q0/T +6lDqcsSgtstWdGh1+uGyUgwbwTW2g0pjI2XiyLOVlw1bLf4oSrqW8qLnwTWvZwyishbT5YgvQz Q9RGNeJd93kuNMGZ7xlEoaUE+QsnDPFemyLmdlrpK9JWjVOsDg+pf1vb/SaqYMEvTTGaRSlq5TC 0PyLuXw81wIoZzWpPPCLnv9hVkyfqvqIraIsQqM/6FINl90ddIGFs9c4mE9c2O4qL5cvtsFdLZ9 sbYVNOI/ys87+Rbn5KXseVtzEldjkABj+fvfyuH/MTu/80UwZAIdSOqao21uNNdzJoZDuoQEjhO CALGaUGUm7VmozB553Knx+3eLvbW1FZN1T/Y7mNFnROsPOnhLIQ97TXi51jpxcJOeXAjKJSfAg= = X-Received: by 2002:a1c:dc41:: with SMTP id t62-v6mr4467717wmg.42.1532700215635; Fri, 27 Jul 2018 07:03:35 -0700 (PDT) X-Received: by 2002:a1c:dc41:: with SMTP id t62-v6mr4467679wmg.42.1532700214886; Fri, 27 Jul 2018 07:03:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532700214; cv=none; d=google.com; s=arc-20160816; b=JyRbmjlXkGpZtB3CUtkOemNcVe9H36UhOUOatfnOQLq85epMJFuW/ISakLTMY2jvN+ amycYzFDqMKOIl+kr+muVB+ZQ9cwhi4aXXIwdKLrigg5XlNuGiwdMRTknYTY1+Tovlk8 H2URu+ujXnaNqGcgyZU5e9SHJi0zF1z4y8sNKXp1679JpjtAeyJTHxEj2yniulUY3CxB emYiLF2yoiEExvI8Jhkc4NTvG/jICVOsqP0dkMr/xh3cp1dVib3QcLjHyr5mMdmg9wAo PIwhqezOxtQfcZlAEawSIYM+USWdFciSlc0ZWRN3XuMsHnOu1h+Lhe8DZ9fLSrf6qnfn rNBQ== 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=cog61DgUF19ezk434CbGmX8pEcfwNsLy02YiQDy1ZlI1oTrdU5zUje3618RLQr2CG8 k7cw+B/n6dDfok+ra1n417RyLFlXzj+qGMKZH0ZPi4tyFvknm7yVKnHoDWnGPLB/dcyt HcSyY34GETTnl1SFEoKFOt3lMkfFdFGGhJzb87Zk7mpJrrCcY0lyd9eCdn8GfqCVh6uP MIKnze9Qak1aFTKMFFGzoQIQU4ypiLBnSQr5PPnHcJsQrGu9YcGrS4isI5jDJyFNIfcL 5L5mDZBzZQbzGnEs/Ezq291Tu0vhjjYdVBr7o3maSAdoqT8bM7PKn8eGVpfl2sP89vOl sLNg== 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 v1-v6sor1011379wmc.53.2018.07.27.07.03.34 for (Google Transport Security); Fri, 27 Jul 2018 07:03:34 -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: AAOMgpcBIboTEUwcb6wP210AtcdEurM/V+DENPIG4N3H4v88x1FelOMS2isMJCNkG6IK4LG0fEgTkg== X-Received: by 2002:a1c:7d58:: with SMTP id y85-v6mr4283926wmc.91.1532700214603; Fri, 27 Jul 2018 07:03:34 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id d14-v6sm5587085wrr.12.2018.07.27.07.03.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Jul 2018 07:03:33 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id E4F06124407; Fri, 27 Jul 2018 16:03:31 +0200 (CEST) From: osalvador@techadventures.net To: akpm@linux-foundation.org Cc: mhocko@suse.com, vbabka@suse.cz, pasha.tatashin@oracle.com, mgorman@techsingularity.net, aaron.lu@intel.com, iamjoonsoo.kim@lge.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, dan.j.williams@intel.com, Oscar Salvador Subject: [PATCH v4 3/4] mm/page_alloc: Inline function to handle CONFIG_DEFERRED_STRUCT_PAGE_INIT Date: Fri, 27 Jul 2018 16:03:24 +0200 Message-Id: <20180727140325.11881-4-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180727140325.11881-1-osalvador@techadventures.net> References: <20180727140325.11881-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 Fri Jul 27 14:03:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10547217 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 7971E174A for ; Fri, 27 Jul 2018 14:03:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67AF82BC41 for ; Fri, 27 Jul 2018 14:03:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B9C82BC50; Fri, 27 Jul 2018 14:03:48 +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 9CF232BC41 for ; Fri, 27 Jul 2018 14:03:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E5B1D6B0266; Fri, 27 Jul 2018 10:03:37 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DE4036B026D; Fri, 27 Jul 2018 10:03:37 -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 C34966B026C; Fri, 27 Jul 2018 10:03:37 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by kanga.kvack.org (Postfix) with ESMTP id 552EF6B0266 for ; Fri, 27 Jul 2018 10:03:37 -0400 (EDT) Received: by mail-wr1-f70.google.com with SMTP id v2-v6so3262445wrr.10 for ; Fri, 27 Jul 2018 07:03:37 -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=1mWj6kw4V2h85RIilg8mu7E83vFWeK2uvy+173htq1k=; b=mHTAfd3K+VFfH8JsClh/3JfdxPenk3voZ8pOTvhBe6KQ8Vp0P3F0hdHjGTcPzbB6/m ruR0N6gIC2qU14UA4RivQTmW3oP9DzIxppGZwRVt+vM6x7SFVhS9YdwOTtpshAm4152h alD0nTpBCQaEcDiVgZL7Yh/sm6Oq6z3Kh1Fpzh1dci1qYK455GADbL5gbtqTu3dorMr/ B1gTn8zFhzF9V3e52OZK54rvOD6h/agO60WrIrbeKtPEDs3t5FAnHART8LZW/wB6bPeV T98iNX0G5mMF2fBlIqlIi9pge3CzOLawA+28pWHhTKvefT5B6WvgZLvmPjGl9XbcycWZ a3wQ== 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: AOUpUlHCQbJnH+0mwQXb4VZ4YfVHxF0OAljn3bV5lGkTWnPbsm87AqFR WA5Fn8TgofyqHKB1K/3LtWi2spycn+DrRyXbVfp/rQ7+dcDU//uh9zycAcRo9KCHOO+P4NoE+TP gR+B+D64MsJyvgHZauQlbZ+Hv+A4W+A3udd1cmfvpZe961NBQwoaBW35FAgmRa4Qluqv38HtOQ7 ZECYizj9pCQUU3aIP0tgiotdngIbxN78hJgZ0VPPPgLsqoTlcaHAaI39oCctIdFCABMvlmorE+t Mi7w16KD5O3p8Qqw5KFTzOGy1yISavVEqV/+7QyZeKTtif483D18ct7vWVY7WaGDrtVVXtQwfod /PttNWka5vRoin97OCwDQcfZ0MOzuQwU1VHsMgTKp713wIHDo36GAYfrh0csfykAsKuVsOuMfQ= = X-Received: by 2002:a1c:1d2:: with SMTP id 201-v6mr4180484wmb.4.1532700216794; Fri, 27 Jul 2018 07:03:36 -0700 (PDT) X-Received: by 2002:a1c:1d2:: with SMTP id 201-v6mr4180445wmb.4.1532700215889; Fri, 27 Jul 2018 07:03:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532700215; cv=none; d=google.com; s=arc-20160816; b=TLWs4BzdczsF+HWLB+VJQ2VxMwQL0erck6ApamU3CSKGrSxwgFAjGkrDQWp2TKdybk kY0BiCJ7BFtGuBdZpmtbIoWXWj857n2vi7vVG+U5726oblxU/+N4Pxhvw8nMwFpAMcn3 NezWPtgtoHRpqBCi/uF9eeAmloaMhO+RWy+bwZgGO7DwxlDV5McncYsidUDL76vvh4nh 81xMjK77B6+IqRuOyIcMnwwJR4EkkyDS6NLxefLfys72EfPWyABNrnVwAdxWly/Aa0TK BubITrRgpHiJh9YwRLUldc4TmesIzg2fnquwhQE/IW9LsggZWgbLBPC6Kfb8sJhxmdEc OAkg== 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=1mWj6kw4V2h85RIilg8mu7E83vFWeK2uvy+173htq1k=; b=BDtUnaPU5u085p9eawaxOxpCbbK5OloAyqAuxMh4icHtgoPCBtowGLa/mCRqq8Dowb V0+cYk5sbGWaSMyl+kkuKKQ8V5IPdQLrBtQotvCeMoc6Ln/h0KH5efcvn9hHUnHmV2Oc hWM2UXCPUBbtJAeGvt4GQBfRg480K5oF2gyvLfL0nbfceFYIuo975Sbqe7wbXAnyufw8 xRuE+/SIJHUFD/TawPRXn59DyJPClQ+VfFeTNNgXRKj/S3/+t+ldBsPFFCCXoJSggGwk O2huK4d2/U3AzSuBATTw1uXMJKWAbGa1PQ1cPK4SvrYKpLjwbQ6mhEWr/ctojlQpUSPB ZmDQ== 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 a15-v6sor1749329wrr.42.2018.07.27.07.03.35 for (Google Transport Security); Fri, 27 Jul 2018 07:03:35 -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: AAOMgpfUJJvRvmCT2Mc+92rmgnxn+PWpByVmqTBQMVS7HpB76XDjnxI6WAN1mu98Ick9u7l0mNgpWg== X-Received: by 2002:adf:96c3:: with SMTP id u61-v6mr4838403wrb.72.1532700215535; Fri, 27 Jul 2018 07:03:35 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id b126-v6sm6507972wmf.41.2018.07.27.07.03.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Jul 2018 07:03:33 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 29F14124408; Fri, 27 Jul 2018 16:03:32 +0200 (CEST) From: osalvador@techadventures.net To: akpm@linux-foundation.org Cc: mhocko@suse.com, vbabka@suse.cz, pasha.tatashin@oracle.com, mgorman@techsingularity.net, aaron.lu@intel.com, iamjoonsoo.kim@lge.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, dan.j.williams@intel.com, Oscar Salvador Subject: [PATCH v4 4/4] mm/page_alloc: Introduce free_area_init_core_hotplug Date: Fri, 27 Jul 2018 16:03:25 +0200 Message-Id: <20180727140325.11881-5-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180727140325.11881-1-osalvador@techadventures.net> References: <20180727140325.11881-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() will now only get called during early init, let us replace __paginginit with __init, so its code gets freed up. Signed-off-by: Oscar Salvador Reviewed-by: Pavel Tatashin --- include/linux/mm.h | 4 +++ mm/memory_hotplug.c | 16 ++++-------- mm/page_alloc.c | 71 ++++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 60 insertions(+), 31 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 6954ad183159..17bab044c1bc 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2002,6 +2002,10 @@ extern void 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 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..4e386423622a 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,56 @@ 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 __paginginit free_area_init_core_hotplug(int nid) +{ + enum zone_type j; + pg_data_t *pgdat = NODE_DATA(nid); + + pgdat_init_internals(pgdat); + for (j = 0; j < MAX_NR_ZONES; j++) { + struct zone *zone = pgdat->node_zones + j; + zone_init_internals(zone, j, 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 +6347,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;