From patchwork Mon May 28 07:52:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10430019 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 771FC602CC for ; Mon, 28 May 2018 07:53:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C0F9285CC for ; Mon, 28 May 2018 07:53:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5045428B56; Mon, 28 May 2018 07:53: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 629AB285CC for ; Mon, 28 May 2018 07:53:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8B19E6B0006; Mon, 28 May 2018 03:53:16 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 83BEA6B0007; Mon, 28 May 2018 03:53:16 -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 751B86B0008; Mon, 28 May 2018 03:53:16 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr0-f199.google.com (mail-wr0-f199.google.com [209.85.128.199]) by kanga.kvack.org (Postfix) with ESMTP id 1C4436B0006 for ; Mon, 28 May 2018 03:53:16 -0400 (EDT) Received: by mail-wr0-f199.google.com with SMTP id w8-v6so9848189wrn.10 for ; Mon, 28 May 2018 00:53:16 -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=uVzkmJho0mmxcoNLN+dxpeA83laXZm3/oL7+f6P5mw0=; b=Dor4ppWjhrjpBZ3PRzkUu4x1mj3ygTk76uLpzh1JtywLOxeSDFa8uPO5DEfezNpQvL 3Tjlp+hAJ1OzjWoUOhxPkmvkfKugHpraN78jt7pSX8lY2NWDlhZsCZzse8xw2IDGtF0B ijmCILfkOacESkq+6OtNZPPb0x37zOhOF706pry6lK+x2SRbQ8RVwoEUYfIR1wg+45B3 wltPgQ5pUq1+rm0m2sWnZnpNaZFq2+l4IWIhgW49H38vS1gLWMppMH/y8Cnd5h/JEphJ VgBbjvfwXdpa6xvzPGmFiheKNob/yhQi3bQug2+LlhyyTjb9Aj0xlH2wXU8mDlravvl9 Gk8A== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador@techadventures.net designates 62.201.165.239 as permitted sender) smtp.mailfrom=osalvador@techadventures.net X-Gm-Message-State: ALKqPwenACXOG6tQQnZ70pQhrWQXJ3YwJ0YEGi1czQwe9Vp4TdCmasrx l6mdx1nODjlgADwPm6R/kbCFABNA/daiJsVG+WMJfC1XeYx7Y/vvezJgl+4Ql8cWSRR5M2H2tes rKPUBIRtfYWnZVYa1m5tju4+kjkcIwrK/AzhqLosyQsUKYLqWSHsgonbKt4xZ0VlbDg== X-Received: by 2002:a1c:6d47:: with SMTP id i68-v6mr8702792wmc.154.1527493995602; Mon, 28 May 2018 00:53:15 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKTIlOcGISGjVdaguoo7JleDFzM4lmVBlDOcoYftW78mtAHBSGXQgFLKUL4bPd0hQjPn12F X-Received: by 2002:a1c:6d47:: with SMTP id i68-v6mr8702761wmc.154.1527493994838; Mon, 28 May 2018 00:53:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527493994; cv=none; d=google.com; s=arc-20160816; b=B2hdXBWxuq857d98XFoA+osuf7oyZucqWjU8dTlp3i1+Z64CPu1G1bLLiTH4t5Fm6r TxDJZCNj+JzIT5d4I/ONxw8w5HnzHFb7zHwn37k/YwcTuIDZpVXElOZpanBd+NLtgcxO OjWONCe92wabXI5dpw/qGsSGgDWR5gEdUOnWWLaNMY1e9FM8T94TAGgxjtjnYLpJ4eLT MCpZhneVLCFuFvKle2rAgmy3zGiv0McBKJOd5TSzKwbdfkjrflZ0Evf/7RurU5Om21XA PBzk+C1hVfEdkz5wo9x/Tn+ndBEHU7rMGFOzjXVR02s5LgOaX4TS0sPLUuG+k256F9j9 RlBw== 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=uVzkmJho0mmxcoNLN+dxpeA83laXZm3/oL7+f6P5mw0=; b=LKPfLVsS5NuOHeM8hie1C/765AH+Nu2vQmNX6SZ90u/7DUPBm8HKH05+QwhErRcE89 eZUA/GQim9TEmKmId83H5ccYun/j/pboM4jpe117sZ6wOikB8/mWJyBvZQcQt5cLT1cz 2XPRORQpVe0DodmN9IkO0xGqViaTNV6drPQUPkydK3RJeUfjh/JNSmgN+FvZPt2nqaax fXC/p/rEN7LmPMxm7GfZ8/WcWUL8yqEyHpnSP2qxjUM/uLTFSTFFy2pDdlJadazsoT79 za2bm1/In70TIlOl2QG6sQ7Kvni344adxMe8TULMGnr7sY4Y5C1BIkOW35h5TTcznNF8 rDXg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of osalvador@techadventures.net designates 62.201.165.239 as permitted sender) smtp.mailfrom=osalvador@techadventures.net Received: from techadventures.net (techadventures.net. [62.201.165.239]) by mx.google.com with ESMTP id y25-v6si6281013wrd.203.2018.05.28.00.53.14 for ; Mon, 28 May 2018 00:53:14 -0700 (PDT) Received-SPF: pass (google.com: domain of osalvador@techadventures.net designates 62.201.165.239 as permitted sender) client-ip=62.201.165.239; Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador@techadventures.net designates 62.201.165.239 as permitted sender) smtp.mailfrom=osalvador@techadventures.net Received: from d104.suse.de (charybdis-ext.suse.de [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 7888E122FBA; Mon, 28 May 2018 09:53:14 +0200 (CEST) From: osalvador@techadventures.net To: linux-mm@kvack.org Cc: mhocko@suse.com, vbabka@suse.cz, pasha.tatashin@oracle.com, akpm@linux-foundation.org, Oscar Salvador Subject: [RFC PATCH 3/3] mm/memory_hotplug: Get rid of link_mem_sections Date: Mon, 28 May 2018 09:52:37 +0200 Message-Id: <20180528075237.18105-4-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180528075237.18105-1-osalvador@techadventures.net> References: <20180528075237.18105-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 link_mem_sections() and walk_memory_range() share most of the code, so we can use walk_memory_range() with a callback to register_mem_sect_under_node() instead of using link_mem_sections(). To control whether the node id must be check, two new functions has been added: register_mem_sect_under_node_nocheck_node() and register_mem_sect_under_node_check_node() They both call register_mem_sect_under_node_check() with the parameter check_nid set to true or false. Signed-off-by: Oscar Salvador --- drivers/base/node.c | 47 ++++++++++------------------------------------- include/linux/node.h | 21 +++++++++------------ mm/memory_hotplug.c | 8 ++++---- 3 files changed, 23 insertions(+), 53 deletions(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index a5e821d09656..248c712e8de5 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -398,6 +398,16 @@ static int __ref get_nid_for_pfn(unsigned long pfn) return pfn_to_nid(pfn); } +int register_mem_sect_under_node_check_node(struct memory_block *mem_blk, void *nid) +{ + return register_mem_sect_under_node (mem_blk, *(int *)nid, true); +} + +int register_mem_sect_under_node_nocheck_node(struct memory_block *mem_blk, void *nid) +{ + return register_mem_sect_under_node (mem_blk, *(int *)nid, false); +} + /* register memory section under specified node if it spans that node */ int register_mem_sect_under_node(struct memory_block *mem_blk, int nid, bool check_nid) @@ -490,43 +500,6 @@ int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, return 0; } -int link_mem_sections(int nid, unsigned long start_pfn, unsigned long nr_pages, - bool check_nid) -{ - unsigned long end_pfn = start_pfn + nr_pages; - unsigned long pfn; - struct memory_block *mem_blk = NULL; - int err = 0; - - for (pfn = start_pfn; pfn < end_pfn; pfn += PAGES_PER_SECTION) { - unsigned long section_nr = pfn_to_section_nr(pfn); - struct mem_section *mem_sect; - int ret; - - if (!present_section_nr(section_nr)) - continue; - mem_sect = __nr_to_section(section_nr); - - /* same memblock ? */ - if (mem_blk) - if ((section_nr >= mem_blk->start_section_nr) && - (section_nr <= mem_blk->end_section_nr)) - continue; - - mem_blk = find_memory_block_hinted(mem_sect, mem_blk); - - ret = register_mem_sect_under_node(mem_blk, nid, check_nid); - if (!err) - err = ret; - - /* discard ref obtained in find_memory_block() */ - } - - if (mem_blk) - kobject_put(&mem_blk->dev.kobj); - return err; -} - #ifdef CONFIG_HUGETLBFS /* * Handle per node hstate attribute [un]registration on transistions diff --git a/include/linux/node.h b/include/linux/node.h index 6d336e38d155..1158bea9be52 100644 --- a/include/linux/node.h +++ b/include/linux/node.h @@ -31,19 +31,11 @@ struct memory_block; extern struct node *node_devices[]; typedef void (*node_registration_func_t)(struct node *); -#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_NUMA) -extern int link_mem_sections(int nid, unsigned long start_pfn, - unsigned long nr_pages, bool check_nid); -#else -static inline int link_mem_sections(int nid, unsigned long start_pfn, - unsigned long nr_pages, bool check_nid) -{ - return 0; -} -#endif - extern void unregister_node(struct node *node); #ifdef CONFIG_NUMA +#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) +extern int register_mem_sect_under_node_check_node(struct memory_block *mem_blk, void *nid); +#endif /* Core of the node registration - only memory hotplug should use this */ extern int __register_one_node(int nid); @@ -54,12 +46,17 @@ static inline int register_one_node(int nid) if (node_online(nid)) { struct pglist_data *pgdat = NODE_DATA(nid); + unsigned long start = pgdat->node_start_pfn; + unsigned long size = pgdat->node_spanned_pages; error = __register_one_node(nid); if (error) return error; /* link memory sections under this node */ - error = link_mem_sections(nid, pgdat->node_start_pfn, pgdat->node_spanned_pages, true); +#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) + error = walk_memory_range(PFN_DOWN(start), PFN_UP(start + size - 1), + (void *)&nid, register_mem_sect_under_node_check_node); +#endif } return error; diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index f84ef96175ab..ac21dc506b84 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -40,6 +40,8 @@ #include "internal.h" +extern int register_mem_sect_under_node_nocheck_node(struct memory_block *mem_blk, void *nid); + /* * online_page_callback contains pointer to current page onlining function. * Initially it is generic_online_page(). If it is required it could be @@ -1118,7 +1120,6 @@ int __ref add_memory_resource(int nid, struct resource *res, bool online) u64 start, size; bool new_node; int ret; - unsigned long start_pfn, nr_pages; start = res->start; size = resource_size(res); @@ -1157,9 +1158,8 @@ int __ref add_memory_resource(int nid, struct resource *res, bool online) } /* link memory sections under this node.*/ - start_pfn = start >> PAGE_SHIFT; - nr_pages = size >> PAGE_SHIFT; - ret = link_mem_sections(nid, start_pfn, nr_pages, false); + ret = walk_memory_range(PFN_DOWN(start), PFN_UP(start + size - 1), + (void *)&nid, register_mem_sect_under_node_nocheck_node); if (ret) goto register_fail;