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

Commit 83eb0c67 authored by Mel Gorman's avatar Mel Gorman Committed by Vinayak Menon
Browse files

mm: move zone watermark accesses behind an accessor 

This is a preparation patch only, no functional change.

Link: http://lkml.kernel.org/r/20181123114528.28802-3-mgorman@techsingularity.net


Signed-off-by: default avatarMel Gorman <mgorman@techsingularity.net>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Zi Yan <zi.yan@cs.rutgers.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Change-Id: Iccef5f02348ab59d75cbbe2b48f40017391b88b1
Git-commit: a921444382b49cc7fdeca3fba3e278bc09484a27
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git


[vinmenon@codeaurora.org: trivial merge conflict fixes]
Signed-off-by: default avatarVinayak Menon <vinmenon@codeaurora.org>
parent 3b3bbda3

include/linux/mmzone.h

+5 −4
Original line number Diff line number Diff line
@@ -271,9 +271,10 @@ enum zone_watermarks { 
	NR_WMARK

};



#define min_wmark_pages(z) (z->watermark[WMARK_MIN])

#define low_wmark_pages(z) (z->watermark[WMARK_LOW])

#define high_wmark_pages(z) (z->watermark[WMARK_HIGH])

#define min_wmark_pages(z) (z->_watermark[WMARK_MIN])

#define low_wmark_pages(z) (z->_watermark[WMARK_LOW])

#define high_wmark_pages(z) (z->_watermark[WMARK_HIGH])

#define wmark_pages(z, i) (z->_watermark[i])



struct per_cpu_pages {

	int count;		/* number of pages in the list */
@@ -364,7 +365,7 @@ struct zone { 
	/* Read-mostly fields */



	/* zone watermarks, access with *_wmark_pages(zone) macros */

	unsigned long watermark[NR_WMARK];

	unsigned long _watermark[NR_WMARK];



	unsigned long nr_reserved_highatomic;

mm/compaction.c

+1 −1
Original line number Diff line number Diff line
@@ -1431,7 +1431,7 @@ static enum compact_result __compaction_suitable(struct zone *zone, int order, 
	if (is_via_compact_memory(order))

		return COMPACT_CONTINUE;



	watermark = zone->watermark[alloc_flags & ALLOC_WMARK_MASK];

	watermark = wmark_pages(zone, alloc_flags & ALLOC_WMARK_MASK);

	/*

	 * If watermarks for high-order allocation are already met, there

	 * should be no need for compaction at all.

mm/page_alloc.c

+6 −6
Original line number Diff line number Diff line
@@ -3473,7 +3473,7 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags, 
			}

		}



		mark = zone->watermark[alloc_flags & ALLOC_WMARK_MASK];

		mark = wmark_pages(zone, alloc_flags & ALLOC_WMARK_MASK);

		if (!zone_watermark_fast(zone, order, mark,

				       ac_classzone_idx(ac), alloc_flags)) {

			int ret;
@@ -4957,7 +4957,7 @@ long si_mem_available(void) 
		pages[lru] = global_node_page_state(NR_LRU_BASE + lru);



	for_each_zone(zone)

		wmark_low += zone->watermark[WMARK_LOW];

		wmark_low += low_wmark_pages(zone);



	/*

	 * Estimate the amount of memory available for userspace allocations,
@@ -7499,13 +7499,13 @@ static void __setup_per_zone_wmarks(void) 


			min_pages = zone->managed_pages / 1024;

			min_pages = clamp(min_pages, SWAP_CLUSTER_MAX, 128UL);

			zone->watermark[WMARK_MIN] = min_pages;

			zone->_watermark[WMARK_MIN] = min_pages;

		} else {

			/*

			 * If it's a lowmem zone, reserve a number of pages

			 * proportionate to the zone's size.

			 */

			zone->watermark[WMARK_MIN] = min;

			zone->_watermark[WMARK_MIN] = min;

		}



		/*
@@ -7517,9 +7517,9 @@ static void __setup_per_zone_wmarks(void) 
			    mult_frac(zone->managed_pages,

				      watermark_scale_factor, 10000));



		zone->watermark[WMARK_LOW]  = min_wmark_pages(zone) +

		zone->_watermark[WMARK_LOW]  = min_wmark_pages(zone) +

					low + min;

		zone->watermark[WMARK_HIGH] = min_wmark_pages(zone) +

		zone->_watermark[WMARK_HIGH] = min_wmark_pages(zone) +

					low + min * 2;



		spin_unlock_irqrestore(&zone->lock, flags);