From patchwork Wed Sep 14 07:26:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12975714 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D57F9ECAAD8 for ; Wed, 14 Sep 2022 07:31:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 620CB6B0071; Wed, 14 Sep 2022 03:31:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5CFF66B0073; Wed, 14 Sep 2022 03:31:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 497B980008; Wed, 14 Sep 2022 03:31:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 360756B0071 for ; Wed, 14 Sep 2022 03:31:51 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 1338A120972 for ; Wed, 14 Sep 2022 07:31:51 +0000 (UTC) X-FDA: 79909871622.16.0228985 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf23.hostedemail.com (Postfix) with ESMTP id C3DAD1400BB for ; Wed, 14 Sep 2022 07:31:50 +0000 (UTC) Received: by mail-pj1-f45.google.com with SMTP id n23-20020a17090a091700b00202a51cc78bso11788021pjn.2 for ; Wed, 14 Sep 2022 00:31:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=jc7xFT6mhtnxrIEcMacUso/5x0NDvllgocyZuMTs7Rc=; b=6VcGImYWSjqml2cSlokYPvwgthXECIOs37Mjs04Q/DenMtHS9gP1vL/El5NgBY56Tz Si9trp78ZA5dD11/pNy+izfOnvG/EKjO/2qMNHe5zNgm8SZsfVVnQgaqJiX6oRo9O8L6 FLwqZQ8ualYx2JMrIHjHmFvx3+z9bPLieJOh9ptv+OldMugQm0CJdv+PRLXuZ9TriCVI +JN9zvSqpnwgo9NO2wZdOMkShnJwkrcGwnnKH6xjWEcgRpKzUj14Dx3lZh++3MzLL7DM ARFZSsY2TlO35kdd4KZxRqI5zyaNEFlLyC3mfcPv/ld+gdTKCND38XP2zEwOOah+f2Nr znLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=jc7xFT6mhtnxrIEcMacUso/5x0NDvllgocyZuMTs7Rc=; b=UV+qLvtk2pTKppOVJZ2xrEeCoUotPNn6isdoQ8BB4ydsEtglvACcrKDBSyeoMxZjW2 z2NJpphec0oDMLbVmkmyKKTjb94zJrQ9R7mIv3pLXxteRXBvA24SllguwuDfLtNE/wrP jOGKl8nRgNV3JFFZV3eOGujqKD7L56lKHfa/2fqZtA4XrZpK8sS8lPxcvEmtXyCmnuwU uKxQdQmDrertXNJnGn4Zd9BOX4zf8nv9EUO+lMMOzasXXcDziZjDM8eJsTlrvHDIUclz 2/KhSpDSnwiG2zRnJDKAMQnpfwnlGEWHq1WdY30iO8oyvUkTSnigG0ogAxc3oR2bLQeY bDuA== X-Gm-Message-State: ACrzQf1MuM6aYg80ZzEdx6nI/kPgyVOC4PGeZ0h32w0zlTSRFauuxs3P ASzhuDYfbmKPb0vKbHX2isFHqg== X-Google-Smtp-Source: AMsMyM7NM3FoOoIfAL9hv+Njip2AbwzjblRZxDATyRfFMcTjFPnd+J48jJUZgpPNA0FjZTNUelAKtw== X-Received: by 2002:a17:90b:3142:b0:202:eaca:8aed with SMTP id ip2-20020a17090b314200b00202eaca8aedmr3246114pjb.175.1663140709815; Wed, 14 Sep 2022 00:31:49 -0700 (PDT) Received: from PXLDJ45XCM.bytedance.net ([61.120.150.76]) by smtp.gmail.com with ESMTPSA id e2-20020a170902784200b001754cfb5e21sm9831042pln.96.2022.09.14.00.31.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 14 Sep 2022 00:31:49 -0700 (PDT) From: Muchun Song To: gregkh@linuxfoundation.org, rafael@kernel.org, mike.kravetz@oracle.com, songmuchun@bytedance.com, akpm@linux-foundation.org, osalvador@suse.de, david@redhat.com, ying.huang@intel.com, aneesh.kumar@linux.ibm.com, rientjes@google.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, muchun.song@linux.dev Subject: [PATCH v4 2/2] mm: hugetlb: eliminate memory-less nodes handling Date: Wed, 14 Sep 2022 15:26:03 +0800 Message-Id: <20220914072603.60293-3-songmuchun@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20220914072603.60293-1-songmuchun@bytedance.com> References: <20220914072603.60293-1-songmuchun@bytedance.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663140710; a=rsa-sha256; cv=none; b=F52sgfNcDKWgGVHfP6dUU0ajtBfdcPTN8D7nPfYIz5mY1OTzGvRRd17SozAzfpFZNl3THu bN5LGIFFxAH8o5y1MG+S/NF+RWi1nYXi633uSj7gjoRTS3URZWC7y2Tfd7igbWlTNQxTzY jG5R96GhRe0WmZYwaJzDvd85JD9BAK8= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=6VcGImYW; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf23.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663140710; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=jc7xFT6mhtnxrIEcMacUso/5x0NDvllgocyZuMTs7Rc=; b=2k5llBOzLg1GBSJqCALEDvYXy4PrwhuQLKA1/fDljM0g+9n02qrlC4gInrF0LRr60Xel6U OJp+PsNm4tGrQClCRoh3VA1HSbJ9xCtWbzVR7fPv280EYnI3PsTvrcCDuxBZyiflEy6y2w 0Rwpg7/DzrnjiZ9PmcEzcEaO3tNsTUE= X-Rspam-User: Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=6VcGImYW; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf23.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com X-Rspamd-Server: rspam11 X-Stat-Signature: 6h595m4th9mar6wj5yf9ihhxrp6purmy X-Rspamd-Queue-Id: C3DAD1400BB X-HE-Tag: 1663140710-488107 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: The memory-notify-based approach aims to handle meory-less nodes, however, it just adds the complexity of code as pointed by David in thread [1]. The handling of memory-less nodes is introduced by commit 4faf8d950ec4 ("hugetlb: handle memory hot-plug events"). From its commit message, we cannot find any necessity of handling this case. So, we can simply register/unregister sysfs entries in register_node/unregister_node to simlify the code. BTW, hotplug callback added because in hugetlb_register_all_nodes() we register sysfs nodes only for N_MEMORY nodes, seeing commit 9b5e5d0fdc91, which said it was a preparation for handling memory-less nodes via memory hotplug. Since we want to remove memory hotplug, so make sure we only register per-node sysfs for online (N_ONLINE) nodes in hugetlb_register_all_nodes(). https://lore.kernel.org/linux-mm/60933ffc-b850-976c-78a0-0ee6e0ea9ef0@redhat.com/ [1] Suggested-by: David Hildenbrand Signed-off-by: Muchun Song Acked-by: David Hildenbrand --- v4: - Remove hugetlb_mark_sysfs_initialized() helper per David. v3: - Fix 'struct node' is not declared reported by LTP. v2: - Move declaration of function related to hugetlb to hugetlb.h (David). - Introduce hugetlb_sysfs_initialized() and call it from hugetlb_sysfs_init() (David). - Move hugetlb_register_all_nodes() into hugetlb_sysfs_init() (David). - Fix implicit-function-declaration reported by LKP. - Register per-node sysfs for online (N_ONLINE) nodes instead of N_MEMORY (Aneesh). drivers/base/node.c | 8 ++++-- include/linux/hugetlb.h | 14 ++++++++++ mm/hugetlb.c | 70 ++++++++++++++++++++----------------------------- 3 files changed, 49 insertions(+), 43 deletions(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index ed391cb09999..80b1e91b9608 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -20,6 +20,7 @@ #include #include #include +#include static struct bus_type node_subsys = { .name = "node", @@ -608,10 +609,12 @@ static int register_node(struct node *node, int num) node->dev.groups = node_dev_groups; error = device_register(&node->dev); - if (error) + if (error) { put_device(&node->dev); - else + } else { + hugetlb_register_node(node); compaction_register_node(node); + } return error; } @@ -625,6 +628,7 @@ static int register_node(struct node *node, int num) */ void unregister_node(struct node *node) { + hugetlb_unregister_node(node); compaction_unregister_node(node); node_remove_accesses(node); node_remove_caches(node); diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 890f7b6a2eff..a6fc49db0ce0 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -16,6 +16,7 @@ struct ctl_table; struct user_struct; struct mmu_gather; +struct node; #ifndef is_hugepd typedef struct { unsigned long pd; } hugepd_t; @@ -935,6 +936,11 @@ static inline void huge_ptep_modify_prot_commit(struct vm_area_struct *vma, } #endif +#ifdef CONFIG_NUMA +void hugetlb_register_node(struct node *node); +void hugetlb_unregister_node(struct node *node); +#endif + #else /* CONFIG_HUGETLB_PAGE */ struct hstate {}; @@ -1109,6 +1115,14 @@ static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte) { } + +static inline void hugetlb_register_node(struct node *node) +{ +} + +static inline void hugetlb_unregister_node(struct node *node) +{ +} #endif /* CONFIG_HUGETLB_PAGE */ static inline spinlock_t *huge_pte_lock(struct hstate *h, diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 0a37e80730b7..d776d55a97b2 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3869,24 +3869,8 @@ static int hugetlb_sysfs_add_hstate(struct hstate *h, struct kobject *parent, return 0; } -static void __init hugetlb_sysfs_init(void) -{ - struct hstate *h; - int err; - - hugepages_kobj = kobject_create_and_add("hugepages", mm_kobj); - if (!hugepages_kobj) - return; - - for_each_hstate(h) { - err = hugetlb_sysfs_add_hstate(h, hugepages_kobj, - hstate_kobjs, &hstate_attr_group); - if (err) - pr_err("HugeTLB: Unable to add hstate %s", h->name); - } -} - #ifdef CONFIG_NUMA +static bool hugetlb_sysfs_initialized __ro_after_init; /* * node_hstate/s - associate per node hstate attributes, via their kobjects, @@ -3942,7 +3926,7 @@ static struct hstate *kobj_to_node_hstate(struct kobject *kobj, int *nidp) * Unregister hstate attributes from a single node device. * No-op if no hstate attributes attached. */ -static void hugetlb_unregister_node(struct node *node) +void hugetlb_unregister_node(struct node *node) { struct hstate *h; struct node_hstate *nhs = &node_hstates[node->dev.id]; @@ -3972,12 +3956,15 @@ static void hugetlb_unregister_node(struct node *node) * Register hstate attributes for a single node device. * No-op if attributes already registered. */ -static void hugetlb_register_node(struct node *node) +void hugetlb_register_node(struct node *node) { struct hstate *h; struct node_hstate *nhs = &node_hstates[node->dev.id]; int err; + if (!hugetlb_sysfs_initialized) + return; + if (nhs->hugepages_kobj) return; /* already allocated */ @@ -3999,23 +3986,6 @@ static void hugetlb_register_node(struct node *node) } } -static int __meminit hugetlb_memory_callback(struct notifier_block *self, - unsigned long action, void *arg) -{ - struct memory_notify *mnb = arg; - int nid = mnb->status_change_nid; - - if (nid == NUMA_NO_NODE) - return NOTIFY_DONE; - - if (action == MEM_GOING_ONLINE) - hugetlb_register_node(node_devices[nid]); - else if (action == MEM_CANCEL_ONLINE || action == MEM_OFFLINE) - hugetlb_unregister_node(node_devices[nid]); - - return NOTIFY_OK; -} - /* * hugetlb init time: register hstate attributes for all registered node * devices of nodes that have memory. All on-line nodes should have @@ -4025,11 +3995,8 @@ static void __init hugetlb_register_all_nodes(void) { int nid; - get_online_mems(); - hotplug_memory_notifier(hugetlb_memory_callback, 0); - for_each_node_state(nid, N_MEMORY) + for_each_online_node(nid) hugetlb_register_node(node_devices[nid]); - put_online_mems(); } #else /* !CONFIG_NUMA */ @@ -4053,6 +4020,28 @@ static inline __init void hugetlb_cma_check(void) } #endif +static void __init hugetlb_sysfs_init(void) +{ + struct hstate *h; + int err; + + hugepages_kobj = kobject_create_and_add("hugepages", mm_kobj); + if (!hugepages_kobj) + return; + + for_each_hstate(h) { + err = hugetlb_sysfs_add_hstate(h, hugepages_kobj, + hstate_kobjs, &hstate_attr_group); + if (err) + pr_err("HugeTLB: Unable to add hstate %s", h->name); + } + +#ifdef CONFIG_NUMA + hugetlb_sysfs_initialized = true; +#endif + hugetlb_register_all_nodes(); +} + static int __init hugetlb_init(void) { int i; @@ -4107,7 +4096,6 @@ static int __init hugetlb_init(void) report_hugepages(); hugetlb_sysfs_init(); - hugetlb_register_all_nodes(); hugetlb_cgroup_file_init(); #ifdef CONFIG_SMP