From patchwork Tue May 7 18:38:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 10933575 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 DEA78112C for ; Tue, 7 May 2019 18:38:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBE112880D for ; Tue, 7 May 2019 18:38:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BEC3E2891A; Tue, 7 May 2019 18:38:56 +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 E8E222880D for ; Tue, 7 May 2019 18:38:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C271F6B000D; Tue, 7 May 2019 14:38:54 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id BD7666B000E; Tue, 7 May 2019 14:38:54 -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 A9F6E6B0010; Tue, 7 May 2019 14:38:54 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by kanga.kvack.org (Postfix) with ESMTP id 88E6D6B000D for ; Tue, 7 May 2019 14:38:54 -0400 (EDT) Received: by mail-qk1-f198.google.com with SMTP id p190so11392965qke.10 for ; Tue, 07 May 2019 11:38:54 -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:mime-version :content-transfer-encoding; bh=6alr3xAWbp/4sFY4rIt7l7CbtIsbDy+NJtgQONgCG9U=; b=lKLmnFrZXg53kp75bSjjxrwU5PG1N2EZPVAwNFNkTuFp0xGd7hLqTQ4/cjBpGY60vO J7rvPGPjjV5sbPFW+k2x83m/i0CbkoPUbV+IvOQK/Doz+nCry/n7HLlE2yk+8hOV6MKV 6OsjcgmvOpUCHpCnpDU1yWGMoZJ6+5vTDBR0gwl2QQsWdEJ+GVqCZ0BEe7viV/WF5fGK 8+9dkPTn068BGApaZEcWJUTLO/LycFQboJiYWBal8jO6sEGWS92bVqITc+Jd1OJmX0bL 44SZ22wAcDuDPb2VDrDrzy0KeiGP/ULqeWWYW0kHz8AvMXNqtXcYKxXl2qR0tN4r5Ddn QhHA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: APjAAAVaJTLQ6s8fZsWvYze92G5YNKuc5aZRF+UJL8jo2KOFny3Db5Za VTncGCdaiErVqIjaDmXvNVer0tVnIMR0jfrQpDFpX79LRe3mRxPcaU38jrsya+8FaEfMpBybaGp u9vpXhdRxr4+Z6lQfQQ/9+4s0Ep1Z3c7w84/O+/ZowDaJzhX/YdI18zoA/t02p3scJg== X-Received: by 2002:a37:84c2:: with SMTP id g185mr26353856qkd.183.1557254334314; Tue, 07 May 2019 11:38:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqzPvHfUZ/VBcrZix9/FsHWmCDStRKaiPNQxUVOyvHD4Ehm4nvVFAiTGPIWrvriQjVWEBPil X-Received: by 2002:a37:84c2:: with SMTP id g185mr26353798qkd.183.1557254333081; Tue, 07 May 2019 11:38:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557254333; cv=none; d=google.com; s=arc-20160816; b=S6qvCaAXV1IAixL0kf+G8n0Lxbe8CTgLITxtaGU8nIeVefAHbWvgpnjsv8yOZI/fuA md19ny4HVWEpmo1ejWuC51TDQDXxXDs/ZZ1LXzhyGl4gXf/eILm0ikgEkbKlQtRL7SFX /NlHnf1X8W4/A34Ni7NIcjFuqCYlKASypvPGmUvVF+sDwimcvGCglxPOf/gLPqCs1o/j i+SxHoRT/Q7lrgALnbGF8IIQz0mbz9KhEIbKmhuh3fnUbacmCSm6Y8Ae0uodmQQtqzgg BRiGcWI63p3l5Rgk7bNZNDsu4kBVYJ9YLqYXr2GHHm5WT9QkyBLOO6jNAg+cGGExU7WF ytVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=6alr3xAWbp/4sFY4rIt7l7CbtIsbDy+NJtgQONgCG9U=; b=cV32iUBEmPygnx9jXCnxVuaH/sUZXkrrFFo7Q9ioVD2m8SxA1f1tXlj3H5aZbAU2D+ cAcXO0Gdp6d+jP4ezdnNwIplDmrXofp8BW6gadfx2pVvlbgfz0qGdvTTM20ZOMRt7VmD bCUBwqZVmhXz1Z1NtyZr6h1fRaXdW12yVuRGZB3m35JM3ZXRphI53lnB8cfjLGANFyto LB7oD99jS4nNLDJOxFY9uSI9h+ICSqfx0E/NV64LlxGswK4A7OX7tFw+IbAXK8f1+TN2 1Njl49Q59pvdyczyjU9YrSrOEpQ93q0W0ftDQgOKeJ/8b/QxArpuHQqz0BzqP4GTGapv JLVg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id f8si3909090qkl.243.2019.05.07.11.38.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 May 2019 11:38:53 -0700 (PDT) Received-SPF: pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of david@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 103E33082E72; Tue, 7 May 2019 18:38:52 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-95.ams2.redhat.com [10.36.116.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id B29323D99; Tue, 7 May 2019 18:38:47 +0000 (UTC) From: David Hildenbrand To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, akpm@linux-foundation.org, Dan Williams , David Hildenbrand , Greg Kroah-Hartman , "Rafael J. Wysocki" , "mike.travis@hpe.com" , Andrew Banman , Ingo Molnar , Alex Deucher , "David S. Miller" , Mark Brown , Chris Wilson , Oscar Salvador , Jonathan Cameron , Michal Hocko , Pavel Tatashin , Arun KS , Mathieu Malaterre Subject: [PATCH v2 6/8] mm/memory_hotplug: Remove memory block devices before arch_remove_memory() Date: Tue, 7 May 2019 20:38:02 +0200 Message-Id: <20190507183804.5512-7-david@redhat.com> In-Reply-To: <20190507183804.5512-1-david@redhat.com> References: <20190507183804.5512-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 07 May 2019 18:38:52 +0000 (UTC) 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 Let's factor out removing of memory block devices, which is only necessary for memory added via add_memory() and friends that created memory block devices. Remove the devices before calling arch_remove_memory(). This finishes factoring out memory block device handling from arch_add_memory() and arch_remove_memory(). Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Cc: David Hildenbrand Cc: "mike.travis@hpe.com" Cc: Andrew Morton Cc: Andrew Banman Cc: Ingo Molnar Cc: Alex Deucher Cc: "David S. Miller" Cc: Mark Brown Cc: Chris Wilson Cc: Oscar Salvador Cc: Jonathan Cameron Cc: Michal Hocko Cc: Pavel Tatashin Cc: Arun KS Cc: Mathieu Malaterre Signed-off-by: David Hildenbrand Reviewed-by: Dan Williams --- drivers/base/memory.c | 39 +++++++++++++++++++-------------------- drivers/base/node.c | 11 ++++++----- include/linux/memory.h | 2 +- include/linux/node.h | 6 ++---- mm/memory_hotplug.c | 5 +++-- 5 files changed, 31 insertions(+), 32 deletions(-) diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 862c202a18ca..47ff49058d1f 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -756,32 +756,31 @@ int hotplug_memory_register(unsigned long start, unsigned long size) return ret; } -static int remove_memory_section(struct mem_section *section) +/* + * Remove memory block devices for the given memory area. Start and size + * have to be aligned to memory block granularity. Memory block devices + * have to be offline. + */ +void hotplug_memory_unregister(unsigned long start, unsigned long size) { + unsigned long block_nr_pages = memory_block_size_bytes() >> PAGE_SHIFT; + unsigned long start_pfn = PFN_DOWN(start); + unsigned long end_pfn = start_pfn + (size >> PAGE_SHIFT); struct memory_block *mem; + unsigned long pfn; - if (WARN_ON_ONCE(!present_section(section))) - return; + BUG_ON(!IS_ALIGNED(start, memory_block_size_bytes())); + BUG_ON(!IS_ALIGNED(size, memory_block_size_bytes())); mutex_lock(&mem_sysfs_mutex); - - /* - * Some users of the memory hotplug do not want/need memblock to - * track all sections. Skip over those. - */ - mem = find_memory_block(section); - if (!mem) - goto out_unlock; - - unregister_mem_sect_under_nodes(mem, __section_nr(section)); - - mem->section_count--; - if (mem->section_count == 0) + for (pfn = start_pfn; pfn != end_pfn; pfn += block_nr_pages) { + mem = find_memory_block(__pfn_to_section(pfn)); + if (!mem) + continue; + mem->section_count = 0; + unregister_memory_block_under_nodes(mem); unregister_memory(mem); - else - put_device(&mem->dev); - -out_unlock: + } mutex_unlock(&mem_sysfs_mutex); } diff --git a/drivers/base/node.c b/drivers/base/node.c index 8598fcbd2a17..04fdfa99b8bc 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -801,9 +801,10 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, void *arg) return 0; } -/* unregister memory section under all nodes that it spans */ -int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, - unsigned long phys_index) +/* + * Unregister memory block device under all nodes that it spans. + */ +int unregister_memory_block_under_nodes(struct memory_block *mem_blk) { NODEMASK_ALLOC(nodemask_t, unlinked_nodes, GFP_KERNEL); unsigned long pfn, sect_start_pfn, sect_end_pfn; @@ -816,8 +817,8 @@ int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, return -ENOMEM; nodes_clear(*unlinked_nodes); - sect_start_pfn = section_nr_to_pfn(phys_index); - sect_end_pfn = sect_start_pfn + PAGES_PER_SECTION - 1; + sect_start_pfn = section_nr_to_pfn(mem_blk->start_section_nr); + sect_end_pfn = section_nr_to_pfn(mem_blk->end_section_nr); for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) { int nid; diff --git a/include/linux/memory.h b/include/linux/memory.h index 95505fbb5f85..aa236c2a0466 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h @@ -112,7 +112,7 @@ extern void unregister_memory_notifier(struct notifier_block *nb); extern int register_memory_isolate_notifier(struct notifier_block *nb); extern void unregister_memory_isolate_notifier(struct notifier_block *nb); int hotplug_memory_register(unsigned long start, unsigned long size); -extern void unregister_memory_section(struct mem_section *); +void hotplug_memory_unregister(unsigned long start, unsigned long size); extern int memory_dev_init(void); extern int memory_notify(unsigned long val, void *v); extern int memory_isolate_notify(unsigned long val, void *v); diff --git a/include/linux/node.h b/include/linux/node.h index 1a557c589ecb..02a29e71b175 100644 --- a/include/linux/node.h +++ b/include/linux/node.h @@ -139,8 +139,7 @@ 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, void *arg); -extern int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, - unsigned long phys_index); +extern int unregister_memory_block_under_nodes(struct memory_block *mem_blk); extern int register_memory_node_under_compute_node(unsigned int mem_nid, unsigned int cpu_nid, @@ -176,8 +175,7 @@ static inline int register_mem_sect_under_node(struct memory_block *mem_blk, { return 0; } -static inline int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, - unsigned long phys_index) +static inline int unregister_memory_block_under_nodes(struct memory_block *mem_blk) { return 0; } diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 107f72952347..527fe4f9c620 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -519,8 +519,6 @@ static void __remove_section(struct zone *zone, struct mem_section *ms, if (WARN_ON_ONCE(!valid_section(ms))) return; - unregister_memory_section(ms); - scn_nr = __section_nr(ms); start_pfn = section_nr_to_pfn((unsigned long)scn_nr); __remove_zone(zone, start_pfn); @@ -1844,6 +1842,9 @@ void __ref __remove_memory(int nid, u64 start, u64 size) memblock_free(start, size); memblock_remove(start, size); + /* remove memory block devices before removing memory */ + hotplug_memory_unregister(start, size); + arch_remove_memory(nid, start, size, NULL); __release_memory_resource(start, size);