aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c4
-rw-r--r--mm/sparse.c92
2 files changed, 74 insertions, 22 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 1eb683f9b3af..7ee675ad101e 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1650,8 +1650,8 @@ void __init memmap_init_zone(unsigned long size, int nid, unsigned long zone,
1650 unsigned long start_pfn) 1650 unsigned long start_pfn)
1651{ 1651{
1652 struct page *page; 1652 struct page *page;
1653 int end_pfn = start_pfn + size; 1653 unsigned long end_pfn = start_pfn + size;
1654 int pfn; 1654 unsigned long pfn;
1655 1655
1656 for (pfn = start_pfn; pfn < end_pfn; pfn++, page++) { 1656 for (pfn = start_pfn; pfn < end_pfn; pfn++, page++) {
1657 if (!early_pfn_valid(pfn)) 1657 if (!early_pfn_valid(pfn))
diff --git a/mm/sparse.c b/mm/sparse.c
index f888385b9e14..b54e304df4a7 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -25,7 +25,7 @@ void memory_present(int nid, unsigned long start, unsigned long end)
25 for (pfn = start; pfn < end; pfn += PAGES_PER_SECTION) { 25 for (pfn = start; pfn < end; pfn += PAGES_PER_SECTION) {
26 unsigned long section = pfn_to_section_nr(pfn); 26 unsigned long section = pfn_to_section_nr(pfn);
27 if (!mem_section[section].section_mem_map) 27 if (!mem_section[section].section_mem_map)
28 mem_section[section].section_mem_map = (void *) -1; 28 mem_section[section].section_mem_map = SECTION_MARKED_PRESENT;
29 } 29 }
30} 30}
31 31
@@ -51,6 +51,56 @@ unsigned long __init node_memmap_size_bytes(int nid, unsigned long start_pfn,
51} 51}
52 52
53/* 53/*
54 * Subtle, we encode the real pfn into the mem_map such that
55 * the identity pfn - section_mem_map will return the actual
56 * physical page frame number.
57 */
58static unsigned long sparse_encode_mem_map(struct page *mem_map, unsigned long pnum)
59{
60 return (unsigned long)(mem_map - (section_nr_to_pfn(pnum)));
61}
62
63/*
64 * We need this if we ever free the mem_maps. While not implemented yet,
65 * this function is included for parity with its sibling.
66 */
67static __attribute((unused))
68struct page *sparse_decode_mem_map(unsigned long coded_mem_map, unsigned long pnum)
69{
70 return ((struct page *)coded_mem_map) + section_nr_to_pfn(pnum);
71}
72
73static int sparse_init_one_section(struct mem_section *ms,
74 unsigned long pnum, struct page *mem_map)
75{
76 if (!valid_section(ms))
77 return -EINVAL;
78
79 ms->section_mem_map |= sparse_encode_mem_map(mem_map, pnum);
80
81 return 1;
82}
83
84static struct page *sparse_early_mem_map_alloc(unsigned long pnum)
85{
86 struct page *map;
87 int nid = early_pfn_to_nid(section_nr_to_pfn(pnum));
88
89 map = alloc_remap(nid, sizeof(struct page) * PAGES_PER_SECTION);
90 if (map)
91 return map;
92
93 map = alloc_bootmem_node(NODE_DATA(nid),
94 sizeof(struct page) * PAGES_PER_SECTION);
95 if (map)
96 return map;
97
98 printk(KERN_WARNING "%s: allocation failed\n", __FUNCTION__);
99 mem_section[pnum].section_mem_map = 0;
100 return NULL;
101}
102
103/*
54 * Allocate the accumulated non-linear sections, allocate a mem_map 104 * Allocate the accumulated non-linear sections, allocate a mem_map
55 * for each and record the physical to section mapping. 105 * for each and record the physical to section mapping.
56 */ 106 */
@@ -58,28 +108,30 @@ void sparse_init(void)
58{ 108{
59 unsigned long pnum; 109 unsigned long pnum;
60 struct page *map; 110 struct page *map;
61 int nid;
62 111
63 for (pnum = 0; pnum < NR_MEM_SECTIONS; pnum++) { 112 for (pnum = 0; pnum < NR_MEM_SECTIONS; pnum++) {
64 if (!mem_section[pnum].section_mem_map) 113 if (!valid_section_nr(pnum))
65 continue; 114 continue;
66 115
67 nid = early_pfn_to_nid(section_nr_to_pfn(pnum)); 116 map = sparse_early_mem_map_alloc(pnum);
68 map = alloc_remap(nid, sizeof(struct page) * PAGES_PER_SECTION); 117 if (map)
69 if (!map) 118 sparse_init_one_section(&mem_section[pnum], pnum, map);
70 map = alloc_bootmem_node(NODE_DATA(nid),
71 sizeof(struct page) * PAGES_PER_SECTION);
72 if (!map) {
73 mem_section[pnum].section_mem_map = 0;
74 continue;
75 }
76
77 /*
78 * Subtle, we encode the real pfn into the mem_map such that
79 * the identity pfn - section_mem_map will return the actual
80 * physical page frame number.
81 */
82 mem_section[pnum].section_mem_map = map -
83 section_nr_to_pfn(pnum);
84 } 119 }
85} 120}
121
122/*
123 * returns the number of sections whose mem_maps were properly
124 * set. If this is <=0, then that means that the passed-in
125 * map was not consumed and must be freed.
126 */
127int sparse_add_one_section(unsigned long start_pfn, int nr_pages, struct page *map)
128{
129 struct mem_section *ms = __pfn_to_section(start_pfn);
130
131 if (ms->section_mem_map & SECTION_MARKED_PRESENT)
132 return -EEXIST;
133
134 ms->section_mem_map |= SECTION_MARKED_PRESENT;
135
136 return sparse_init_one_section(ms, pfn_to_section_nr(start_pfn), map);
137}