mm/memory_hotplug: rename mhp_restrictions to mhp_params

The mhp_restrictions struct really doesn't specify anything resembling a
restriction anymore so rename it to be mhp_params as it is a list of
extended parameters.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Eric Badger <ebadger@gigaio.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will@kernel.org>
Link: http://lkml.kernel.org/r/20200306170846.9333-3-logang@deltatee.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 9b08f7c7e6f0f789b9c35b49902ff6fe5476773b..6d4e9c2b4ed0155fd3f5b903786bb16d836d414c 100644 (file)
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -1374,7 +1374,7 @@ static void __remove_pgd_mapping(pgd_t *pgdir, unsigned long start, u64 size)
 }
 
 int arch_add_memory(int nid, u64 start, u64 size,
-                       struct mhp_restrictions *restrictions)
+                   struct mhp_params *params)
 {
        int ret, flags = 0;
 
@@ -1387,7 +1387,7 @@ int arch_add_memory(int nid, u64 start, u64 size,
        memblock_clear_nomap(start, size);
 
        ret = __add_pages(nid, start >> PAGE_SHIFT, size >> PAGE_SHIFT,
-                          restrictions);
+                          params);
        if (ret)
                __remove_pgd_mapping(swapper_pg_dir,
                                     __phys_to_virt(start), size);

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index b01d68a2d5d97360d0b612e465fb70635aa80ef6..97bbc23ea1e3d8ed16caae9cb606c468f5cdaaf3 100644 (file)
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -670,13 +670,13 @@ mem_init (void)
 
 #ifdef CONFIG_MEMORY_HOTPLUG
 int arch_add_memory(int nid, u64 start, u64 size,
-                       struct mhp_restrictions *restrictions)
+                   struct mhp_params *params)
 {
        unsigned long start_pfn = start >> PAGE_SHIFT;
        unsigned long nr_pages = size >> PAGE_SHIFT;
        int ret;
 
-       ret = __add_pages(nid, start_pfn, nr_pages, restrictions);
+       ret = __add_pages(nid, start_pfn, nr_pages, params);
        if (ret)
                printk("%s: Problem encountered in __add_pages() as ret=%d\n",
                       __func__,  ret);

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 9b4f5fb719e0f27eafd0d5c2527e8b09de518d48..e1cc581158163d86dc3b29c94f01f6606334750b 100644 (file)
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -122,7 +122,7 @@ static void flush_dcache_range_chunked(unsigned long start, unsigned long stop,
 }
 
 int __ref arch_add_memory(int nid, u64 start, u64 size,
-                       struct mhp_restrictions *restrictions)
+                         struct mhp_params *params)
 {
        unsigned long start_pfn = start >> PAGE_SHIFT;
        unsigned long nr_pages = size >> PAGE_SHIFT;
@@ -138,7 +138,7 @@ int __ref arch_add_memory(int nid, u64 start, u64 size,
                return -EFAULT;
        }
 
-       return __add_pages(nid, start_pfn, nr_pages, restrictions);
+       return __add_pages(nid, start_pfn, nr_pages, params);
 }
 
 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 ac44bd76db4be13443b3da63e4ef0377516d2ddb..e9e4a7abd0cc55ac7c1443142284898d8b678ddd 100644 (file)
--- 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 */
 
 int arch_add_memory(int nid, u64 start, u64 size,
-               struct mhp_restrictions *restrictions)
+                   struct mhp_params *params)
 {
        unsigned long start_pfn = PFN_DOWN(start);
        unsigned long size_pages = PFN_DOWN(size);
        int rc;
 
-       if (WARN_ON_ONCE(restrictions->altmap))
+       if (WARN_ON_ONCE(params->altmap))
                return -EINVAL;
 
        rc = vmem_add_mapping(start, size);
        if (rc)
                return rc;
 
-       rc = __add_pages(nid, start_pfn, size_pages, restrictions);
+       rc = __add_pages(nid, start_pfn, size_pages, params);
        if (rc)
                vmem_remove_mapping(start, size);
        return rc;

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index d1b1ff2be17aa728a84ba8e8701313664e9a76df..e5114c053364b170f537f854eb08896ef0ffbff9 100644 (file)
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -406,14 +406,14 @@ void __init mem_init(void)
 
 #ifdef CONFIG_MEMORY_HOTPLUG
 int arch_add_memory(int nid, u64 start, u64 size,
-                       struct mhp_restrictions *restrictions)
+                   struct mhp_params *params)
 {
        unsigned long start_pfn = PFN_DOWN(start);
        unsigned long nr_pages = size >> PAGE_SHIFT;
        int ret;
 
        /* We only have ZONE_NORMAL, so this is easy.. */
-       ret = __add_pages(nid, start_pfn, nr_pages, restrictions);
+       ret = __add_pages(nid, start_pfn, nr_pages, params);
        if (unlikely(ret))
                printk("%s: Failed, __add_pages() == %d\n", __func__, ret);
 

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index de73992b8432d0f1ff4d0775453133203615cd91..d736c8625503912d9aa3ab6986a5049814e4b2f2 100644 (file)
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -819,12 +819,12 @@ void __init mem_init(void)
 
 #ifdef CONFIG_MEMORY_HOTPLUG
 int arch_add_memory(int nid, u64 start, u64 size,
-                       struct mhp_restrictions *restrictions)
+                   struct mhp_params *params)
 {
        unsigned long start_pfn = start >> PAGE_SHIFT;
        unsigned long nr_pages = size >> PAGE_SHIFT;
 
-       return __add_pages(nid, start_pfn, nr_pages, restrictions);
+       return __add_pages(nid, start_pfn, nr_pages, params);
 }
 
 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 0a14711d3a931eb1040abf19faa1e5158dba8510..faa86a9a3b0d827728b7d16fbe48c402ea77304f 100644 (file)
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -843,11 +843,11 @@ static void update_end_of_memory_vars(u64 start, u64 size)
 }
 
 int add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages,
-                               struct mhp_restrictions *restrictions)
+             struct mhp_params *params)
 {
        int ret;
 
-       ret = __add_pages(nid, start_pfn, nr_pages, restrictions);
+       ret = __add_pages(nid, start_pfn, nr_pages, params);
        WARN_ON_ONCE(ret);
 
        /* update max_pfn, max_low_pfn and high_memory */
@@ -858,14 +858,14 @@ int add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages,
 }
 
 int arch_add_memory(int nid, u64 start, u64 size,
-                       struct mhp_restrictions *restrictions)
+                   struct mhp_params *params)
 {
        unsigned long start_pfn = start >> PAGE_SHIFT;
        unsigned long nr_pages = size >> PAGE_SHIFT;
 
        init_memory_mapping(start, start + size);
 
-       return add_pages(nid, start_pfn, nr_pages, restrictions);
+       return add_pages(nid, start_pfn, nr_pages, params);
 }
 
 #define PAGE_INUSE 0xFD

diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 7c1bcff11672aa2c79e78a750145e039d56ccb69..75f0f6304735b80713c8e6c7f865da2cd604974b 100644 (file)
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -58,10 +58,10 @@ enum {
 };
 
 /*
- * Restrictions for the memory hotplug:
- * altmap: alternative allocator for memmap array
+ * Extended parameters for memory hotplug:
+ * altmap: alternative allocator for memmap array (optional)
  */
-struct mhp_restrictions {
+struct mhp_params {
        struct vmem_altmap *altmap;
 };
 
@@ -112,7 +112,7 @@ extern int restore_online_page_callback(online_page_callback_t callback);
 extern int try_online_node(int nid);
 
 extern int arch_add_memory(int nid, u64 start, u64 size,
-                       struct mhp_restrictions *restrictions);
+                          struct mhp_params *params);
 extern u64 max_mem_size;
 
 extern int memhp_online_type_from_str(const char *str);
@@ -133,17 +133,17 @@ extern void __remove_pages(unsigned long start_pfn, unsigned long nr_pages,
 
 /* reasonably generic interface to expand the physical pages */
 extern int __add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages,
-                      struct mhp_restrictions *restrictions);
+                      struct mhp_params *params);
 
 #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_params *params)
 {
-       return __add_pages(nid, start_pfn, nr_pages, restrictions);
+       return __add_pages(nid, start_pfn, nr_pages, params);
 }
 #else /* ARCH_HAS_ADD_PAGES */
 int add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages,
-             struct mhp_restrictions *restrictions);
+             struct mhp_params *params);
 #endif /* ARCH_HAS_ADD_PAGES */
 
 #ifdef CONFIG_NUMA

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 635e8e2865988ea384ce5d8141c593af8666bdf0..fbfe7b40f552dda5364221ea35d2220184fcf74a 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -304,12 +304,12 @@ static int check_hotplug_memory_addressable(unsigned 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_params *params)
 {
        const unsigned long end_pfn = pfn + nr_pages;
        unsigned long cur_nr_pages;
        int err;
-       struct vmem_altmap *altmap = restrictions->altmap;
+       struct vmem_altmap *altmap = params->altmap;
 
        err = check_hotplug_memory_addressable(pfn, nr_pages);
        if (err)
@@ -1002,7 +1002,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 = {};
+       struct mhp_params params = {};
        u64 start, size;
        bool new_node = false;
        int ret;
@@ -1030,7 +1030,7 @@ int __ref add_memory_resource(int nid, struct resource *res)
        new_node = ret;
 
        /* call arch's memory hotadd */
-       ret = arch_add_memory(nid, start, size, &restrictions);
+       ret = arch_add_memory(nid, start, size, &params);
        if (ret < 0)
                goto error;
 

diff --git a/mm/memremap.c b/mm/memremap.c
index bbf457c4f166bb4ebe4c540b402a616731a5aa51..b0b5170843ffeb099043c830ca1cc990ae9489da 100644 (file)
--- a/mm/memremap.c
+++ b/mm/memremap.c
@@ -184,7 +184,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid)
 {
        struct resource *res = &pgmap->res;
        struct dev_pagemap *conflict_pgmap;
-       struct mhp_restrictions restrictions = {
+       struct mhp_params params = {
                /*
                 * We do not want any optional features only our own memmap
                 */
@@ -302,7 +302,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid)
         */
        if (pgmap->type == MEMORY_DEVICE_PRIVATE) {
                error = add_pages(nid, PHYS_PFN(res->start),
-                               PHYS_PFN(resource_size(res)), &restrictions);
+                               PHYS_PFN(resource_size(res)), &params);
        } else {
                error = kasan_add_zero_shadow(__va(res->start), resource_size(res));
                if (error) {
@@ -311,7 +311,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid)
                }
 
                error = arch_add_memory(nid, res->start, resource_size(res),
-                                       &restrictions);
+                                       &params);
        }
 
        if (!error) {
@@ -319,7 +319,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid)
 
                zone = &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)), params.altmap);
        }
 
        mem_hotplug_done();