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

Commit 33377678 authored by Vladimir Davydov's avatar Vladimir Davydov Committed by Linus Torvalds
Browse files

mm: vmscan: pass memcg to get_scan_count() 



memcg will come in handy in get_scan_count().  It can already be used for
getting swappiness immediately in get_scan_count() instead of passing it
around.  The following patches will add more memcg-related values, which
will be used there.

Signed-off-by: default avatarVladimir Davydov <vdavydov@virtuozzo.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 37e84351

mm/vmscan.c

+8 −12
Original line number Diff line number Diff line
@@ -1966,10 +1966,11 @@ enum scan_balance { 
 * nr[0] = anon inactive pages to scan; nr[1] = anon active pages to scan

 * nr[2] = file inactive pages to scan; nr[3] = file active pages to scan

 */

static void get_scan_count(struct lruvec *lruvec, int swappiness,

static void get_scan_count(struct lruvec *lruvec, struct mem_cgroup *memcg,

			   struct scan_control *sc, unsigned long *nr,

			   unsigned long *lru_pages)

{

	int swappiness = mem_cgroup_swappiness(memcg);

	struct zone_reclaim_stat *reclaim_stat = &lruvec->reclaim_stat;

	u64 fraction[2];

	u64 denominator = 0;	/* gcc */
@@ -2193,9 +2194,10 @@ static inline void init_tlb_ubc(void) 
/*

 * This is a basic per-zone page freer.  Used by both kswapd and direct reclaim.

 */

static void shrink_lruvec(struct lruvec *lruvec, int swappiness,

static void shrink_zone_memcg(struct zone *zone, struct mem_cgroup *memcg,

			      struct scan_control *sc, unsigned long *lru_pages)

{

	struct lruvec *lruvec = mem_cgroup_zone_lruvec(zone, memcg);

	unsigned long nr[NR_LRU_LISTS];

	unsigned long targets[NR_LRU_LISTS];

	unsigned long nr_to_scan;
@@ -2205,7 +2207,7 @@ static void shrink_lruvec(struct lruvec *lruvec, int swappiness, 
	struct blk_plug plug;

	bool scan_adjusted;



	get_scan_count(lruvec, swappiness, sc, nr, lru_pages);

	get_scan_count(lruvec, memcg, sc, nr, lru_pages);



	/* Record the original scan target for proportional adjustments later */

	memcpy(targets, nr, sizeof(nr));
@@ -2409,8 +2411,6 @@ static bool shrink_zone(struct zone *zone, struct scan_control *sc, 
			unsigned long lru_pages;

			unsigned long reclaimed;

			unsigned long scanned;

			struct lruvec *lruvec;

			int swappiness;



			if (mem_cgroup_low(root, memcg)) {

				if (!sc->may_thrash)
@@ -2418,12 +2418,10 @@ static bool shrink_zone(struct zone *zone, struct scan_control *sc, 
				mem_cgroup_events(memcg, MEMCG_LOW, 1);

			}



			lruvec = mem_cgroup_zone_lruvec(zone, memcg);

			swappiness = mem_cgroup_swappiness(memcg);

			reclaimed = sc->nr_reclaimed;

			scanned = sc->nr_scanned;



			shrink_lruvec(lruvec, swappiness, sc, &lru_pages);

			shrink_zone_memcg(zone, memcg, sc, &lru_pages);

			zone_lru_pages += lru_pages;



			if (memcg && is_classzone)
@@ -2893,8 +2891,6 @@ unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *memcg, 
		.may_unmap = 1,

		.may_swap = !noswap,

	};

	struct lruvec *lruvec = mem_cgroup_zone_lruvec(zone, memcg);

	int swappiness = mem_cgroup_swappiness(memcg);

	unsigned long lru_pages;



	sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) |
@@ -2911,7 +2907,7 @@ unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *memcg, 
	 * will pick up pages from other mem cgroup's as well. We hack

	 * the priority and make it zero.

	 */

	shrink_lruvec(lruvec, swappiness, &sc, &lru_pages);

	shrink_zone_memcg(zone, memcg, &sc, &lru_pages);



	trace_mm_vmscan_memcg_softlimit_reclaim_end(sc.nr_reclaimed);