From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_NEOMUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F3F2C04AB5 for ; Mon, 3 Jun 2019 22:17:11 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 749092673C for ; Mon, 3 Jun 2019 22:17:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AgSXQB1m" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 749092673C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 45HqD45BtjzDqT2 for ; Tue, 4 Jun 2019 08:17:08 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2a00:1450:4864:20::542; helo=mail-ed1-x542.google.com; envelope-from=richard.weiyang@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AgSXQB1m"; dkim-atps=neutral Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 45HqBS6YjQzDqNP for ; Tue, 4 Jun 2019 08:15:44 +1000 (AEST) Received: by mail-ed1-x542.google.com with SMTP id r18so27984600edo.7 for ; Mon, 03 Jun 2019 15:15:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:reply-to:references:mime-version :content-disposition:in-reply-to:user-agent; bh=PlL+0OL4BvjO84qlKDFGxdeteGvielp4Lu2VfMx5Y0E=; b=AgSXQB1m5sFJTwV3A0spiIfpI67Lb2p+r7XngOD5KtoEryQ5lZZ2EePOJRHzPpGp7n rbBt/Nf3TfkouLVhsu3iz3EZskel5pcMo5DQScRs0BoQ12ATmkQY71QxCnsRNF2euVi0 fb1CtZtnqvWqUVdF/jBq9qg7sX/nAw44sYUpiMx9OeUhNI8It1LYhwHa9THy3Qx7nmyI 56GBOncMd51FZwKs/M2UySN8sOES9AEDA+4xArUz4D18xeGC/+iRi0cCF7/T3M+nExqD lLVOE4W3yx9CeWGAVvuF/piBYSOZ4zZR6YblexIlGxMIpHWBI0Nwk8W7aeAJDJLjwF1n tzNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:reply-to :references:mime-version:content-disposition:in-reply-to:user-agent; bh=PlL+0OL4BvjO84qlKDFGxdeteGvielp4Lu2VfMx5Y0E=; b=OB+3gMHajh1baSXhq7gir/3l3il6HlhW/5r5sChs0p3GIuoSVNmLwAErQKgKGTOZvo hYJJCgSjUHBPCMjsBsLg9MGrUhxv/fRnts00dtBZcEjvdom5q7eS+PAdlZcKOPqDwmY1 8Y28UDE4GQXq/AvIJKJhzB/+sPzlyp+irDE9J0xKej+I/8B9CC04CpnJv0oGj7gVNyYG cVaUm8O80dEm4OsXDIDMfS+Rtzfca8t0AznlSzfCdDeZf9UUKnhB5zSpTlV1/F9P0h9N 3IkIzx+gF+pqUC4ywNbpXdHdESbslZqLEia9204MABhAVQcuN4p3R+eVFIGWDiY/30A6 bKtw== X-Gm-Message-State: APjAAAUFozxNIMtgEkmWrpkTan566HvXWqtTvnMeCtnuidJAIbzdRJB9 Li8YHWT0XT9UXIxIMsZrSC8= X-Google-Smtp-Source: APXvYqydYliSc4v9RfY9YN8tc+zJR0qZqdokT/izjqKnh5rVNK7DOL3ujNksQ4QOc3hiysCUaFM7WQ== X-Received: by 2002:a50:ba83:: with SMTP id x3mr31554921ede.266.1559600141951; Mon, 03 Jun 2019 15:15:41 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id b10sm2816102eja.58.2019.06.03.15.15.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jun 2019 15:15:41 -0700 (PDT) Date: Mon, 3 Jun 2019 22:15:40 +0000 From: Wei Yang To: David Hildenbrand Subject: Re: [PATCH v3 06/11] mm/memory_hotplug: Allow arch_remove_pages() without CONFIG_MEMORY_HOTREMOVE Message-ID: <20190603221540.bvhuvltlwuirm5sl@master> References: <20190527111152.16324-1-david@redhat.com> <20190527111152.16324-7-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190527111152.16324-7-david@redhat.com> User-Agent: NeoMutt/20170113 (1.7.2) X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Wei Yang Cc: Oscar Salvador , Rich Felker , linux-ia64@vger.kernel.org, Anshuman Khandual , linux-sh@vger.kernel.org, Peter Zijlstra , Dave Hansen , Heiko Carstens , Arun KS , Wei Yang , linux-mm@kvack.org, Michal Hocko , Paul Mackerras , "H. Peter Anvin" , Thomas Gleixner , Qian Cai , linux-s390@vger.kernel.org, Yoshinori Sato , "Rafael J. Wysocki" , Mike Rapoport , Ingo Molnar , Fenghua Yu , Pavel Tatashin , Vasily Gorbik , Rob Herring , "mike.travis@hpe.com" , Nicholas Piggin , Alex Deucher , Mark Brown , Borislav Petkov , Andy Lutomirski , Dan Williams , Chris Wilson , linux-arm-kernel@lists.infradead.org, Tony Luck , Baoquan He , Masahiro Yamada , Mathieu Malaterre , Greg Kroah-Hartman , Andrew Banman , linux-kernel@vger.kernel.org, Logan Gunthorpe , Wei Yang , Martin Schwidefsky , Igor Mammedov , akpm@linux-foundation.org, linuxppc-dev@lists.ozlabs.org, "David S. Miller" , "Kirill A. Shutemov" Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Allow arch_remove_pages() or arch_remove_memory()? And want to confirm the kernel build on affected arch succeed? On Mon, May 27, 2019 at 01:11:47PM +0200, David Hildenbrand wrote: >We want to improve error handling while adding memory by allowing >to use arch_remove_memory() and __remove_pages() even if >CONFIG_MEMORY_HOTREMOVE is not set to e.g., implement something like: > > arch_add_memory() > rc = do_something(); > if (rc) { > arch_remove_memory(); > } > >We won't get rid of CONFIG_MEMORY_HOTREMOVE for now, as it will require >quite some dependencies for memory offlining. > >Cc: Tony Luck >Cc: Fenghua Yu >Cc: Benjamin Herrenschmidt >Cc: Paul Mackerras >Cc: Michael Ellerman >Cc: Martin Schwidefsky >Cc: Heiko Carstens >Cc: Yoshinori Sato >Cc: Rich Felker >Cc: Dave Hansen >Cc: Andy Lutomirski >Cc: Peter Zijlstra >Cc: Thomas Gleixner >Cc: Ingo Molnar >Cc: Borislav Petkov >Cc: "H. Peter Anvin" >Cc: Greg Kroah-Hartman >Cc: "Rafael J. Wysocki" >Cc: Andrew Morton >Cc: Michal Hocko >Cc: Mike Rapoport >Cc: David Hildenbrand >Cc: Oscar Salvador >Cc: "Kirill A. Shutemov" >Cc: Alex Deucher >Cc: "David S. Miller" >Cc: Mark Brown >Cc: Chris Wilson >Cc: Christophe Leroy >Cc: Nicholas Piggin >Cc: Vasily Gorbik >Cc: Rob Herring >Cc: Masahiro Yamada >Cc: "mike.travis@hpe.com" >Cc: Andrew Banman >Cc: Pavel Tatashin >Cc: Wei Yang >Cc: Arun KS >Cc: Qian Cai >Cc: Mathieu Malaterre >Cc: Baoquan He >Cc: Logan Gunthorpe >Cc: Anshuman Khandual >Signed-off-by: David Hildenbrand >--- > arch/arm64/mm/mmu.c | 2 -- > arch/ia64/mm/init.c | 2 -- > arch/powerpc/mm/mem.c | 2 -- > arch/s390/mm/init.c | 2 -- > arch/sh/mm/init.c | 2 -- > arch/x86/mm/init_32.c | 2 -- > arch/x86/mm/init_64.c | 2 -- > drivers/base/memory.c | 2 -- > include/linux/memory.h | 2 -- > include/linux/memory_hotplug.h | 2 -- > mm/memory_hotplug.c | 2 -- > mm/sparse.c | 6 ------ > 12 files changed, 28 deletions(-) > >diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c >index e569a543c384..9ccd7539f2d4 100644 >--- a/arch/arm64/mm/mmu.c >+++ b/arch/arm64/mm/mmu.c >@@ -1084,7 +1084,6 @@ int arch_add_memory(int nid, u64 start, u64 size, > return __add_pages(nid, start >> PAGE_SHIFT, size >> PAGE_SHIFT, > restrictions); > } >-#ifdef CONFIG_MEMORY_HOTREMOVE > void arch_remove_memory(int nid, u64 start, u64 size, > struct vmem_altmap *altmap) > { >@@ -1103,4 +1102,3 @@ void arch_remove_memory(int nid, u64 start, u64 size, > __remove_pages(zone, start_pfn, nr_pages, altmap); > } > #endif >-#endif >diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c >index d28e29103bdb..aae75fd7b810 100644 >--- a/arch/ia64/mm/init.c >+++ b/arch/ia64/mm/init.c >@@ -681,7 +681,6 @@ int arch_add_memory(int nid, u64 start, u64 size, > return ret; > } > >-#ifdef CONFIG_MEMORY_HOTREMOVE > void arch_remove_memory(int nid, u64 start, u64 size, > struct vmem_altmap *altmap) > { >@@ -693,4 +692,3 @@ void arch_remove_memory(int nid, u64 start, u64 size, > __remove_pages(zone, start_pfn, nr_pages, altmap); > } > #endif >-#endif >diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c >index e885fe2aafcc..e4bc2dc3f593 100644 >--- a/arch/powerpc/mm/mem.c >+++ b/arch/powerpc/mm/mem.c >@@ -130,7 +130,6 @@ int __ref arch_add_memory(int nid, u64 start, u64 size, > return __add_pages(nid, start_pfn, nr_pages, restrictions); > } > >-#ifdef CONFIG_MEMORY_HOTREMOVE > void __ref arch_remove_memory(int nid, u64 start, u64 size, > struct vmem_altmap *altmap) > { >@@ -164,7 +163,6 @@ void __ref arch_remove_memory(int nid, u64 start, u64 size, > pr_warn("Hash collision while resizing HPT\n"); > } > #endif >-#endif /* CONFIG_MEMORY_HOTPLUG */ > > #ifndef CONFIG_NEED_MULTIPLE_NODES > void __init mem_topology_setup(void) >diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c >index 14955e0a9fcf..ffb81fe95c77 100644 >--- a/arch/s390/mm/init.c >+++ b/arch/s390/mm/init.c >@@ -239,7 +239,6 @@ int arch_add_memory(int nid, u64 start, u64 size, > return rc; > } > >-#ifdef CONFIG_MEMORY_HOTREMOVE > void arch_remove_memory(int nid, u64 start, u64 size, > struct vmem_altmap *altmap) > { >@@ -251,5 +250,4 @@ void arch_remove_memory(int nid, u64 start, u64 size, > __remove_pages(zone, start_pfn, nr_pages, altmap); > vmem_remove_mapping(start, size); > } >-#endif > #endif /* CONFIG_MEMORY_HOTPLUG */ >diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c >index 13c6a6bb5fd9..dfdbaa50946e 100644 >--- a/arch/sh/mm/init.c >+++ b/arch/sh/mm/init.c >@@ -429,7 +429,6 @@ int memory_add_physaddr_to_nid(u64 addr) > EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); > #endif > >-#ifdef CONFIG_MEMORY_HOTREMOVE > void arch_remove_memory(int nid, u64 start, u64 size, > struct vmem_altmap *altmap) > { >@@ -440,5 +439,4 @@ void arch_remove_memory(int nid, u64 start, u64 size, > zone = page_zone(pfn_to_page(start_pfn)); > __remove_pages(zone, start_pfn, nr_pages, altmap); > } >-#endif > #endif /* CONFIG_MEMORY_HOTPLUG */ >diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c >index f265a4316179..4068abb9427f 100644 >--- a/arch/x86/mm/init_32.c >+++ b/arch/x86/mm/init_32.c >@@ -860,7 +860,6 @@ int arch_add_memory(int nid, u64 start, u64 size, > return __add_pages(nid, start_pfn, nr_pages, restrictions); > } > >-#ifdef CONFIG_MEMORY_HOTREMOVE > void arch_remove_memory(int nid, u64 start, u64 size, > struct vmem_altmap *altmap) > { >@@ -872,7 +871,6 @@ void arch_remove_memory(int nid, u64 start, u64 size, > __remove_pages(zone, start_pfn, nr_pages, altmap); > } > #endif >-#endif > > int kernel_set_to_readonly __read_mostly; > >diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c >index 693aaf28d5fe..8335ac6e1112 100644 >--- a/arch/x86/mm/init_64.c >+++ b/arch/x86/mm/init_64.c >@@ -1196,7 +1196,6 @@ void __ref vmemmap_free(unsigned long start, unsigned long end, > remove_pagetable(start, end, false, altmap); > } > >-#ifdef CONFIG_MEMORY_HOTREMOVE > static void __meminit > kernel_physical_mapping_remove(unsigned long start, unsigned long end) > { >@@ -1221,7 +1220,6 @@ void __ref arch_remove_memory(int nid, u64 start, u64 size, > __remove_pages(zone, start_pfn, nr_pages, altmap); > kernel_physical_mapping_remove(start, start + size); > } >-#endif > #endif /* CONFIG_MEMORY_HOTPLUG */ > > static struct kcore_list kcore_vsyscall; >diff --git a/drivers/base/memory.c b/drivers/base/memory.c >index f914fa6fe350..ac17c95a5f28 100644 >--- a/drivers/base/memory.c >+++ b/drivers/base/memory.c >@@ -727,7 +727,6 @@ int hotplug_memory_register(int nid, struct mem_section *section) > return ret; > } > >-#ifdef CONFIG_MEMORY_HOTREMOVE > static void > unregister_memory(struct memory_block *memory) > { >@@ -766,7 +765,6 @@ void unregister_memory_section(struct mem_section *section) > out_unlock: > mutex_unlock(&mem_sysfs_mutex); > } >-#endif /* CONFIG_MEMORY_HOTREMOVE */ > > /* return true if the memory block is offlined, otherwise, return false */ > bool is_memblock_offlined(struct memory_block *mem) >diff --git a/include/linux/memory.h b/include/linux/memory.h >index e1dc1bb2b787..474c7c60c8f2 100644 >--- a/include/linux/memory.h >+++ b/include/linux/memory.h >@@ -112,9 +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(int nid, struct mem_section *section); >-#ifdef CONFIG_MEMORY_HOTREMOVE > extern void unregister_memory_section(struct mem_section *); >-#endif > 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/memory_hotplug.h b/include/linux/memory_hotplug.h >index ae892eef8b82..2d4de313926d 100644 >--- a/include/linux/memory_hotplug.h >+++ b/include/linux/memory_hotplug.h >@@ -123,12 +123,10 @@ static inline bool movable_node_is_enabled(void) > return movable_node_enabled; > } > >-#ifdef CONFIG_MEMORY_HOTREMOVE > extern void arch_remove_memory(int nid, u64 start, u64 size, > struct vmem_altmap *altmap); > extern void __remove_pages(struct zone *zone, unsigned long start_pfn, > unsigned long nr_pages, struct vmem_altmap *altmap); >-#endif /* CONFIG_MEMORY_HOTREMOVE */ > > /* > * Do we want sysfs memblock files created. This will allow userspace to online >diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c >index 762887b2358b..4b9d2974f86c 100644 >--- a/mm/memory_hotplug.c >+++ b/mm/memory_hotplug.c >@@ -318,7 +318,6 @@ int __ref __add_pages(int nid, unsigned long phys_start_pfn, > return err; > } > >-#ifdef CONFIG_MEMORY_HOTREMOVE > /* find the smallest valid pfn in the range [start_pfn, end_pfn) */ > static unsigned long find_smallest_section_pfn(int nid, struct zone *zone, > unsigned long start_pfn, >@@ -582,7 +581,6 @@ void __remove_pages(struct zone *zone, unsigned long phys_start_pfn, > > set_zone_contiguous(zone); > } >-#endif /* CONFIG_MEMORY_HOTREMOVE */ > > int set_online_page_callback(online_page_callback_t callback) > { >diff --git a/mm/sparse.c b/mm/sparse.c >index fd13166949b5..d1d5e05f5b8d 100644 >--- a/mm/sparse.c >+++ b/mm/sparse.c >@@ -604,7 +604,6 @@ static void __kfree_section_memmap(struct page *memmap, > > vmemmap_free(start, end, altmap); > } >-#ifdef CONFIG_MEMORY_HOTREMOVE > static void free_map_bootmem(struct page *memmap) > { > unsigned long start = (unsigned long)memmap; >@@ -612,7 +611,6 @@ static void free_map_bootmem(struct page *memmap) > > vmemmap_free(start, end, NULL); > } >-#endif /* CONFIG_MEMORY_HOTREMOVE */ > #else > static struct page *__kmalloc_section_memmap(void) > { >@@ -651,7 +649,6 @@ static void __kfree_section_memmap(struct page *memmap, > get_order(sizeof(struct page) * PAGES_PER_SECTION)); > } > >-#ifdef CONFIG_MEMORY_HOTREMOVE > static void free_map_bootmem(struct page *memmap) > { > unsigned long maps_section_nr, removing_section_nr, i; >@@ -681,7 +678,6 @@ static void free_map_bootmem(struct page *memmap) > put_page_bootmem(page); > } > } >-#endif /* CONFIG_MEMORY_HOTREMOVE */ > #endif /* CONFIG_SPARSEMEM_VMEMMAP */ > > /** >@@ -746,7 +742,6 @@ int __meminit sparse_add_one_section(int nid, unsigned long start_pfn, > return ret; > } > >-#ifdef CONFIG_MEMORY_HOTREMOVE > #ifdef CONFIG_MEMORY_FAILURE > static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) > { >@@ -823,5 +818,4 @@ void sparse_remove_one_section(struct zone *zone, struct mem_section *ms, > PAGES_PER_SECTION - map_offset); > free_section_usemap(memmap, usemap, altmap); > } >-#endif /* CONFIG_MEMORY_HOTREMOVE */ > #endif /* CONFIG_MEMORY_HOTPLUG */ >-- >2.20.1 -- Wei Yang Help you, Help me