Commit 940519f0 authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds
Browse files

mm, memory_hotplug: provide a more generic restrictions for memory hotplug 

arch_add_memory, __add_pages take a want_memblock which controls whether
the newly added memory should get the sysfs memblock user API (e.g.
ZONE_DEVICE users do not want/need this interface).  Some callers even
want to control where do we allocate the memmap from by configuring
altmap.

Add a more generic hotplug context for arch_add_memory and __add_pages.
struct mhp_restrictions contains flags which contains additional features
to be enabled by the memory hotplug (MHP_MEMBLOCK_API currently) and
altmap for alternative memmap allocator.

This patch shouldn't introduce any functional change.

[akpm@linux-foundation.org: build fix]
Link: http://lkml.kernel.org/r/20190408082633.2864-3-osalvador@suse.de


Signed-off-by: default avatarMichal Hocko <mhocko@suse.com>
Signed-off-by: default avatarOscar Salvador <osalvador@suse.de>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5557c766

arch/arm64/mm/mmu.c

+3 −3
Original line number Diff line number Diff line
@@ -1065,8 +1065,8 @@ int p4d_free_pud_page(p4d_t *p4d, unsigned long addr) 
}



#ifdef CONFIG_MEMORY_HOTPLUG

int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,

		    bool want_memblock)

int arch_add_memory(int nid, u64 start, u64 size,

			struct mhp_restrictions *restrictions)

{

	int flags = 0;
@@ -1077,6 +1077,6 @@ int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, 
			     size, PAGE_KERNEL, __pgd_pgtable_alloc, flags);



	return __add_pages(nid, start >> PAGE_SHIFT, size >> PAGE_SHIFT,

			   altmap, want_memblock);

			   restrictions);

}

#endif

arch/ia64/mm/init.c

+3 −3
Original line number Diff line number Diff line
@@ -666,14 +666,14 @@ mem_init (void) 
}



#ifdef CONFIG_MEMORY_HOTPLUG

int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,

		bool want_memblock)

int arch_add_memory(int nid, u64 start, u64 size,

			struct mhp_restrictions *restrictions)

{

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;

	int ret;



	ret = __add_pages(nid, start_pfn, nr_pages, altmap, want_memblock);

	ret = __add_pages(nid, start_pfn, nr_pages, restrictions);

	if (ret)

		printk("%s: Problem encountered in __add_pages() as ret=%d\n",

		       __func__,  ret);

arch/powerpc/mm/mem.c

+3 −3
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ int __weak remove_section_mapping(unsigned long start, unsigned long end) 
	return -ENODEV;

}



int __ref arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,

			  bool want_memblock)

int __ref arch_add_memory(int nid, u64 start, u64 size,

			struct mhp_restrictions *restrictions)

{

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;
@@ -127,7 +127,7 @@ int __ref arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altm 
	}

	flush_inval_dcache_range(start, start + size);



	return __add_pages(nid, start_pfn, nr_pages, altmap, want_memblock);

	return __add_pages(nid, start_pfn, nr_pages, restrictions);

}



#ifdef CONFIG_MEMORY_HOTREMOVE

arch/s390/mm/init.c

+3 −3
Original line number Diff line number Diff line
@@ -219,8 +219,8 @@ device_initcall(s390_cma_mem_init); 


#endif /* CONFIG_CMA */



int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,

		bool want_memblock)

int arch_add_memory(int nid, u64 start, u64 size,

		struct mhp_restrictions *restrictions)

{

	unsigned long start_pfn = PFN_DOWN(start);

	unsigned long size_pages = PFN_DOWN(size);
@@ -230,7 +230,7 @@ int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, 
	if (rc)

		return rc;



	rc = __add_pages(nid, start_pfn, size_pages, altmap, want_memblock);

	rc = __add_pages(nid, start_pfn, size_pages, restrictions);

	if (rc)

		vmem_remove_mapping(start, size);

	return rc;

arch/sh/mm/init.c

+3 −3
Original line number Diff line number Diff line
@@ -404,15 +404,15 @@ void __init mem_init(void) 
}



#ifdef CONFIG_MEMORY_HOTPLUG

int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,

		bool want_memblock)

int arch_add_memory(int nid, u64 start, u64 size,

			struct mhp_restrictions *restrictions)

{

	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, altmap, want_memblock);

	ret = __add_pages(nid, start_pfn, nr_pages, restrictions);

	if (unlikely(ret))

		printk("%s: Failed, __add_pages() == %d\n", __func__, ret);

CRA Git | Maintained and supported by SUSTech CRA and CCSE