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

Commit f9be23d6 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Linus Torvalds
Browse files

mm/vmscan: kill struct mem_cgroup_zone 



Kill struct mem_cgroup_zone and rename shrink_mem_cgroup_zone() to
shrink_lruvec(), it always shrinks one lruvec which it takes as an
argument.

Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarHugh Dickins <hughd@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 90bdcfaf

mm/vmscan.c

+6 −20
Original line number Original line Diff line number Diff line
@@ -94,11 +94,6 @@ struct scan_control { 
	nodemask_t	*nodemask;

	nodemask_t	*nodemask;

};

};





struct mem_cgroup_zone {

	struct mem_cgroup *mem_cgroup;

	struct zone *zone;

};



#define lru_to_page(_head) (list_entry((_head)->prev, struct page, lru))

#define lru_to_page(_head) (list_entry((_head)->prev, struct page, lru))





#ifdef ARCH_HAS_PREFETCH

#ifdef ARCH_HAS_PREFETCH
@@ -1769,8 +1764,7 @@ static inline bool should_continue_reclaim(struct lruvec *lruvec, 
/*

/*

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

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

 */

 */

static void shrink_mem_cgroup_zone(struct mem_cgroup_zone *mz,

static void shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc)

				   struct scan_control *sc)

{

{

	unsigned long nr[NR_LRU_LISTS];

	unsigned long nr[NR_LRU_LISTS];

	unsigned long nr_to_scan;

	unsigned long nr_to_scan;
@@ -1778,9 +1772,6 @@ static void shrink_mem_cgroup_zone(struct mem_cgroup_zone *mz, 
	unsigned long nr_reclaimed, nr_scanned;

	unsigned long nr_reclaimed, nr_scanned;

	unsigned long nr_to_reclaim = sc->nr_to_reclaim;

	unsigned long nr_to_reclaim = sc->nr_to_reclaim;

	struct blk_plug plug;

	struct blk_plug plug;

	struct lruvec *lruvec;



	lruvec = mem_cgroup_zone_lruvec(mz->zone, mz->mem_cgroup);





restart:

restart:

	nr_reclaimed = 0;

	nr_reclaimed = 0;
@@ -1842,12 +1833,10 @@ static void shrink_zone(struct zone *zone, struct scan_control *sc) 




	memcg = mem_cgroup_iter(root, NULL, &reclaim);

	memcg = mem_cgroup_iter(root, NULL, &reclaim);

	do {

	do {

		struct mem_cgroup_zone mz = {

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

			.mem_cgroup = memcg,



			.zone = zone,

		shrink_lruvec(lruvec, sc);

		};





		shrink_mem_cgroup_zone(&mz, sc);

		/*

		/*

		 * Limit reclaim has historically picked one memcg and

		 * Limit reclaim has historically picked one memcg and

		 * scanned it with decreasing priority levels until

		 * scanned it with decreasing priority levels until
@@ -2172,10 +2161,7 @@ unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *memcg, 
		.priority = 0,

		.priority = 0,

		.target_mem_cgroup = memcg,

		.target_mem_cgroup = memcg,

	};

	};

	struct mem_cgroup_zone mz = {

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

		.mem_cgroup = memcg,

		.zone = zone,

	};





	sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) |

	sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) |

			(GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK);

			(GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK);
@@ -2191,7 +2177,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

	 * will pick up pages from other mem cgroup's as well. We hack

	 * the priority and make it zero.

	 * the priority and make it zero.

	 */

	 */

	shrink_mem_cgroup_zone(&mz, &sc);

	shrink_lruvec(lruvec, &sc);





	trace_mm_vmscan_memcg_softlimit_reclaim_end(sc.nr_reclaimed);

	trace_mm_vmscan_memcg_softlimit_reclaim_end(sc.nr_reclaimed);