Commit e7e8de59 authored by Tang Chen's avatar Tang Chen Committed by Linus Torvalds

memblock: make memblock_set_node() support different memblock_type

[sfr@canb.auug.org.au: fix powerpc build]
Signed-off-by: default avatarTang Chen <tangchen@cn.fujitsu.com>
Reviewed-by: default avatarZhang Yanfei <zhangyanfei@cn.fujitsu.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: "Rafael J . Wysocki" <rjw@sisk.pl>
Cc: Chen Tang <imtangchen@gmail.com>
Cc: Gong Chen <gong.chen@linux.intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Larry Woodman <lwoodman@redhat.com>
Cc: Len Brown <lenb@kernel.org>
Cc: Liu Jiang <jiang.liu@huawei.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Toshi Kani <toshi.kani@hp.com>
Cc: Vasilis Liaskovitis <vasilis.liaskovitis@profitbricks.com>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 66b16edf
...@@ -204,7 +204,8 @@ static void __init do_init_bootmem(void) ...@@ -204,7 +204,8 @@ static void __init do_init_bootmem(void)
start_pfn = memblock_region_memory_base_pfn(reg); start_pfn = memblock_region_memory_base_pfn(reg);
end_pfn = memblock_region_memory_end_pfn(reg); end_pfn = memblock_region_memory_end_pfn(reg);
memblock_set_node(PFN_PHYS(start_pfn), memblock_set_node(PFN_PHYS(start_pfn),
PFN_PHYS(end_pfn - start_pfn), 0); PFN_PHYS(end_pfn - start_pfn),
&memblock.memory, 0);
} }
/* All of system RAM sits in node 0 for the non-NUMA case */ /* All of system RAM sits in node 0 for the non-NUMA case */
......
...@@ -42,7 +42,8 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end) ...@@ -42,7 +42,8 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)
memblock_add(start, end - start); memblock_add(start, end - start);
memblock_set_node(PFN_PHYS(start_pfn), memblock_set_node(PFN_PHYS(start_pfn),
PFN_PHYS(end_pfn - start_pfn), nid); PFN_PHYS(end_pfn - start_pfn),
&memblock.memory, nid);
/* Node-local pgdat */ /* Node-local pgdat */
pgdat_paddr = memblock_alloc_base(sizeof(struct pglist_data), pgdat_paddr = memblock_alloc_base(sizeof(struct pglist_data),
......
...@@ -192,7 +192,8 @@ void __init setup_memory(void) ...@@ -192,7 +192,8 @@ void __init setup_memory(void)
start_pfn = memblock_region_memory_base_pfn(reg); start_pfn = memblock_region_memory_base_pfn(reg);
end_pfn = memblock_region_memory_end_pfn(reg); end_pfn = memblock_region_memory_end_pfn(reg);
memblock_set_node(start_pfn << PAGE_SHIFT, memblock_set_node(start_pfn << PAGE_SHIFT,
(end_pfn - start_pfn) << PAGE_SHIFT, 0); (end_pfn - start_pfn) << PAGE_SHIFT,
&memblock.memory, 0);
} }
/* free bootmem is whole main memory */ /* free bootmem is whole main memory */
......
...@@ -209,7 +209,7 @@ void __init do_init_bootmem(void) ...@@ -209,7 +209,7 @@ void __init do_init_bootmem(void)
/* Place all memblock_regions in the same node and merge contiguous /* Place all memblock_regions in the same node and merge contiguous
* memblock_regions * memblock_regions
*/ */
memblock_set_node(0, (phys_addr_t)ULLONG_MAX, 0); memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0);
/* Add all physical memory to the bootmem map, mark each area /* Add all physical memory to the bootmem map, mark each area
* present. * present.
......
...@@ -670,7 +670,8 @@ static void __init parse_drconf_memory(struct device_node *memory) ...@@ -670,7 +670,8 @@ static void __init parse_drconf_memory(struct device_node *memory)
node_set_online(nid); node_set_online(nid);
sz = numa_enforce_memory_limit(base, size); sz = numa_enforce_memory_limit(base, size);
if (sz) if (sz)
memblock_set_node(base, sz, nid); memblock_set_node(base, sz,
&memblock.memory, nid);
} while (--ranges); } while (--ranges);
} }
} }
...@@ -760,7 +761,7 @@ static int __init parse_numa_properties(void) ...@@ -760,7 +761,7 @@ static int __init parse_numa_properties(void)
continue; continue;
} }
memblock_set_node(start, size, nid); memblock_set_node(start, size, &memblock.memory, nid);
if (--ranges) if (--ranges)
goto new_range; goto new_range;
...@@ -797,7 +798,8 @@ static void __init setup_nonnuma(void) ...@@ -797,7 +798,8 @@ static void __init setup_nonnuma(void)
fake_numa_create_new_node(end_pfn, &nid); fake_numa_create_new_node(end_pfn, &nid);
memblock_set_node(PFN_PHYS(start_pfn), memblock_set_node(PFN_PHYS(start_pfn),
PFN_PHYS(end_pfn - start_pfn), nid); PFN_PHYS(end_pfn - start_pfn),
&memblock.memory, nid);
node_set_online(nid); node_set_online(nid);
} }
} }
......
...@@ -230,8 +230,8 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn, ...@@ -230,8 +230,8 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn,
pmb_bolt_mapping((unsigned long)__va(start), start, end - start, pmb_bolt_mapping((unsigned long)__va(start), start, end - start,
PAGE_KERNEL); PAGE_KERNEL);
memblock_set_node(PFN_PHYS(start_pfn), memblock_set_node(PFN_PHYS(start_pfn), PFN_PHYS(end_pfn - start_pfn),
PFN_PHYS(end_pfn - start_pfn), nid); &memblock.memory, nid);
} }
void __init __weak plat_early_device_setup(void) void __init __weak plat_early_device_setup(void)
......
...@@ -1021,7 +1021,8 @@ static void __init add_node_ranges(void) ...@@ -1021,7 +1021,8 @@ static void __init add_node_ranges(void)
"start[%lx] end[%lx]\n", "start[%lx] end[%lx]\n",
nid, start, this_end); nid, start, this_end);
memblock_set_node(start, this_end - start, nid); memblock_set_node(start, this_end - start,
&memblock.memory, nid);
start = this_end; start = this_end;
} }
} }
...@@ -1325,7 +1326,7 @@ static void __init bootmem_init_nonnuma(void) ...@@ -1325,7 +1326,7 @@ static void __init bootmem_init_nonnuma(void)
(top_of_ram - total_ram) >> 20); (top_of_ram - total_ram) >> 20);
init_node_masks_nonnuma(); init_node_masks_nonnuma();
memblock_set_node(0, (phys_addr_t)ULLONG_MAX, 0); memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0);
allocate_node_data(0); allocate_node_data(0);
node_set_online(0); node_set_online(0);
} }
......
...@@ -665,7 +665,7 @@ void __init initmem_init(void) ...@@ -665,7 +665,7 @@ void __init initmem_init(void)
high_memory = (void *) __va(max_low_pfn * PAGE_SIZE - 1) + 1; high_memory = (void *) __va(max_low_pfn * PAGE_SIZE - 1) + 1;
#endif #endif
memblock_set_node(0, (phys_addr_t)ULLONG_MAX, 0); memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0);
sparse_memory_present_with_active_regions(0); sparse_memory_present_with_active_regions(0);
#ifdef CONFIG_FLATMEM #ifdef CONFIG_FLATMEM
......
...@@ -643,7 +643,7 @@ kernel_physical_mapping_init(unsigned long start, ...@@ -643,7 +643,7 @@ kernel_physical_mapping_init(unsigned long start,
#ifndef CONFIG_NUMA #ifndef CONFIG_NUMA
void __init initmem_init(void) void __init initmem_init(void)
{ {
memblock_set_node(0, (phys_addr_t)ULLONG_MAX, 0); memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0);
} }
#endif #endif
......
...@@ -491,7 +491,8 @@ static int __init numa_register_memblks(struct numa_meminfo *mi) ...@@ -491,7 +491,8 @@ static int __init numa_register_memblks(struct numa_meminfo *mi)
for (i = 0; i < mi->nr_blks; i++) { for (i = 0; i < mi->nr_blks; i++) {
struct numa_memblk *mb = &mi->blk[i]; struct numa_memblk *mb = &mi->blk[i];
memblock_set_node(mb->start, mb->end - mb->start, mb->nid); memblock_set_node(mb->start, mb->end - mb->start,
&memblock.memory, mb->nid);
} }
/* /*
...@@ -565,7 +566,8 @@ static int __init numa_init(int (*init_func)(void)) ...@@ -565,7 +566,8 @@ static int __init numa_init(int (*init_func)(void))
nodes_clear(node_possible_map); nodes_clear(node_possible_map);
nodes_clear(node_online_map); nodes_clear(node_online_map);
memset(&numa_meminfo, 0, sizeof(numa_meminfo)); memset(&numa_meminfo, 0, sizeof(numa_meminfo));
WARN_ON(memblock_set_node(0, ULLONG_MAX, MAX_NUMNODES)); WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.memory,
MAX_NUMNODES));
numa_reset_distance(); numa_reset_distance();
ret = init_func(); ret = init_func();
......
...@@ -140,7 +140,8 @@ static inline void memblock_clear_region_flags(struct memblock_region *r, ...@@ -140,7 +140,8 @@ static inline void memblock_clear_region_flags(struct memblock_region *r,
} }
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
int memblock_set_node(phys_addr_t base, phys_addr_t size, int nid); int memblock_set_node(phys_addr_t base, phys_addr_t size,
struct memblock_type *type, int nid);
static inline void memblock_set_region_node(struct memblock_region *r, int nid) static inline void memblock_set_region_node(struct memblock_region *r, int nid)
{ {
......
...@@ -911,18 +911,18 @@ void __init_memblock __next_mem_pfn_range(int *idx, int nid, ...@@ -911,18 +911,18 @@ void __init_memblock __next_mem_pfn_range(int *idx, int nid,
* memblock_set_node - set node ID on memblock regions * memblock_set_node - set node ID on memblock regions
* @base: base of area to set node ID for * @base: base of area to set node ID for
* @size: size of area to set node ID for * @size: size of area to set node ID for
* @type: memblock type to set node ID for
* @nid: node ID to set * @nid: node ID to set
* *
* Set the nid of memblock memory regions in [@base,@base+@size) to @nid. * Set the nid of memblock @type regions in [@base,@base+@size) to @nid.
* Regions which cross the area boundaries are split as necessary. * Regions which cross the area boundaries are split as necessary.
* *
* RETURNS: * RETURNS:
* 0 on success, -errno on failure. * 0 on success, -errno on failure.
*/ */
int __init_memblock memblock_set_node(phys_addr_t base, phys_addr_t size, int __init_memblock memblock_set_node(phys_addr_t base, phys_addr_t size,
int nid) struct memblock_type *type, int nid)
{ {
struct memblock_type *type = &memblock.memory;
int start_rgn, end_rgn; int start_rgn, end_rgn;
int i, ret; int i, ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment