leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mm, sparse: pass nid instead of pgdat to sparse_add_one_section()

Browse Source 
Since the information needed in sparse_add_one_section() is node id to
allocate proper memory, it is not necessary to pass its pgdat.

This patch changes the prototype of sparse_add_one_section() to pass node
id directly.  This is intended to reduce misleading that
sparse_add_one_section() would touch pgdat.

Link: http://lkml.kernel.org/r/20181204085657.20472-2-richard.weiyang@gmail.com
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Oscar Salvador <osalvador@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Wei Yang 2018-12-28 00:37:06 -08:00 committed by Linus Torvalds
parent 83af658898
commit 4e0d2e7ef1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/memory_hotplug.h
View File

@ -333,8 +333,8 @@ extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,
unsigned long nr_pages, struct vmem_altmap *altmap); unsigned long nr_pages, struct vmem_altmap *altmap);
extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages); extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages);
extern bool is_memblock_offlined(struct memory_block *mem); extern bool is_memblock_offlined(struct memory_block *mem);
extern int sparse_add_one_section(struct pglist_data *pgdat, extern int sparse_add_one_section(int nid, unsigned long start_pfn,
unsigned long start_pfn, struct vmem_altmap *altmap); struct vmem_altmap *altmap);
extern void sparse_remove_one_section(struct zone *zone, struct mem_section *ms, extern void sparse_remove_one_section(struct zone *zone, struct mem_section *ms,
unsigned long map_offset, struct vmem_altmap *altmap); unsigned long map_offset, struct vmem_altmap *altmap);
extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map, extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map,

2
mm/memory_hotplug.c
View File

@ -253,7 +253,7 @@ static int __meminit __add_section(int nid, unsigned long phys_start_pfn,
if (pfn_valid(phys_start_pfn)) if (pfn_valid(phys_start_pfn))
return -EEXIST; return -EEXIST;
ret = sparse_add_one_section(NODE_DATA(nid), phys_start_pfn, altmap); ret = sparse_add_one_section(nid, phys_start_pfn, altmap);
if (ret < 0) if (ret < 0)
return ret; return ret;

8
mm/sparse.c
View File

@ -678,8 +678,8 @@ static void free_map_bootmem(struct page *memmap)
* set. If this is <=0, then that means that the passed-in * set. If this is <=0, then that means that the passed-in
* map was not consumed and must be freed. * map was not consumed and must be freed.
*/ */
int __meminit sparse_add_one_section(struct pglist_data *pgdat, int __meminit sparse_add_one_section(int nid, unsigned long start_pfn,
unsigned long start_pfn, struct vmem_altmap *altmap) struct vmem_altmap *altmap)
{ {
unsigned long section_nr = pfn_to_section_nr(start_pfn); unsigned long section_nr = pfn_to_section_nr(start_pfn);
struct mem_section *ms; struct mem_section *ms;
@ -691,11 +691,11 @@ int __meminit sparse_add_one_section(struct pglist_data *pgdat,
* no locking for this, because it does its own * no locking for this, because it does its own
* plus, it does a kmalloc * plus, it does a kmalloc
*/ */
ret = sparse_index_init(section_nr, pgdat->node_id); ret = sparse_index_init(section_nr, nid);
if (ret < 0 && ret != -EEXIST) if (ret < 0 && ret != -EEXIST)
return ret; return ret;
ret = 0; ret = 0;
memmap = kmalloc_section_memmap(section_nr, pgdat->node_id, altmap); memmap = kmalloc_section_memmap(section_nr, nid, altmap);
if (!memmap) if (!memmap)
return -ENOMEM; return -ENOMEM;
usemap = __kmalloc_section_usemap(); usemap = __kmalloc_section_usemap();