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

Commit 05e0caad authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

[PATCH] Have ia64 use add_active_range() and free_area_init_nodes 



Size zones and holes in an architecture independent manner for ia64.

[bob.picco@hp.com: fix ia64 FLATMEM+VIRTUAL_MEM_MAP]
Signed-off-by: default avatarMel Gorman <mel@csn.ul.ie>
Signed-off-by: default avatarBob Picco <bob.picco@hp.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Andi Kleen <ak@muc.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "Keith Mannthey" <kmannth@gmail.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: default avatarBob Picco <bob.picco@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5cb248ab

arch/ia64/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -356,6 +356,9 @@ config NODES_SHIFT 
	  MAX_NUMNODES will be 2^(This value).

	  If in doubt, use the default.



config ARCH_POPULATES_NODE_MAP

	def_bool y



# VIRTUAL_MEM_MAP and FLAT_NODE_MEM_MAP are functionally equivalent.

# VIRTUAL_MEM_MAP has been retained for historical reasons.

config VIRTUAL_MEM_MAP

arch/ia64/mm/contig.c

+15 −52
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <asm/mca.h>



#ifdef CONFIG_VIRTUAL_MEM_MAP

static unsigned long num_dma_physpages;

static unsigned long max_gap;

#endif
@@ -218,18 +217,6 @@ count_pages (u64 start, u64 end, void *arg) 
	return 0;

}



#ifdef CONFIG_VIRTUAL_MEM_MAP

static int

count_dma_pages (u64 start, u64 end, void *arg)

{

	unsigned long *count = arg;



	if (start < MAX_DMA_ADDRESS)

		*count += (min(end, MAX_DMA_ADDRESS) - start) >> PAGE_SHIFT;

	return 0;

}

#endif



/*

 * Set up the page tables.

 */
@@ -238,45 +225,22 @@ void __init 
paging_init (void)

{

	unsigned long max_dma;

	unsigned long zones_size[MAX_NR_ZONES];

#ifdef CONFIG_VIRTUAL_MEM_MAP

	unsigned long zholes_size[MAX_NR_ZONES];

#endif



	/* initialize mem_map[] */



	memset(zones_size, 0, sizeof(zones_size));

	unsigned long nid = 0;

	unsigned long max_zone_pfns[MAX_NR_ZONES];



	num_physpages = 0;

	efi_memmap_walk(count_pages, &num_physpages);



	max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT;

	max_zone_pfns[ZONE_DMA] = max_dma;

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;



#ifdef CONFIG_VIRTUAL_MEM_MAP

	memset(zholes_size, 0, sizeof(zholes_size));



	num_dma_physpages = 0;

	efi_memmap_walk(count_dma_pages, &num_dma_physpages);



	if (max_low_pfn < max_dma) {

		zones_size[ZONE_DMA] = max_low_pfn;

		zholes_size[ZONE_DMA] = max_low_pfn - num_dma_physpages;

	} else {

		zones_size[ZONE_DMA] = max_dma;

		zholes_size[ZONE_DMA] = max_dma - num_dma_physpages;

		if (num_physpages > num_dma_physpages) {

			zones_size[ZONE_NORMAL] = max_low_pfn - max_dma;

			zholes_size[ZONE_NORMAL] =

				((max_low_pfn - max_dma) -

				 (num_physpages - num_dma_physpages));

		}

	}



	efi_memmap_walk(register_active_ranges, &nid);

	efi_memmap_walk(find_largest_hole, (u64 *)&max_gap);

	if (max_gap < LARGE_GAP) {

		vmem_map = (struct page *) 0;

		free_area_init_node(0, NODE_DATA(0), zones_size, 0,

				    zholes_size);

		free_area_init_nodes(max_zone_pfns);

	} else {

		unsigned long map_size;
@@ -288,20 +252,19 @@ paging_init (void) 
		vmem_map = (struct page *) vmalloc_end;

		efi_memmap_walk(create_mem_map_page_table, NULL);



		NODE_DATA(0)->node_mem_map = vmem_map;

		free_area_init_node(0, NODE_DATA(0), zones_size,

				    0, zholes_size);

		/*

		 * alloc_node_mem_map makes an adjustment for mem_map

		 * which isn't compatible with vmem_map.

		 */

		NODE_DATA(0)->node_mem_map = vmem_map +

			find_min_pfn_with_active_regions();

		free_area_init_nodes(max_zone_pfns);



		printk("Virtual mem_map starts at 0x%p\n", mem_map);

	}

#else /* !CONFIG_VIRTUAL_MEM_MAP */

	if (max_low_pfn < max_dma)

		zones_size[ZONE_DMA] = max_low_pfn;

	else {

		zones_size[ZONE_DMA] = max_dma;

		zones_size[ZONE_NORMAL] = max_low_pfn - max_dma;

	}

	free_area_init(zones_size);

	add_active_range(0, 0, max_low_pfn);

	free_area_init_nodes(max_zone_pfns);

#endif /* !CONFIG_VIRTUAL_MEM_MAP */

	zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));

}

arch/ia64/mm/discontig.c

+9 −35
Original line number Diff line number Diff line
@@ -654,6 +654,7 @@ static __init int count_node_pages(unsigned long start, unsigned long len, int n 
{

	unsigned long end = start + len;



	add_active_range(node, start >> PAGE_SHIFT, end >> PAGE_SHIFT);

	mem_data[node].num_physpages += len >> PAGE_SHIFT;

	if (start <= __pa(MAX_DMA_ADDRESS))

		mem_data[node].num_dma_physpages +=
@@ -678,10 +679,10 @@ static __init int count_node_pages(unsigned long start, unsigned long len, int n 
void __init paging_init(void)

{

	unsigned long max_dma;

	unsigned long zones_size[MAX_NR_ZONES];

	unsigned long zholes_size[MAX_NR_ZONES];

	unsigned long pfn_offset = 0;

	unsigned long max_pfn = 0;

	int node;

	unsigned long max_zone_pfns[MAX_NR_ZONES];



	max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT;
@@ -698,47 +699,20 @@ void __init paging_init(void) 
#endif



	for_each_online_node(node) {

		memset(zones_size, 0, sizeof(zones_size));

		memset(zholes_size, 0, sizeof(zholes_size));



		num_physpages += mem_data[node].num_physpages;



		if (mem_data[node].min_pfn >= max_dma) {

			/* All of this node's memory is above ZONE_DMA */

			zones_size[ZONE_NORMAL] = mem_data[node].max_pfn -

				mem_data[node].min_pfn;

			zholes_size[ZONE_NORMAL] = mem_data[node].max_pfn -

				mem_data[node].min_pfn -

				mem_data[node].num_physpages;

		} else if (mem_data[node].max_pfn < max_dma) {

			/* All of this node's memory is in ZONE_DMA */

			zones_size[ZONE_DMA] = mem_data[node].max_pfn -

				mem_data[node].min_pfn;

			zholes_size[ZONE_DMA] = mem_data[node].max_pfn -

				mem_data[node].min_pfn -

				mem_data[node].num_dma_physpages;

		} else {

			/* This node has memory in both zones */

			zones_size[ZONE_DMA] = max_dma -

				mem_data[node].min_pfn;

			zholes_size[ZONE_DMA] = zones_size[ZONE_DMA] -

				mem_data[node].num_dma_physpages;

			zones_size[ZONE_NORMAL] = mem_data[node].max_pfn -

				max_dma;

			zholes_size[ZONE_NORMAL] = zones_size[ZONE_NORMAL] -

				(mem_data[node].num_physpages -

				 mem_data[node].num_dma_physpages);

		}



		pfn_offset = mem_data[node].min_pfn;



#ifdef CONFIG_VIRTUAL_MEM_MAP

		NODE_DATA(node)->node_mem_map = vmem_map + pfn_offset;

#endif

		free_area_init_node(node, NODE_DATA(node), zones_size,

				    pfn_offset, zholes_size);

		if (mem_data[node].max_pfn > max_pfn)

			max_pfn = mem_data[node].max_pfn;

	}



	max_zone_pfns[ZONE_DMA] = max_dma;

	max_zone_pfns[ZONE_NORMAL] = max_pfn;

	free_area_init_nodes(max_zone_pfns);



	zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));

}

arch/ia64/mm/init.c

+12 −0
Original line number Diff line number Diff line
@@ -593,6 +593,18 @@ find_largest_hole (u64 start, u64 end, void *arg) 
	last_end = end;

	return 0;

}



int __init

register_active_ranges(u64 start, u64 end, void *nid)

{

	BUG_ON(nid == NULL);

	BUG_ON(*(unsigned long *)nid >= MAX_NUMNODES);



	add_active_range(*(unsigned long *)nid,

				__pa(start) >> PAGE_SHIFT,

				__pa(end) >> PAGE_SHIFT);

	return 0;

}

#endif /* CONFIG_VIRTUAL_MEM_MAP */



static int __init

include/asm-ia64/meminit.h

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ extern void efi_memmap_init(unsigned long *, unsigned long *); 
  extern unsigned long vmalloc_end;

  extern struct page *vmem_map;

  extern int find_largest_hole (u64 start, u64 end, void *arg);

  extern int register_active_ranges (u64 start, u64 end, void *arg);

  extern int create_mem_map_page_table (u64 start, u64 end, void *arg);

  extern int vmemmap_find_next_valid_pfn(int, int);

#else