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

Commit 68ad8df4 authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

mm: print out the zonelists on request for manual verification 



This patch prints out the zonelists during boot for manual verification by the
user if the mminit_loglevel is MMINIT_VERIFY or higher.

Signed-off-by: default avatarMel Gorman <mel@csn.ul.ie>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2dbb51c4

mm/internal.h

+5 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ do { \ 
extern void mminit_verify_pageflags_layout(void);

extern void mminit_verify_page_links(struct page *page,

		enum zone_type zone, unsigned long nid, unsigned long pfn);

extern void mminit_verify_zonelist(void);



#else
@@ -97,6 +98,10 @@ static inline void mminit_verify_page_links(struct page *page, 
		enum zone_type zone, unsigned long nid, unsigned long pfn)

{

}



static inline void mminit_verify_zonelist(void)

{

}

#endif /* CONFIG_DEBUG_MEMORY_INIT */



/* mminit_validate_memmodel_limits is independent of CONFIG_DEBUG_MEMORY_INIT */

mm/mm_init.c

+45 −0
Original line number Diff line number Diff line
@@ -11,6 +11,51 @@ 


int __meminitdata mminit_loglevel;



/* The zonelists are simply reported, validation is manual. */

void mminit_verify_zonelist(void)

{

	int nid;



	if (mminit_loglevel < MMINIT_VERIFY)

		return;



	for_each_online_node(nid) {

		pg_data_t *pgdat = NODE_DATA(nid);

		struct zone *zone;

		struct zoneref *z;

		struct zonelist *zonelist;

		int i, listid, zoneid;



		BUG_ON(MAX_ZONELISTS > 2);

		for (i = 0; i < MAX_ZONELISTS * MAX_NR_ZONES; i++) {



			/* Identify the zone and nodelist */

			zoneid = i % MAX_NR_ZONES;

			listid = i / MAX_NR_ZONES;

			zonelist = &pgdat->node_zonelists[listid];

			zone = &pgdat->node_zones[zoneid];

			if (!populated_zone(zone))

				continue;



			/* Print information about the zonelist */

			printk(KERN_DEBUG "mminit::zonelist %s %d:%s = ",

				listid > 0 ? "thisnode" : "general", nid,

				zone->name);



			/* Iterate the zonelist */

			for_each_zone_zonelist(zone, z, zonelist, zoneid) {

#ifdef CONFIG_NUMA

				printk(KERN_CONT "%d:%s ",

					zone->node, zone->name);

#else

				printk(KERN_CONT "0:%s ", zone->name);

#endif /* CONFIG_NUMA */

			}

			printk(KERN_CONT "\n");

		}

	}

}



void __init mminit_verify_pageflags_layout(void)

{

	int shift, width;

mm/page_alloc.c

+1 −0
Original line number Diff line number Diff line
@@ -2352,6 +2352,7 @@ void build_all_zonelists(void) 


	if (system_state == SYSTEM_BOOTING) {

		__build_all_zonelists(NULL);

		mminit_verify_zonelist();

		cpuset_init_current_mems_allowed();

	} else {

		/* we have to stop all cpus to guarantee there is no user