mm: remember what the preferred zone is for zone_statistics (18ea7e71) · Commits · 戴 / test

include/linux/vmstat.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -174,7 +174,7 @@ static inline unsigned long node_page_state(int node,
	zone_page_state(&zones[ZONE_MOVABLE], item);		zone_page_state(&zones[ZONE_MOVABLE], item);
	}		}

	extern void zone_statistics(struct zonelist , struct zone );		extern void zone_statistics(struct zone , struct zone );

	#else		#else

mm/page_alloc.c

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1050,7 +1050,7 @@ void split_page(struct page *page, unsigned int order)
	* we cheat by calling it from here, in the order > 0 path. Saves a branch		* we cheat by calling it from here, in the order > 0 path. Saves a branch
	* or two.		* or two.
	*/		*/
	static struct page buffered_rmqueue(struct zonelist zonelist,		static struct page buffered_rmqueue(struct zone preferred_zone,
	struct zone *zone, int order, gfp_t gfp_flags)		struct zone *zone, int order, gfp_t gfp_flags)
	{		{
	unsigned long flags;		unsigned long flags;
	@@ -1102,7 +1102,7 @@ again:
	}		}

	__count_zone_vm_events(PGALLOC, zone, 1 << order);		__count_zone_vm_events(PGALLOC, zone, 1 << order);
	zone_statistics(zonelist, zone);		zone_statistics(preferred_zone, zone);
	local_irq_restore(flags);		local_irq_restore(flags);
	put_cpu();		put_cpu();

	@@ -1383,7 +1383,7 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order,
	struct zone **z;		struct zone **z;
	struct page *page = NULL;		struct page *page = NULL;
	int classzone_idx = zone_idx(zonelist->zones[0]);		int classzone_idx = zone_idx(zonelist->zones[0]);
	struct zone *zone;		struct zone zone, preferred_zone;
	nodemask_t allowednodes = NULL;/ zonelist_cache approximation */		nodemask_t allowednodes = NULL;/ zonelist_cache approximation */
	int zlc_active = 0; /* set if using zonelist_cache */		int zlc_active = 0; /* set if using zonelist_cache */
	int did_zlc_setup = 0; /* just call zlc_setup() one time */		int did_zlc_setup = 0; /* just call zlc_setup() one time */
	@@ -1395,6 +1395,7 @@ zonelist_scan:
	* See also cpuset_zone_allowed() comment in kernel/cpuset.c.		* See also cpuset_zone_allowed() comment in kernel/cpuset.c.
	*/		*/
	z = zonelist->zones;		z = zonelist->zones;
			preferred_zone = *z;

	do {		do {
	/*		/*
	@@ -1433,7 +1434,7 @@ zonelist_scan:
	}		}
	}		}

	page = buffered_rmqueue(zonelist, zone, order, gfp_mask);		page = buffered_rmqueue(preferred_zone, zone, order, gfp_mask);
	if (page)		if (page)
	break;		break;
	this_zone_full:		this_zone_full:

mm/vmstat.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -364,13 +364,13 @@ void refresh_cpu_vm_stats(int cpu)
	*		*
	* Must be called with interrupts disabled.		* Must be called with interrupts disabled.
	*/		*/
	void zone_statistics(struct zonelist zonelist, struct zone z)		void zone_statistics(struct zone preferred_zone, struct zone z)
	{		{
	if (z->zone_pgdat == zonelist->zones[0]->zone_pgdat) {		if (z->zone_pgdat == preferred_zone->zone_pgdat) {
	__inc_zone_state(z, NUMA_HIT);		__inc_zone_state(z, NUMA_HIT);
	} else {		} else {
	__inc_zone_state(z, NUMA_MISS);		__inc_zone_state(z, NUMA_MISS);
	__inc_zone_state(zonelist->zones[0], NUMA_FOREIGN);		__inc_zone_state(preferred_zone, NUMA_FOREIGN);
	}		}
	if (z->node == numa_node_id())		if (z->node == numa_node_id())
	__inc_zone_state(z, NUMA_LOCAL);		__inc_zone_state(z, NUMA_LOCAL);

Admin message