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

Commit 0e88460d authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

mm: introduce node_zonelist() for accessing the zonelist for a GFP mask 



Introduce a node_zonelist() helper function.  It is used to lookup the
appropriate zonelist given a node and a GFP mask.  The patch on its own is a
cleanup but it helps clarify parts of the two-zonelist-per-node patchset.  If
necessary, it can be merged with the next patch in this set without problems.

Reviewed-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarMel Gorman <mel@csn.ul.ie>
Signed-off-by: default avatarLee Schermerhorn <lee.schermerhorn@hp.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Christoph Lameter <clameter@sgi.com>
Cc: Hugh Dickins <hugh@veritas.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dac1d27b

drivers/char/sysrq.c

+1 −2
Original line number Diff line number Diff line
@@ -271,8 +271,7 @@ static struct sysrq_key_op sysrq_term_op = { 


static void moom_callback(struct work_struct *ignored)

{

	out_of_memory(&NODE_DATA(0)->node_zonelists[ZONE_NORMAL],

			GFP_KERNEL, 0);

	out_of_memory(node_zonelist(0, GFP_KERNEL), GFP_KERNEL, 0);

}



static DECLARE_WORK(moom_work, moom_callback);

fs/buffer.c

+3 −3
Original line number Diff line number Diff line
@@ -361,13 +361,13 @@ void invalidate_bdev(struct block_device *bdev) 
static void free_more_memory(void)

{

	struct zonelist *zonelist;

	pg_data_t *pgdat;

	int nid;



	wakeup_pdflush(1024);

	yield();



	for_each_online_pgdat(pgdat) {

		zonelist = &pgdat->node_zonelists[gfp_zone(GFP_NOFS)];

	for_each_online_node(nid) {

		zonelist = node_zonelist(nid, GFP_NOFS);

		if (zonelist->zones[0])

			try_to_free_pages(zonelist, 0, GFP_NOFS);

	}

include/linux/gfp.h

+6 −2
Original line number Diff line number Diff line
@@ -154,10 +154,15 @@ static inline enum zone_type gfp_zone(gfp_t flags) 
/*

 * We get the zone list from the current node and the gfp_mask.

 * This zone list contains a maximum of MAXNODES*MAX_NR_ZONES zones.

 * There are many zonelists per node, two for each active zone.

 *

 * For the normal case of non-DISCONTIGMEM systems the NODE_DATA() gets

 * optimized to &contig_page_data at compile-time.

 */

static inline struct zonelist *node_zonelist(int nid, gfp_t flags)

{

	return NODE_DATA(nid)->node_zonelists + gfp_zone(flags);

}



#ifndef HAVE_ARCH_FREE_PAGE

static inline void arch_free_page(struct page *page, int order) { }
@@ -178,8 +183,7 @@ static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask, 
	if (nid < 0)

		nid = numa_node_id();



	return __alloc_pages(gfp_mask, order,

		NODE_DATA(nid)->node_zonelists + gfp_zone(gfp_mask));

	return __alloc_pages(gfp_mask, order, node_zonelist(nid, gfp_mask));

}



#ifdef CONFIG_NUMA

include/linux/mempolicy.h

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static inline void mpol_fix_fork_child_flag(struct task_struct *p) 
static inline struct zonelist *huge_zonelist(struct vm_area_struct *vma,

 		unsigned long addr, gfp_t gfp_flags, struct mempolicy **mpol)

{

	return NODE_DATA(0)->node_zonelists + gfp_zone(gfp_flags);

	return node_zonelist(0, gfp_flags);

}



static inline int do_migrate_pages(struct mm_struct *mm,

mm/mempolicy.c

+3 −3
Original line number Diff line number Diff line
@@ -1183,7 +1183,7 @@ static struct zonelist *zonelist_policy(gfp_t gfp, struct mempolicy *policy) 
		nd = 0;

		BUG();

	}

	return NODE_DATA(nd)->node_zonelists + gfp_zone(gfp);

	return node_zonelist(nd, gfp);

}



/* Do dynamic interleaving for a process */
@@ -1299,7 +1299,7 @@ struct zonelist *huge_zonelist(struct vm_area_struct *vma, unsigned long addr, 
		if (unlikely(pol != &default_policy &&

				pol != current->mempolicy))

			__mpol_free(pol);	/* finished with pol */

		return NODE_DATA(nid)->node_zonelists + gfp_zone(gfp_flags);

		return node_zonelist(nid, gfp_flags);

	}



	zl = zonelist_policy(GFP_HIGHUSER, pol);
@@ -1321,7 +1321,7 @@ static struct page *alloc_page_interleave(gfp_t gfp, unsigned order, 
	struct zonelist *zl;

	struct page *page;



	zl = NODE_DATA(nid)->node_zonelists + gfp_zone(gfp);

	zl = node_zonelist(nid, gfp);

	page = __alloc_pages(gfp, order, zl);

	if (page && page_zone(page) == zl->zones[0])

		inc_zone_page_state(page, NUMA_INTERLEAVE_HIT);