From patchwork Fri Jun 1 12:53:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10443283 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 7225A601D3 for ; Fri, 1 Jun 2018 12:54:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 640B028D8D for ; Fri, 1 Jun 2018 12:54:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5762528D8F; Fri, 1 Jun 2018 12:54:19 +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 BDC9928D8D for ; Fri, 1 Jun 2018 12:54:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4ACE56B000A; Fri, 1 Jun 2018 08:54:14 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4367B6B000C; Fri, 1 Jun 2018 08:54:14 -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 265086B000D; Fri, 1 Jun 2018 08:54:14 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr0-f198.google.com (mail-wr0-f198.google.com [209.85.128.198]) by kanga.kvack.org (Postfix) with ESMTP id B615B6B000A for ; Fri, 1 Jun 2018 08:54:13 -0400 (EDT) Received: by mail-wr0-f198.google.com with SMTP id x14-v6so740311wrr.17 for ; Fri, 01 Jun 2018 05:54:13 -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=Z3KtF3LrFtGYPFpcV/8u3LeYezNNFt5AkeGNPRR7YfnUsJUk34xL89pCNyK3ayRMSS TpvUElw2zsZqpj1EVjILV/HLi1RcTHhDxBEa4wBHcCqcSXkigckaJp+MOLS9TWGp+TyT euMpTau+6orQGir5sS8jIh5wfKqBDMpwZIgaJ3+9gPjP6u1rgobrmih9BQW2dYpew1yI Zpd8fkvpfOqUPpMBoPhGnIzdrL4P61biGQ7FvA7m2iuQUAn9edMdXnBJwkkFlwJgpn8r FoDiveqWBOgJfvmPJwEkU+QVhchPGDp3ZeXagX8QXXsoPSZv0NK/ZSODtzsBHeeMDjBd Ov3g== 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: APt69E3JyukgGYd68hCQNiuyPr3HY6YGDmi9gWWMHBgehCssxgB92urD +v+pxCZjk5KMRI1pyKWyQVyEFK/wPwxkSuhMfDUkggkeaUckn8/IituB1xLhDbqIr8/iRPG4Vdm aLC/4CePa2eqLzq8/QFNiRmYji/nev6fYzrjC/Haqgl5EmUGi316f0fj1ZZK50il+sQNgrdco/z 7WB4wRi4ENEMsc1jF7spS6I2hAxkt2Aue6nT9PtBGSPZIdfS/L1aR26hIa4bdkWMIE3WxrYsMJL Hfk2ZnNCrT7G88iiXu8avGiLkybUCLaUHGYmDDSnd8E9wmXSzddHMHCw0IiMMzl9ZMPh5HEcFCN 5QZdgFIiLGCk44E1jDZ2nbkMBzFMOVvL30V3le+hcjir6252eQ5U5ms4gDrBMhypFfnMzaYBiA= = X-Received: by 2002:a1c:5c11:: with SMTP id q17-v6mr2840588wmb.24.1527857653278; Fri, 01 Jun 2018 05:54:13 -0700 (PDT) X-Received: by 2002:a1c:5c11:: with SMTP id q17-v6mr2840557wmb.24.1527857652425; Fri, 01 Jun 2018 05:54:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527857652; cv=none; d=google.com; s=arc-20160816; b=szJXntnGNMaCXVq9lFsqA1yeNkAooEUsEyVm8wwvaG2ybX/U6RBHWTiLoMUbmm4NEf CrUECcPt4r/VwzkhyTESkU5Sa4viHeE5AHmz+kcJwKsUDsN1hDoBEt8AExAhFsSI4/o9 LIhqOPDAJjMbdtWi0df38/4Ycw7eP18qYtgIw6kakt9tZKF9lbeIR6Z8PlTYPx6dJ/Dy RMobAnx4/lymhb2foDvm7A/cHrG9eTwv/X68dmLB/OrYaBd6WxcRF+kUSYE+zhTW03Au yFEq5ErET8d06+EvtNRzt/iNaaLuSP072VIOn0Rdzz+kqL6R8HoWIuBBqNI0TokWqxKP RODg== 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=XE57FPo7/0jWBYIYCdAOsUd0AjHPLIZebb/t9DLfvBdPl6VyxmADhDM/aVPEqu0USs AKnucTqb2oiIECxbYlRiF9vCuFZEl7CzfWwPZJvL+4ctbIPSBiucwYQJEaSIF8mCq68L QMZYLu8OdqNN3090QXYEevrvJ81MLAylWdqqDy+qPVn1PTOPUvtoTByy1czCQMIjMjUm mRv9b3k7cpWTJaPgNE9TDkY64s4ECa/v2jMYh/EkZqwS3uI3FFJ+yCYb1FmiVJHX8bce z5VOfv2mCx3ZRvKKHP8lL+dgdvg7QQRQUm+raT0cDIpD798rjM5fdHooQdOY/EUMlym5 /TyQ== 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 g12-v6sor20574057wrm.79.2018.06.01.05.54.12 for (Google Transport Security); Fri, 01 Jun 2018 05:54:12 -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: ADUXVKLHFIGy00QwBGtSG9uI74Chwx5rkCYS7lRVLc2TjujHbhPpMIqjN/XXMXYEXDS8mQZQ9VfD5Q== X-Received: by 2002:adf:ba8f:: with SMTP id p15-v6mr1462435wrg.139.1527857651757; Fri, 01 Jun 2018 05:54:11 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id b15-v6sm39290934wri.14.2018.06.01.05.54.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jun 2018 05:54:10 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 10ECE12317C; Fri, 1 Jun 2018 14:54:09 +0200 (CEST) From: osalvador@techadventures.net To: akpm@linux-foundation.org Cc: mhocko@suse.com, vbabka@suse.cz, pasha.tatashin@oracle.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Oscar Salvador Subject: [PATCH 3/4] mm/memory_hotplug: Get rid of link_mem_sections Date: Fri, 1 Jun 2018 14:53:20 +0200 Message-Id: <20180601125321.30652-4-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180601125321.30652-1-osalvador@techadventures.net> References: <20180601125321.30652-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;