Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba924c81 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86, numa, 32-bit: increase max_elements to 1024 



so every element will represent 64M instead of 256M.

AMD opteron could have HW memory hole remapping, so could have
[0, 8g + 64M) on node0. Reduce element size to 64M to keep that on node 0

Later we need to use find_e820_area() to allocate memory_node_map like
on 64-bit. But need to move memory_present out of populate_mem_map...

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4c1cbafb

arch/x86/mm/discontig_32.c

+7 −7
Original line number Diff line number Diff line
@@ -59,14 +59,14 @@ unsigned long node_end_pfn[MAX_NUMNODES] __read_mostly; 
/*

 * 4) physnode_map     - the mapping between a pfn and owning node

 * physnode_map keeps track of the physical memory layout of a generic

 * numa node on a 256Mb break (each element of the array will

 * represent 256Mb of memory and will be marked by the node id.  so,

 * numa node on a 64Mb break (each element of the array will

 * represent 64Mb of memory and will be marked by the node id.  so,

 * if the first gig is on node 0, and the second gig is on node 1

 * physnode_map will contain:

 *

 *     physnode_map[0-3] = 0;

 *     physnode_map[4-7] = 1;

 *     physnode_map[8- ] = -1;

 *     physnode_map[0-15] = 0;

 *     physnode_map[16-31] = 1;

 *     physnode_map[32- ] = -1;

 */

s8 physnode_map[MAX_ELEMENTS] __read_mostly = { [0 ... (MAX_ELEMENTS - 1)] = -1};

EXPORT_SYMBOL(physnode_map);
@@ -81,9 +81,9 @@ void memory_present(int nid, unsigned long start, unsigned long end) 
	printk(KERN_DEBUG "  ");

	for (pfn = start; pfn < end; pfn += PAGES_PER_ELEMENT) {

		physnode_map[pfn / PAGES_PER_ELEMENT] = nid;

		printk("%ld ", pfn);

		printk(KERN_CONT "%ld ", pfn);

	}

	printk("\n");

	printk(KERN_CONT "\n");

}



unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn,

include/asm-x86/mmzone_32.h

+2 −2
Original line number Diff line number Diff line
@@ -51,14 +51,14 @@ extern int early_pfn_to_nid(unsigned long pfn); 
/*

 * generic node memory support, the following assumptions apply:

 *

 * 1) memory comes in 256Mb contigious chunks which are either present or not

 * 1) memory comes in 64Mb contigious chunks which are either present or not

 * 2) we will not have more than 64Gb in total

 *

 * for now assume that 64Gb is max amount of RAM for whole system

 *    64Gb / 4096bytes/page = 16777216 pages

 */

#define MAX_NR_PAGES 16777216

#define MAX_ELEMENTS 256

#define MAX_ELEMENTS 1024

#define PAGES_PER_ELEMENT (MAX_NR_PAGES/MAX_ELEMENTS)



extern s8 physnode_map[];