Commit 2c2a5af6 authored by Oscar Salvador's avatar Oscar Salvador Committed by Linus Torvalds
Browse files

mm, memory_hotplug: add nid parameter to arch_remove_memory 

Patch series "Do not touch pages in hot-remove path", v2.

This patchset aims for two things:

 1) A better definition about offline and hot-remove stage
 2) Solving bugs where we can access non-initialized pages
    during hot-remove operations [2] [3].

This is achieved by moving all page/zone handling to the offline
stage, so we do not need to access pages when hot-removing memory.

[1] https://patchwork.kernel.org/cover/10691415/
[2] https://patchwork.kernel.org/patch/10547445/
[3] https://www.spinics.net/lists/linux-mm/msg161316.html

This patch (of 5):

This is a preparation for the following-up patches.  The idea of passing
the nid is that it will allow us to get rid of the zone parameter
afterwards.

Link: http://lkml.kernel.org/r/20181127162005.15833-2-osalvador@suse.de


Signed-off-by: default avatarOscar Salvador <osalvador@suse.de>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarPavel Tatashin <pasha.tatashin@soleen.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 23b68cfa

arch/ia64/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, 
}



#ifdef CONFIG_MEMORY_HOTREMOVE

int arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)

int arch_remove_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap)

{

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;

arch/powerpc/mm/mem.c

+2 −1
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ int __meminit arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap * 
}



#ifdef CONFIG_MEMORY_HOTREMOVE

int __meminit arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)

int __meminit arch_remove_memory(int nid, u64 start, u64 size,

					struct vmem_altmap *altmap)

{

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;

arch/s390/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, 
}



#ifdef CONFIG_MEMORY_HOTREMOVE

int arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)

int arch_remove_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap)

{

	/*

	 * There is no hardware or firmware interface which could trigger a

arch/sh/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); 
#endif



#ifdef CONFIG_MEMORY_HOTREMOVE

int arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)

int arch_remove_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap)

{

	unsigned long start_pfn = PFN_DOWN(start);

	unsigned long nr_pages = size >> PAGE_SHIFT;

arch/x86/mm/init_32.c

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, 
}



#ifdef CONFIG_MEMORY_HOTREMOVE

int arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)

int arch_remove_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap)

{

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;

CRA Git | Maintained and supported by SUSTech CRA and CCSE