From patchwork Fri Jun 22 11:18:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10481895 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 502B86023A for ; Fri, 22 Jun 2018 11:19:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B59D28BCD for ; Fri, 22 Jun 2018 11:19:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2FCC828C03; Fri, 22 Jun 2018 11:19:41 +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 8921E28BCD for ; Fri, 22 Jun 2018 11:19:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 15F1C6B000D; Fri, 22 Jun 2018 07:19:36 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0C0366B000E; Fri, 22 Jun 2018 07:19: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 E7F3F6B0010; Fri, 22 Jun 2018 07:19:35 -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 865736B000E for ; Fri, 22 Jun 2018 07:19:35 -0400 (EDT) Received: by mail-wr0-f198.google.com with SMTP id e5-v6so2858932wro.2 for ; Fri, 22 Jun 2018 04:19: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=7q+SCyX9fRTSy1u3QcDJ7kGaY8FPsouPHIsB2fPXOb4=; b=IJ363tTFFSoMsxr2NVyMCDC5vplB69oNxZq9o/lRR9xbMsi+8tZAekWrIgxj+krmVP Otf0hOKJ0VGe/4mvfhvzlnEiCvDVThAMLidFl+lRoxyvXhbAf8eB0OTGDIq8XPJhTXgB mk1k/6aE8+l+2OwVvKH1QwS5O8WCKTqu1ZaQgFVM6s7tTPbXZwfr17QE0bEjKKQpKbjN RywMm4BeqC3MJCtDFu7bSmvqvFUy9M7L1uYgX557RTH1Prsz2agCjYLj4FZbT5NYH6Pt DEb3NL/C5W3OgVa7/cGj8qtlWsBH0XifGT3y33K5PflyJ8CJQ4ErvLiZ6Q91Z/Ao5cGk 3IQw== 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: APt69E1o1uSUgVYWIPt6ochFldgjkacF1NVksp9r/bUDeiw/59DoP1U4 LmOYgewFaSz/BSaVGzGRNFJHyDsC3lTsQ7+ceBo+WACL7g1tdqmgnGILlVv8lY98N9qB+Ygp4TH iZF5Hg6odlx57itgnvHNET2aHspq4F6xfbpTxWw0jBu4sMiXT8PtonCatPIyuQesR/o9r/5NF/w Vow77hrtXZQ/mOx/FvXA3rhr6qXP8/Wwx3LYxR9RN+Fl1gIQ/KKU0VDmIXxPP9/ej9yFaE0g179 Lz+9hlAVpHUCRmx/k60gkrUkZ3OHjqUlRCUZo2hGy8EpRaLnzvv3AqlwjI2kjRH/D48GVT3r4SX QqUXHTIeZqSDSZKcFabjHP/vtPUDT/R+88UpuldISwrteJgtzqa1BuIWZ9CW868oEKTSzFJ2wQ= = X-Received: by 2002:a1c:954d:: with SMTP id x74-v6mr1428426wmd.57.1529666375080; Fri, 22 Jun 2018 04:19:35 -0700 (PDT) X-Received: by 2002:a1c:954d:: with SMTP id x74-v6mr1428383wmd.57.1529666374214; Fri, 22 Jun 2018 04:19:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529666374; cv=none; d=google.com; s=arc-20160816; b=igjqA30GtA9SEiYpje9+XM3F/GXSujvE94pDWZiMWx6sh/NOqLJ/bDET1uEvPNu8yk GT4Uua9Ps4M+QGYMQH6JYsuglSthYaXK2/vVrODyomGgnpN5J8K8V/0GmN8aRajFqZsM RJXdw992dpKiSfoUDKACRVPo8GSig7d5KT16wPiNUN4Hls9sCzD4ezTRnzJxpmmpRmUH /ELOSNhFFH0PcV+ExWbv3bMZb/EPvZm5/er3+7i5HWeJ2mMS4GUXeVFdAcvtX8Pl78mV LhsulI9uFD0l18di07Amg0elk+90XetOIqu2w/DDqdD6SIaACsR1u/uYKxZXMn11K9pR 9SeA== 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=7q+SCyX9fRTSy1u3QcDJ7kGaY8FPsouPHIsB2fPXOb4=; b=fbNfJVE/e0W9gUrgVjsJ8JOpiauZLDVA4LjmIn6qUVlocqgTwja/sC++GmDmqobBsI k99Z5EVtxAWgmI5BGnHiHJyxHLHLEA9klQVmYKiw7BmLQWmbOnnlxZeiilrAq32n3xsQ orQhjJlN/9a8G1hp7rnsL9aTOVuUt2u+qME2N+hOJxI6nRMRmDEluj+d8f/o0BzrQmlw Ab9zoS205fkkhC5ljH2s4vi0c2fuztVzDJXzPKRbkU1PexJsK03kzgOrR0oy2zuqnULa tgjHfC4lFlDZ5R/7qHgbuI3MydYhh5j/pu/2KT9H9lEcjuTB6eANVxWJPcC6G8NgpFG3 Nkbg== 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 h63-v6sor451694wmi.13.2018.06.22.04.19.34 for (Google Transport Security); Fri, 22 Jun 2018 04:19: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: AAOMgpd42HpttVA8hG03bSeXzhT6wChbDY6q39LXnD6aNak9PQOOKpP0TfrGmyYAUfbKh5QTJnmfbg== X-Received: by 2002:a1c:4787:: with SMTP id m7-v6mr1457715wmi.92.1529666373911; Fri, 22 Jun 2018 04:19:33 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id f18-v6sm11734839wro.1.2018.06.22.04.19.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jun 2018 04:19:33 -0700 (PDT) Received: from d104.suse.de (charybdis-ext.suse.de [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id ECF2012375C; Fri, 22 Jun 2018 13:19:31 +0200 (CEST) From: osalvador@techadventures.net To: akpm@linux-foundation.org Cc: mhocko@suse.com, vbabka@suse.cz, pasha.tatashin@oracle.com, Jonathan.Cameron@huawei.com, arbab@linux.vnet.ibm.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Oscar Salvador Subject: [PATCH v2 3/4] mm/memory_hotplug: Make register_mem_sect_under_node a cb of walk_memory_range Date: Fri, 22 Jun 2018 13:18:38 +0200 Message-Id: <20180622111839.10071-4-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180622111839.10071-1-osalvador@techadventures.net> References: <20180622111839.10071-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 convert link_mem_sections() into a dummy function that calls walk_memory_range() with a callback to register_mem_sect_under_node(). This patch converts register_mem_sect_under_node() in order to match a walk_memory_range's callback, getting rid of the check_nid argument and checking instead if the system is still boothing, since we only have to check for the nid if the system is in such state. Signed-off-by: Oscar Salvador Suggested-by: Pavel Tatashin Signed-off-by: Oscar Salvador Tested-by: Reza Arbab Tested-by: Jonathan Cameron Signed-off-by: Andrew Morton Reviewed-by: Pavel Tatashin --- drivers/base/node.c | 44 ++++++-------------------------------------- include/linux/node.h | 12 +++++++----- mm/memory_hotplug.c | 5 +---- 3 files changed, 14 insertions(+), 47 deletions(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index a5e821d09656..845d5523812b 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -399,10 +399,9 @@ static int __ref get_nid_for_pfn(unsigned long pfn) } /* 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) +int register_mem_sect_under_node(struct memory_block *mem_blk, void *arg) { - int ret; + int ret, nid = *(int *)arg; unsigned long pfn, sect_start_pfn, sect_end_pfn; if (!mem_blk) @@ -433,7 +432,7 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, int nid, * case, during hotplug we know that all pages in the memory * block belong to the same node. */ - if (check_nid) { + if (system_state == SYSTEM_BOOTING) { page_nid = get_nid_for_pfn(pfn); if (page_nid < 0) continue; @@ -490,41 +489,10 @@ 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) +int link_mem_sections(int nid, unsigned long start_pfn, unsigned long end_pfn) { - 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; + return walk_memory_range(start_pfn, end_pfn, (void *)&nid, + register_mem_sect_under_node); } #ifdef CONFIG_HUGETLBFS diff --git a/include/linux/node.h b/include/linux/node.h index 6d336e38d155..257bb3d6d014 100644 --- a/include/linux/node.h +++ b/include/linux/node.h @@ -33,10 +33,10 @@ 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); + unsigned long end_pfn); #else static inline int link_mem_sections(int nid, unsigned long start_pfn, - unsigned long nr_pages, bool check_nid) + unsigned long end_pfn) { return 0; } @@ -54,12 +54,14 @@ static inline int register_one_node(int nid) if (node_online(nid)) { struct pglist_data *pgdat = NODE_DATA(nid); + unsigned long start_pfn = pgdat->node_start_pfn; + unsigned long end_pfn = start_pfn + 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); + error = link_mem_sections(nid, start_pfn, end_pfn); } return error; @@ -69,7 +71,7 @@ extern void unregister_one_node(int nid); extern int register_cpu_under_node(unsigned int cpu, unsigned int nid); extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid); extern int register_mem_sect_under_node(struct memory_block *mem_blk, - int nid, bool check_nid); + void *arg); extern int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, unsigned long phys_index); @@ -99,7 +101,7 @@ static inline int unregister_cpu_under_node(unsigned int cpu, unsigned int nid) return 0; } static inline int register_mem_sect_under_node(struct memory_block *mem_blk, - int nid, bool check_nid) + void *arg) { return 0; } diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index e2ed64b994e5..4eb6e824a80c 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1123,7 +1123,6 @@ int __ref add_memory_resource(int nid, struct resource *res, bool online) u64 start, size; bool new_node = false; int ret; - unsigned long start_pfn, nr_pages; start = res->start; size = resource_size(res); @@ -1164,9 +1163,7 @@ 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 = link_mem_sections(nid, PFN_DOWN(start), PFN_UP(start + size - 1)); BUG_ON(ret); /* create new memmap entry */