Commit 60b62ff7 authored by Yafang Shao's avatar Yafang Shao Committed by Linus Torvalds

mm/vmscan: simplify trace_reclaim_flags and trace_shrink_flags

trace_reclaim_flags and trace_shrink_flags are almost the same.
We can simplify them to avoid redundant code.

Link: http://lkml.kernel.org/r/1556169203-5858-1-git-send-email-laoar.shao@gmail.comSigned-off-by: default avatarYafang Shao <laoar.shao@gmail.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d66d109d
...@@ -27,17 +27,11 @@ ...@@ -27,17 +27,11 @@
{RECLAIM_WB_ASYNC, "RECLAIM_WB_ASYNC"} \ {RECLAIM_WB_ASYNC, "RECLAIM_WB_ASYNC"} \
) : "RECLAIM_WB_NONE" ) : "RECLAIM_WB_NONE"
#define trace_reclaim_flags(page) ( \ #define trace_reclaim_flags(file) ( \
(page_is_file_cache(page) ? RECLAIM_WB_FILE : RECLAIM_WB_ANON) | \ (file ? RECLAIM_WB_FILE : RECLAIM_WB_ANON) | \
(RECLAIM_WB_ASYNC) \ (RECLAIM_WB_ASYNC) \
) )
#define trace_shrink_flags(file) \
( \
(file ? RECLAIM_WB_FILE : RECLAIM_WB_ANON) | \
(RECLAIM_WB_ASYNC) \
)
TRACE_EVENT(mm_vmscan_kswapd_sleep, TRACE_EVENT(mm_vmscan_kswapd_sleep,
TP_PROTO(int nid), TP_PROTO(int nid),
...@@ -328,7 +322,8 @@ TRACE_EVENT(mm_vmscan_writepage, ...@@ -328,7 +322,8 @@ TRACE_EVENT(mm_vmscan_writepage,
TP_fast_assign( TP_fast_assign(
__entry->pfn = page_to_pfn(page); __entry->pfn = page_to_pfn(page);
__entry->reclaim_flags = trace_reclaim_flags(page); __entry->reclaim_flags = trace_reclaim_flags(
page_is_file_cache(page));
), ),
TP_printk("page=%p pfn=%lu flags=%s", TP_printk("page=%p pfn=%lu flags=%s",
...@@ -374,7 +369,7 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive, ...@@ -374,7 +369,7 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
__entry->nr_ref_keep = stat->nr_ref_keep; __entry->nr_ref_keep = stat->nr_ref_keep;
__entry->nr_unmap_fail = stat->nr_unmap_fail; __entry->nr_unmap_fail = stat->nr_unmap_fail;
__entry->priority = priority; __entry->priority = priority;
__entry->reclaim_flags = trace_shrink_flags(file); __entry->reclaim_flags = trace_reclaim_flags(file);
), ),
TP_printk("nid=%d nr_scanned=%ld nr_reclaimed=%ld nr_dirty=%ld nr_writeback=%ld nr_congested=%ld nr_immediate=%ld nr_activate_anon=%d nr_activate_file=%d nr_ref_keep=%ld nr_unmap_fail=%ld priority=%d flags=%s", TP_printk("nid=%d nr_scanned=%ld nr_reclaimed=%ld nr_dirty=%ld nr_writeback=%ld nr_congested=%ld nr_immediate=%ld nr_activate_anon=%d nr_activate_file=%d nr_ref_keep=%ld nr_unmap_fail=%ld priority=%d flags=%s",
...@@ -413,7 +408,7 @@ TRACE_EVENT(mm_vmscan_lru_shrink_active, ...@@ -413,7 +408,7 @@ TRACE_EVENT(mm_vmscan_lru_shrink_active,
__entry->nr_deactivated = nr_deactivated; __entry->nr_deactivated = nr_deactivated;
__entry->nr_referenced = nr_referenced; __entry->nr_referenced = nr_referenced;
__entry->priority = priority; __entry->priority = priority;
__entry->reclaim_flags = trace_shrink_flags(file); __entry->reclaim_flags = trace_reclaim_flags(file);
), ),
TP_printk("nid=%d nr_taken=%ld nr_active=%ld nr_deactivated=%ld nr_referenced=%ld priority=%d flags=%s", TP_printk("nid=%d nr_taken=%ld nr_active=%ld nr_deactivated=%ld nr_referenced=%ld priority=%d flags=%s",
...@@ -452,7 +447,8 @@ TRACE_EVENT(mm_vmscan_inactive_list_is_low, ...@@ -452,7 +447,8 @@ TRACE_EVENT(mm_vmscan_inactive_list_is_low,
__entry->total_active = total_active; __entry->total_active = total_active;
__entry->active = active; __entry->active = active;
__entry->ratio = ratio; __entry->ratio = ratio;
__entry->reclaim_flags = trace_shrink_flags(file) & RECLAIM_WB_LRU; __entry->reclaim_flags = trace_reclaim_flags(file) &
RECLAIM_WB_LRU;
), ),
TP_printk("nid=%d reclaim_idx=%d total_inactive=%ld inactive=%ld total_active=%ld active=%ld ratio=%ld flags=%s", TP_printk("nid=%d reclaim_idx=%d total_inactive=%ld inactive=%ld total_active=%ld active=%ld ratio=%ld flags=%s",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment