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

Commit 89fa3024 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] NUMA: Add zone_to_nid function 



There are many places where we need to determine the node of a zone.
Currently we use a difficult to read sequence of pointer dereferencing.
Put that into an inline function and use throughout VM.  Maybe we can find
a way to optimize the lookup in the future.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4415cc8d

arch/i386/mm/discontig.c

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ void __init set_highmem_pages_init(int bad_ppro) 
		zone_end_pfn = zone_start_pfn + zone->spanned_pages;



		printk("Initializing %s for node %d (%08lx:%08lx)\n",

				zone->name, zone->zone_pgdat->node_id,

				zone->name, zone_to_nid(zone),

				zone_start_pfn, zone_end_pfn);



		for (node_pfn = zone_start_pfn; node_pfn < zone_end_pfn; node_pfn++) {

arch/parisc/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ void show_mem(void) 


				printk("Zone list for zone %d on node %d: ", j, i);

				for (k = 0; zl->zones[k] != NULL; k++) 

					printk("[%d/%s] ", zl->zones[k]->zone_pgdat->node_id, zl->zones[k]->name);

					printk("[%d/%s] ", zone_to_nid(zl->zones[k]), zl->zones[k]->name);

				printk("\n");

			}

		}

include/linux/mm.h

+6 −1
Original line number Diff line number Diff line
@@ -499,12 +499,17 @@ static inline struct zone *page_zone(struct page *page) 
	return zone_table[page_zone_id(page)];

}



static inline unsigned long zone_to_nid(struct zone *zone)

{

	return zone->zone_pgdat->node_id;

}



static inline unsigned long page_to_nid(struct page *page)

{

	if (FLAGS_HAS_NODE)

		return (page->flags >> NODES_PGSHIFT) & NODES_MASK;

	else

		return page_zone(page)->zone_pgdat->node_id;

		return zone_to_nid(page_zone(page));

}

static inline unsigned long page_to_section(struct page *page)

{

kernel/cpuset.c

+2 −2
Original line number Diff line number Diff line
@@ -2245,7 +2245,7 @@ int cpuset_zonelist_valid_mems_allowed(struct zonelist *zl) 
	int i;



	for (i = 0; zl->zones[i]; i++) {

		int nid = zl->zones[i]->zone_pgdat->node_id;

		int nid = zone_to_nid(zl->zones[i]);



		if (node_isset(nid, current->mems_allowed))

			return 1;
@@ -2318,7 +2318,7 @@ int __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask) 


	if (in_interrupt() || (gfp_mask & __GFP_THISNODE))

		return 1;

	node = z->zone_pgdat->node_id;

	node = zone_to_nid(z);

	might_sleep_if(!(gfp_mask & __GFP_HARDWALL));

	if (node_isset(node, current->mems_allowed))

		return 1;

mm/hugetlb.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static struct page *dequeue_huge_page(struct vm_area_struct *vma, 
	struct zone **z;



	for (z = zonelist->zones; *z; z++) {

		nid = (*z)->zone_pgdat->node_id;

		nid = zone_to_nid(*z);

		if (cpuset_zone_allowed(*z, GFP_HIGHUSER) &&

		    !list_empty(&hugepage_freelists[nid]))

			break;