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

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

mm, vmscan: make shrink_node decisions more node-centric 

Earlier patches focused on having direct reclaim and kswapd use data
that is node-centric for reclaiming but shrink_node() itself still uses
too much zone information.  This patch removes unnecessary zone-based
information with the most important decision being whether to continue
reclaim or not.  Some memcg APIs are adjusted as a result even though
memcg itself still uses some zone information.

[mgorman@techsingularity.net: optimization]
  Link: http://lkml.kernel.org/r/1468588165-12461-2-git-send-email-mgorman@techsingularity.net
Link: http://lkml.kernel.org/r/1467970510-21195-14-git-send-email-mgorman@techsingularity.net


Signed-off-by: default avatarMel Gorman <mgorman@techsingularity.net>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@surriel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 86c79f6b

include/linux/memcontrol.h

+10 −9
Original line number Diff line number Diff line
@@ -324,22 +324,23 @@ mem_cgroup_zone_zoneinfo(struct mem_cgroup *memcg, struct zone *zone) 
}



/**

 * mem_cgroup_zone_lruvec - get the lru list vector for a zone and memcg

 * mem_cgroup_lruvec - get the lru list vector for a node or a memcg zone

 * @node: node of the wanted lruvec

 * @zone: zone of the wanted lruvec

 * @memcg: memcg of the wanted lruvec

 *

 * Returns the lru list vector holding pages for the given @zone and

 * @mem.  This can be the global zone lruvec, if the memory controller

 * Returns the lru list vector holding pages for a given @node or a given

 * @memcg and @zone. This can be the node lruvec, if the memory controller

 * is disabled.

 */

static inline struct lruvec *mem_cgroup_zone_lruvec(struct zone *zone,

						    struct mem_cgroup *memcg)

static inline struct lruvec *mem_cgroup_lruvec(struct pglist_data *pgdat,

				struct zone *zone, struct mem_cgroup *memcg)

{

	struct mem_cgroup_per_zone *mz;

	struct lruvec *lruvec;



	if (mem_cgroup_disabled()) {

		lruvec = zone_lruvec(zone);

		lruvec = node_lruvec(pgdat);

		goto out;

	}
@@ -609,10 +610,10 @@ static inline void mem_cgroup_migrate(struct page *old, struct page *new) 
{

}



static inline struct lruvec *mem_cgroup_zone_lruvec(struct zone *zone,

						    struct mem_cgroup *memcg)

static inline struct lruvec *mem_cgroup_lruvec(struct pglist_data *pgdat,

				struct zone *zone, struct mem_cgroup *memcg)

{

	return zone_lruvec(zone);

	return node_lruvec(pgdat);

}



static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page,

include/linux/mmzone.h

+2 −2
Original line number Diff line number Diff line
@@ -739,9 +739,9 @@ static inline spinlock_t *zone_lru_lock(struct zone *zone) 
	return &zone->zone_pgdat->lru_lock;

}



static inline struct lruvec *zone_lruvec(struct zone *zone)

static inline struct lruvec *node_lruvec(struct pglist_data *pgdat)

{

	return &zone->zone_pgdat->lruvec;

	return &pgdat->lruvec;

}



static inline unsigned long pgdat_end_pfn(pg_data_t *pgdat)

include/linux/swap.h

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ extern unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg, 
						  unsigned long nr_pages,

						  gfp_t gfp_mask,

						  bool may_swap);

extern unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem,

extern unsigned long mem_cgroup_shrink_node(struct mem_cgroup *mem,

						gfp_t gfp_mask, bool noswap,

						struct zone *zone,

						unsigned long *nr_scanned);

mm/memcontrol.c

+2 −2
Original line number Diff line number Diff line
@@ -1432,7 +1432,7 @@ static int mem_cgroup_soft_reclaim(struct mem_cgroup *root_memcg, 
			}

			continue;

		}

		total += mem_cgroup_shrink_node_zone(victim, gfp_mask, false,

		total += mem_cgroup_shrink_node(victim, gfp_mask, false,

					zone, &nr_scanned);

		*total_scanned += nr_scanned;

		if (!soft_limit_excess(root_memcg))

mm/page_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -5911,6 +5911,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat) 
#endif

	pgdat_page_ext_init(pgdat);

	spin_lock_init(&pgdat->lru_lock);

	lruvec_init(node_lruvec(pgdat));



	for (j = 0; j < MAX_NR_ZONES; j++) {

		struct zone *zone = pgdat->node_zones + j;
@@ -5973,7 +5974,6 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat) 
		/* For bootup, initialized properly in watermark setup */

		mod_zone_page_state(zone, NR_ALLOC_BATCH, zone->managed_pages);



		lruvec_init(zone_lruvec(zone));

		if (!size)

			continue;