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

Commit ba5e9579 authored by yalin wang's avatar yalin wang Committed by Linus Torvalds
Browse files

mm: change mm_vmscan_lru_shrink_inactive() proto types 



Move node_id zone_idx shrink flags into trace function, so thay we don't
need caculate these args if the trace is disabled, and will make this
function have less arguments.

Signed-off-by: default avataryalin wang <yalin.wang2010@gmail.com>
Reviewed-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8ef5849f

include/trace/events/vmscan.h

+7 −7
Original line number Diff line number Diff line
@@ -352,11 +352,11 @@ TRACE_EVENT(mm_vmscan_writepage, 


TRACE_EVENT(mm_vmscan_lru_shrink_inactive,



	TP_PROTO(int nid, int zid,

	TP_PROTO(struct zone *zone,

		unsigned long nr_scanned, unsigned long nr_reclaimed,

			int priority, int reclaim_flags),

		int priority, int file),



	TP_ARGS(nid, zid, nr_scanned, nr_reclaimed, priority, reclaim_flags),

	TP_ARGS(zone, nr_scanned, nr_reclaimed, priority, file),



	TP_STRUCT__entry(

		__field(int, nid)
@@ -368,12 +368,12 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive, 
	),



	TP_fast_assign(

		__entry->nid = nid;

		__entry->zid = zid;

		__entry->nid = zone_to_nid(zone);

		__entry->zid = zone_idx(zone);

		__entry->nr_scanned = nr_scanned;

		__entry->nr_reclaimed = nr_reclaimed;

		__entry->priority = priority;

		__entry->reclaim_flags = reclaim_flags;

		__entry->reclaim_flags = trace_shrink_flags(file);

	),



	TP_printk("nid=%d zid=%d nr_scanned=%ld nr_reclaimed=%ld priority=%d flags=%s",

mm/vmscan.c

+2 −5
Original line number Diff line number Diff line
@@ -1691,11 +1691,8 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec, 
	    current_may_throttle())

		wait_iff_congested(zone, BLK_RW_ASYNC, HZ/10);



	trace_mm_vmscan_lru_shrink_inactive(zone->zone_pgdat->node_id,

		zone_idx(zone),

		nr_scanned, nr_reclaimed,

		sc->priority,

		trace_shrink_flags(file));

	trace_mm_vmscan_lru_shrink_inactive(zone, nr_scanned, nr_reclaimed,

			sc->priority, file);

	return nr_reclaimed;

}