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

Commit 408fde81 authored by Dave Hansen's avatar Dave Hansen Committed by Linus Torvalds
Browse files

[PATCH] remove non-DISCONTIG use of pgdat->node_mem_map 

This patch effectively eliminates direct use of pgdat->node_mem_map outside
of the DISCONTIG code.  On a flat memory system, these fields aren't
currently used, neither are they on a sparsemem system.

There was also a node_mem_map(nid) macro on many architectures.  Its use
along with the use of ->node_mem_map itself was not consistent.  It has
been removed in favor of two new, more explicit, arch-independent macros:

	pgdat_page_nr(pgdat, pagenr)
	nid_page_nr(nid, pagenr)

I called them "pgdat" and "nid" because we overload the term "node" to mean
"NUMA node", "DISCONTIG node" or "pg_data_t" in very confusing ways.  I
believe the newer names are much clearer.

These macros can be overridden in the sparsemem case with a theoretically
slower operation using node_start_pfn and pfn_to_page(), instead.  We could
make this the only behavior if people want, but I don't want to change too
much at once.  One thing at a time.

This patch removes more code than it adds.

Compile tested on alpha, alpha discontig, arm, arm-discontig, i386, i386
generic, NUMAQ, Summit, ppc64, ppc64 discontig, and x86_64.  Full list
here: http://sr71.net/patches/2.6.12/2.6.12-rc1-mhp2/configs/



Boot tested on NUMAQ, x86 SMP and ppc64 power4/5 LPARs.

Signed-off-by: default avatarDave Hansen <haveblue@us.ibm.com>
Signed-off-by: default avatarMartin J. Bligh <mbligh@aracnet.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 29c31a3b

arch/alpha/mm/numa.c

+7 −9
Original line number Original line Diff line number Diff line
@@ -327,8 +327,6 @@ void __init mem_init(void) 
	extern char _text, _etext, _data, _edata;

	extern char _text, _etext, _data, _edata;

	extern char __init_begin, __init_end;

	extern char __init_begin, __init_end;

	unsigned long nid, i;

	unsigned long nid, i;

	struct page * lmem_map;



	high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);

	high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);





	reservedpages = 0;

	reservedpages = 0;
@@ -338,10 +336,10 @@ void __init mem_init(void) 
		 */

		 */

		totalram_pages += free_all_bootmem_node(NODE_DATA(nid));

		totalram_pages += free_all_bootmem_node(NODE_DATA(nid));





		lmem_map = node_mem_map(nid);

		pfn = NODE_DATA(nid)->node_start_pfn;

		pfn = NODE_DATA(nid)->node_start_pfn;

		for (i = 0; i < node_spanned_pages(nid); i++, pfn++)

		for (i = 0; i < node_spanned_pages(nid); i++, pfn++)

			if (page_is_ram(pfn) && PageReserved(lmem_map+i))

			if (page_is_ram(pfn) &&

			    PageReserved(nid_page_nr(nid, i)))

				reservedpages++;

				reservedpages++;

	}

	}
@@ -373,18 +371,18 @@ show_mem(void) 
	show_free_areas();

	show_free_areas();

	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));

	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));

	for_each_online_node(nid) {

	for_each_online_node(nid) {

		struct page * lmem_map = node_mem_map(nid);

		i = node_spanned_pages(nid);

		i = node_spanned_pages(nid);

		while (i-- > 0) {

		while (i-- > 0) {

			struct page *page = nid_page_nr(nid, i);

			total++;

			total++;

			if (PageReserved(lmem_map+i))

			if (PageReserved(page))

				reserved++;

				reserved++;

			else if (PageSwapCache(lmem_map+i))

			else if (PageSwapCache(page))

				cached++;

				cached++;

			else if (!page_count(lmem_map+i))

			else if (!page_count(page))

				free++;

				free++;

			else

			else

				shared += page_count(lmem_map + i) - 1;

				shared += page_count(page) - 1;

		}

		}

	}

	}

	printk("%ld pages of RAM\n",total);

	printk("%ld pages of RAM\n",total);

arch/i386/mm/pgtable.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ void show_mem(void) 
	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));

	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));

	for_each_pgdat(pgdat) {

	for_each_pgdat(pgdat) {

		for (i = 0; i < pgdat->node_spanned_pages; ++i) {

		for (i = 0; i < pgdat->node_spanned_pages; ++i) {

			page = pgdat->node_mem_map + i;

			page = pgdat_page_nr(pgdat, i);

			total++;

			total++;

			if (PageHighMem(page))

			if (PageHighMem(page))

				highmem++;

				highmem++;

arch/ia64/mm/discontig.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -560,14 +560,15 @@ void show_mem(void) 
		int shared = 0, cached = 0, reserved = 0;

		int shared = 0, cached = 0, reserved = 0;

		printk("Node ID: %d\n", pgdat->node_id);

		printk("Node ID: %d\n", pgdat->node_id);

		for(i = 0; i < pgdat->node_spanned_pages; i++) {

		for(i = 0; i < pgdat->node_spanned_pages; i++) {

			struct page *page = pgdat_page_nr(pgdat, i);

			if (!ia64_pfn_valid(pgdat->node_start_pfn+i))

			if (!ia64_pfn_valid(pgdat->node_start_pfn+i))

				continue;

				continue;

			if (PageReserved(pgdat->node_mem_map+i))

			if (PageReserved(page))

				reserved++;

				reserved++;

			else if (PageSwapCache(pgdat->node_mem_map+i))

			else if (PageSwapCache(page))

				cached++;

				cached++;

			else if (page_count(pgdat->node_mem_map+i))

			else if (page_count(page))

				shared += page_count(pgdat->node_mem_map+i)-1;

				shared += page_count(page)-1;

		}

		}

		total_present += present;

		total_present += present;

		total_reserved += reserved;

		total_reserved += reserved;

arch/m32r/mm/init.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ void show_mem(void) 
	printk("Free swap:       %6ldkB\n",nr_swap_pages<<(PAGE_SHIFT-10));

	printk("Free swap:       %6ldkB\n",nr_swap_pages<<(PAGE_SHIFT-10));

	for_each_pgdat(pgdat) {

	for_each_pgdat(pgdat) {

		for (i = 0; i < pgdat->node_spanned_pages; ++i) {

		for (i = 0; i < pgdat->node_spanned_pages; ++i) {

			page = pgdat->node_mem_map + i;

			page = pgdat_page_nr(pgdat, i);

			total++;

			total++;

			if (PageHighMem(page))

			if (PageHighMem(page))

				highmem++;

				highmem++;
@@ -152,7 +152,7 @@ int __init reservedpages_count(void) 
	reservedpages = 0;

	reservedpages = 0;

	for_each_online_node(nid)

	for_each_online_node(nid)

		for (i = 0 ; i < MAX_LOW_PFN(nid) - START_PFN(nid) ; i++)

		for (i = 0 ; i < MAX_LOW_PFN(nid) - START_PFN(nid) ; i++)

			if (PageReserved(NODE_DATA(nid)->node_mem_map + i))

			if (PageReserved(nid_page_nr(nid, i)))

				reservedpages++;

				reservedpages++;





	return reservedpages;

	return reservedpages;

arch/mips/sgi-ip27/ip27-memory.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -549,8 +549,7 @@ void __init mem_init(void) 
		 */

		 */

		numslots = node_getlastslot(node);

		numslots = node_getlastslot(node);

		for (slot = 1; slot <= numslots; slot++) {

		for (slot = 1; slot <= numslots; slot++) {

			p = NODE_DATA(node)->node_mem_map +

			p = nid_page_nr(node, slot_getbasepfn(node, slot) -

				(slot_getbasepfn(node, slot) -

					      slot_getbasepfn(node, 0));

					      slot_getbasepfn(node, 0));





			/*

			/*