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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 E901FC282DD for ; Tue, 7 Jan 2020 21:00:23 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A7F08214D8 for ; Tue, 7 Jan 2020 21:00:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7F08214D8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=deltatee.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 44C668E0015; Tue, 7 Jan 2020 16:00:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D9848E0006; Tue, 7 Jan 2020 16:00:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1DC628E0015; Tue, 7 Jan 2020 16:00:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0194.hostedemail.com [216.40.44.194]) by kanga.kvack.org (Postfix) with ESMTP id E4E488E0006 for ; Tue, 7 Jan 2020 16:00:18 -0500 (EST) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id 975C3181AEF00 for ; Tue, 7 Jan 2020 21:00:18 +0000 (UTC) X-FDA: 76352056116.18.show36_7703ba214524b X-HE-Tag: show36_7703ba214524b X-Filterd-Recvd-Size: 13742 Received: from ale.deltatee.com (ale.deltatee.com [207.54.116.67]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Tue, 7 Jan 2020 21:00:17 +0000 (UTC) Received: from cgy1-donard.priv.deltatee.com ([172.16.1.31]) by ale.deltatee.com with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1iovxO-0007vr-Dy; Tue, 07 Jan 2020 14:00:11 -0700 Received: from gunthorp by cgy1-donard.priv.deltatee.com with local (Exim 4.92) (envelope-from ) id 1iovxI-0001z7-I2; Tue, 07 Jan 2020 14:00:00 -0700 From: Logan Gunthorpe To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-mm@kvack.org, Dan Williams , Michal Hocko , David Hildenbrand , Andrew Morton Cc: Christoph Hellwig , Catalin Marinas , Will Deacon , Benjamin Herrenschmidt , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Eric Badger , Logan Gunthorpe Date: Tue, 7 Jan 2020 13:59:53 -0700 Message-Id: <20200107205959.7575-3-logang@deltatee.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200107205959.7575-1-logang@deltatee.com> References: <20200107205959.7575-1-logang@deltatee.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 172.16.1.31 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-mm@kvack.org, dan.j.williams@intel.com, akpm@linux-foundation.org, hch@lst.de, catalin.marinas@arm.com, benh@kernel.crashing.org, tglx@linutronix.de, david@redhat.com, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, mhocko@kernel.org, will@kernel.org, luto@kernel.org, peterz@infradead.org, ebadger@gigaio.com, logang@deltatee.com X-SA-Exim-Mail-From: gunthorp@deltatee.com Subject: [PATCH v2 2/8] mm/memory_hotplug: Rename mhp_restrictions to mhp_modifiers X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) Content-Transfer-Encoding: quoted-printable 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: The mhp_restrictions struct really doesn't specify anything resembling a restriction anymore so rename it to be mhp_modifiers. Signed-off-by: Logan Gunthorpe --- arch/arm64/mm/mmu.c | 4 ++-- arch/ia64/mm/init.c | 4 ++-- arch/powerpc/mm/mem.c | 4 ++-- arch/s390/mm/init.c | 6 +++--- arch/sh/mm/init.c | 4 ++-- arch/x86/mm/init_32.c | 4 ++-- arch/x86/mm/init_64.c | 8 ++++---- include/linux/memory_hotplug.h | 12 ++++++------ mm/memory_hotplug.c | 8 ++++---- mm/memremap.c | 8 ++++---- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 40797cbfba2d..3320406579c3 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -1050,7 +1050,7 @@ int p4d_free_pud_page(p4d_t *p4d, unsigned long add= r) =20 #ifdef CONFIG_MEMORY_HOTPLUG int arch_add_memory(int nid, u64 start, u64 size, - struct mhp_restrictions *restrictions) + struct mhp_modifiers *modifiers) { int flags =3D 0; =20 @@ -1063,7 +1063,7 @@ int arch_add_memory(int nid, u64 start, u64 size, memblock_clear_nomap(start, size); =20 return __add_pages(nid, start >> PAGE_SHIFT, size >> PAGE_SHIFT, - restrictions); + modifiers); } void arch_remove_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap) diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index b01d68a2d5d9..daf438e08b96 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -670,13 +670,13 @@ mem_init (void) =20 #ifdef CONFIG_MEMORY_HOTPLUG int arch_add_memory(int nid, u64 start, u64 size, - struct mhp_restrictions *restrictions) + struct mhp_modifiers *modifiers) { unsigned long start_pfn =3D start >> PAGE_SHIFT; unsigned long nr_pages =3D size >> PAGE_SHIFT; int ret; =20 - ret =3D __add_pages(nid, start_pfn, nr_pages, restrictions); + ret =3D __add_pages(nid, start_pfn, nr_pages, modifiers); if (ret) printk("%s: Problem encountered in __add_pages() as ret=3D%d\n", __func__, ret); diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index f5535eae637f..9dd9c3c1be7f 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -127,7 +127,7 @@ static void flush_dcache_range_chunked(unsigned long = start, unsigned long stop, } =20 int __ref arch_add_memory(int nid, u64 start, u64 size, - struct mhp_restrictions *restrictions) + struct mhp_modifiers *modifiers) { unsigned long start_pfn =3D start >> PAGE_SHIFT; unsigned long nr_pages =3D size >> PAGE_SHIFT; @@ -143,7 +143,7 @@ int __ref arch_add_memory(int nid, u64 start, u64 siz= e, return -EFAULT; } =20 - return __add_pages(nid, start_pfn, nr_pages, restrictions); + return __add_pages(nid, start_pfn, nr_pages, modifiers); } =20 void __ref arch_remove_memory(int nid, u64 start, u64 size, diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index ac44bd76db4b..a0c88c1c9ad0 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -268,20 +268,20 @@ device_initcall(s390_cma_mem_init); #endif /* CONFIG_CMA */ =20 int arch_add_memory(int nid, u64 start, u64 size, - struct mhp_restrictions *restrictions) + struct mhp_modifiers *modifiers) { unsigned long start_pfn =3D PFN_DOWN(start); unsigned long size_pages =3D PFN_DOWN(size); int rc; =20 - if (WARN_ON_ONCE(restrictions->altmap)) + if (WARN_ON_ONCE(modifiers->altmap)) return -EINVAL; =20 rc =3D vmem_add_mapping(start, size); if (rc) return rc; =20 - rc =3D __add_pages(nid, start_pfn, size_pages, restrictions); + rc =3D __add_pages(nid, start_pfn, size_pages, modifiers); if (rc) vmem_remove_mapping(start, size); return rc; diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index d1b1ff2be17a..7e64f42fb570 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -406,14 +406,14 @@ void __init mem_init(void) =20 #ifdef CONFIG_MEMORY_HOTPLUG int arch_add_memory(int nid, u64 start, u64 size, - struct mhp_restrictions *restrictions) + struct mhp_modifiers *modifiers) { unsigned long start_pfn =3D PFN_DOWN(start); unsigned long nr_pages =3D size >> PAGE_SHIFT; int ret; =20 /* We only have ZONE_NORMAL, so this is easy.. */ - ret =3D __add_pages(nid, start_pfn, nr_pages, restrictions); + ret =3D __add_pages(nid, start_pfn, nr_pages, modifiers); if (unlikely(ret)) printk("%s: Failed, __add_pages() =3D=3D %d\n", __func__, ret); =20 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 0a74407ef92e..e6fce2d547f0 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -852,12 +852,12 @@ void __init mem_init(void) =20 #ifdef CONFIG_MEMORY_HOTPLUG int arch_add_memory(int nid, u64 start, u64 size, - struct mhp_restrictions *restrictions) + struct mhp_modifiers *modifiers) { unsigned long start_pfn =3D start >> PAGE_SHIFT; unsigned long nr_pages =3D size >> PAGE_SHIFT; =20 - return __add_pages(nid, start_pfn, nr_pages, restrictions); + return __add_pages(nid, start_pfn, nr_pages, modifiers); } =20 void arch_remove_memory(int nid, u64 start, u64 size, diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index bcfede46fe02..516133f555e9 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -844,11 +844,11 @@ static void update_end_of_memory_vars(u64 start, u6= 4 size) } =20 int add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages, - struct mhp_restrictions *restrictions) + struct mhp_modifiers *modifiers) { int ret; =20 - ret =3D __add_pages(nid, start_pfn, nr_pages, restrictions); + ret =3D __add_pages(nid, start_pfn, nr_pages, modifiers); WARN_ON_ONCE(ret); =20 /* update max_pfn, max_low_pfn and high_memory */ @@ -859,14 +859,14 @@ int add_pages(int nid, unsigned long start_pfn, uns= igned long nr_pages, } =20 int arch_add_memory(int nid, u64 start, u64 size, - struct mhp_restrictions *restrictions) + struct mhp_modifiers *modifiers) { unsigned long start_pfn =3D start >> PAGE_SHIFT; unsigned long nr_pages =3D size >> PAGE_SHIFT; =20 init_memory_mapping(start, start + size); =20 - return add_pages(nid, start_pfn, nr_pages, restrictions); + return add_pages(nid, start_pfn, nr_pages, modifiers); } =20 #define PAGE_INUSE 0xFD diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplu= g.h index e47a29761088..2152efae2f4b 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -57,7 +57,7 @@ enum { * Restrictions for the memory hotplug: * altmap: alternative allocator for memmap array */ -struct mhp_restrictions { +struct mhp_modifiers { struct vmem_altmap *altmap; }; =20 @@ -107,7 +107,7 @@ extern int restore_online_page_callback(online_page_c= allback_t callback); extern int try_online_node(int nid); =20 extern int arch_add_memory(int nid, u64 start, u64 size, - struct mhp_restrictions *restrictions); + struct mhp_modifiers *modifiers); extern u64 max_mem_size; =20 extern bool memhp_auto_online; @@ -125,17 +125,17 @@ extern void __remove_pages(unsigned long start_pfn,= unsigned long nr_pages, =20 /* reasonably generic interface to expand the physical pages */ extern int __add_pages(int nid, unsigned long start_pfn, unsigned long n= r_pages, - struct mhp_restrictions *restrictions); + struct mhp_modifiers *modifiers); =20 #ifndef CONFIG_ARCH_HAS_ADD_PAGES static inline int add_pages(int nid, unsigned long start_pfn, - unsigned long nr_pages, struct mhp_restrictions *restrictions) + unsigned long nr_pages, struct mhp_modifiers *modifiers) { - return __add_pages(nid, start_pfn, nr_pages, restrictions); + return __add_pages(nid, start_pfn, nr_pages, modifiers); } #else /* ARCH_HAS_ADD_PAGES */ int add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages, - struct mhp_restrictions *restrictions); + struct mhp_modifiers *modifiers); #endif /* ARCH_HAS_ADD_PAGES */ =20 #ifdef CONFIG_NUMA diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index a91a072f2b2c..1bb3f92e087d 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -299,11 +299,11 @@ static int check_hotplug_memory_addressable(unsigne= d long pfn, * add the new pages. */ int __ref __add_pages(int nid, unsigned long pfn, unsigned long nr_pages= , - struct mhp_restrictions *restrictions) + struct mhp_modifiers *modifiers) { int err; unsigned long nr, start_sec, end_sec; - struct vmem_altmap *altmap =3D restrictions->altmap; + struct vmem_altmap *altmap =3D modifiers->altmap; =20 err =3D check_hotplug_memory_addressable(pfn, nr_pages); if (err) @@ -1027,7 +1027,7 @@ static int online_memory_block(struct memory_block = *mem, void *arg) */ int __ref add_memory_resource(int nid, struct resource *res) { - struct mhp_restrictions restrictions =3D {}; + struct mhp_modifiers modifiers =3D {}; u64 start, size; bool new_node =3D false; int ret; @@ -1055,7 +1055,7 @@ int __ref add_memory_resource(int nid, struct resou= rce *res) new_node =3D ret; =20 /* call arch's memory hotadd */ - ret =3D arch_add_memory(nid, start, size, &restrictions); + ret =3D arch_add_memory(nid, start, size, &modifiers); if (ret < 0) goto error; =20 diff --git a/mm/memremap.c b/mm/memremap.c index c51c6bd2fe34..e30be8ba706b 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -158,7 +158,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int n= id) { struct resource *res =3D &pgmap->res; struct dev_pagemap *conflict_pgmap; - struct mhp_restrictions restrictions =3D { + struct mhp_modifiers modifiers =3D { /* * We do not want any optional features only our own memmap */ @@ -272,7 +272,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int n= id) */ if (pgmap->type =3D=3D MEMORY_DEVICE_PRIVATE) { error =3D add_pages(nid, PHYS_PFN(res->start), - PHYS_PFN(resource_size(res)), &restrictions); + PHYS_PFN(resource_size(res)), &modifiers); } else { error =3D kasan_add_zero_shadow(__va(res->start), resource_size(res)); if (error) { @@ -281,7 +281,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int n= id) } =20 error =3D arch_add_memory(nid, res->start, resource_size(res), - &restrictions); + &modifiers); } =20 if (!error) { @@ -289,7 +289,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int n= id) =20 zone =3D &NODE_DATA(nid)->node_zones[ZONE_DEVICE]; move_pfn_range_to_zone(zone, PHYS_PFN(res->start), - PHYS_PFN(resource_size(res)), restrictions.altmap); + PHYS_PFN(resource_size(res)), modifiers.altmap); } =20 mem_hotplug_done(); --=20 2.20.1