Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

yalin wang and committed by
Linus Torvalds
ba5e9579 8ef5849f

+9 -12
+7 -7
include/trace/events/vmscan.h
··· 352 352 353 353 TRACE_EVENT(mm_vmscan_lru_shrink_inactive, 354 354 355 - TP_PROTO(int nid, int zid, 356 - unsigned long nr_scanned, unsigned long nr_reclaimed, 357 - int priority, int reclaim_flags), 355 + TP_PROTO(struct zone *zone, 356 + unsigned long nr_scanned, unsigned long nr_reclaimed, 357 + int priority, int file), 358 358 359 - TP_ARGS(nid, zid, nr_scanned, nr_reclaimed, priority, reclaim_flags), 359 + TP_ARGS(zone, nr_scanned, nr_reclaimed, priority, file), 360 360 361 361 TP_STRUCT__entry( 362 362 __field(int, nid) ··· 368 368 ), 369 369 370 370 TP_fast_assign( 371 - __entry->nid = nid; 372 - __entry->zid = zid; 371 + __entry->nid = zone_to_nid(zone); 372 + __entry->zid = zone_idx(zone); 373 373 __entry->nr_scanned = nr_scanned; 374 374 __entry->nr_reclaimed = nr_reclaimed; 375 375 __entry->priority = priority; 376 - __entry->reclaim_flags = reclaim_flags; 376 + __entry->reclaim_flags = trace_shrink_flags(file); 377 377 ), 378 378 379 379 TP_printk("nid=%d zid=%d nr_scanned=%ld nr_reclaimed=%ld priority=%d flags=%s",
+2 -5
mm/vmscan.c
··· 1691 1691 current_may_throttle()) 1692 1692 wait_iff_congested(zone, BLK_RW_ASYNC, HZ/10); 1693 1693 1694 - trace_mm_vmscan_lru_shrink_inactive(zone->zone_pgdat->node_id, 1695 - zone_idx(zone), 1696 - nr_scanned, nr_reclaimed, 1697 - sc->priority, 1698 - trace_shrink_flags(file)); 1694 + trace_mm_vmscan_lru_shrink_inactive(zone, nr_scanned, nr_reclaimed, 1695 + sc->priority, file); 1699 1696 return nr_reclaimed; 1700 1697 } 1701 1698