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

Commit bdce6d9e authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by Linus Torvalds
Browse files

memcg, vmscan: add memcg reclaim tracepoint 



Memcg also need to trace reclaim progress as direct reclaim.  This patch
add it.

Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarMel Gorman <mel@csn.ul.ie>
Acked-by: default avatarBalbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cf4dcc3e

include/trace/events/vmscan.h

+28 −0
Original line number Diff line number Diff line
@@ -117,6 +117,19 @@ DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_b 
	TP_ARGS(order, may_writepage, gfp_flags)

);



DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_reclaim_begin,



	TP_PROTO(int order, int may_writepage, gfp_t gfp_flags),



	TP_ARGS(order, may_writepage, gfp_flags)

);



DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_softlimit_reclaim_begin,



	TP_PROTO(int order, int may_writepage, gfp_t gfp_flags),



	TP_ARGS(order, may_writepage, gfp_flags)

);



DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template,
@@ -142,6 +155,21 @@ DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end 
	TP_ARGS(nr_reclaimed)

);



DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_reclaim_end,



	TP_PROTO(unsigned long nr_reclaimed),



	TP_ARGS(nr_reclaimed)

);



DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_reclaim_end,



	TP_PROTO(unsigned long nr_reclaimed),



	TP_ARGS(nr_reclaimed)

);





TRACE_EVENT(mm_vmscan_lru_isolate,



	TP_PROTO(int order,

mm/vmscan.c

+19 −1
Original line number Diff line number Diff line
@@ -1951,6 +1951,11 @@ unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem, 
	sc.nodemask = &nm;

	sc.nr_reclaimed = 0;

	sc.nr_scanned = 0;



	trace_mm_vmscan_memcg_softlimit_reclaim_begin(0,

						      sc.may_writepage,

						      sc.gfp_mask);



	/*

	 * NOTE: Although we can get the priority field, using it

	 * here is not a good idea, since it limits the pages we can scan.
@@ -1959,6 +1964,9 @@ unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem, 
	 * the priority and make it zero.

	 */

	shrink_zone(0, zone, &sc);



	trace_mm_vmscan_memcg_softlimit_reclaim_end(sc.nr_reclaimed);



	return sc.nr_reclaimed;

}
@@ -1968,6 +1976,7 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem_cont, 
					   unsigned int swappiness)

{

	struct zonelist *zonelist;

	unsigned long nr_reclaimed;

	struct scan_control sc = {

		.may_writepage = !laptop_mode,

		.may_unmap = 1,
@@ -1982,7 +1991,16 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem_cont, 
	sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) |

			(GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK);

	zonelist = NODE_DATA(numa_node_id())->node_zonelists;

	return do_try_to_free_pages(zonelist, &sc);



	trace_mm_vmscan_memcg_reclaim_begin(0,

					    sc.may_writepage,

					    sc.gfp_mask);



	nr_reclaimed = do_try_to_free_pages(zonelist, &sc);



	trace_mm_vmscan_memcg_reclaim_end(nr_reclaimed);



	return nr_reclaimed;

}

#endif