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: yalin wang <yalin.wang2010@gmail.com>
Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index dae7836..31763dd 100644 (file)
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -352,11 +352,11 @@ TRACE_EVENT(mm_vmscan_writepage,
 
 TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
 
-       TP_PROTO(int nid, int zid,
-                       unsigned long nr_scanned, unsigned long nr_reclaimed,
-                       int priority, int reclaim_flags),
+       TP_PROTO(struct zone *zone,
+               unsigned long nr_scanned, unsigned long nr_reclaimed,
+               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",

diff --git a/mm/vmscan.c b/mm/vmscan.c
index fd7823c..35dd57e 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -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;
 }