X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Fmm_vmscan.h;h=e7e9b613d6a93239707dc5f8729cad8b6c08a0ef;hb=64ac073a24efe7cd1d6b03dcca680cda3aa05f6e;hp=8bdd65d2a7a13e2b77a9377ec8e98c3206fc7b8d;hpb=4f47ccf08dfac3d5db7553eb8b40bdab19764727;p=lttng-modules.git diff --git a/include/instrumentation/events/mm_vmscan.h b/include/instrumentation/events/mm_vmscan.h index 8bdd65d2..e7e9b613 100644 --- a/include/instrumentation/events/mm_vmscan.h +++ b/include/instrumentation/events/mm_vmscan.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include #ifndef _TRACE_VMSCAN_DEF #define _TRACE_VMSCAN_DEF @@ -18,15 +18,10 @@ #define RECLAIM_WB_MIXED 0x0010u #define RECLAIM_WB_SYNC 0x0004u /* Unused, all reclaim async */ #define RECLAIM_WB_ASYNC 0x0008u - -#if ((LINUX_VERSION_CODE <= KERNEL_VERSION(3,0,38)) || \ - LTTNG_KERNEL_RANGE(3,1,0, 3,2,0)) -typedef int isolate_mode_t; -#endif - #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,2,0) || \ + LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0)) #include @@ -35,7 +30,7 @@ typedef int isolate_mode_t; (RECLAIM_WB_ASYNC) \ ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0)) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,5,0)) #include @@ -63,7 +58,7 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_kswapd_sleep, ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,8,0)) LTTNG_TRACEPOINT_EVENT(mm_vmscan_kswapd_wake, @@ -94,7 +89,7 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_kswapd_wake, #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,17,0)) LTTNG_TRACEPOINT_EVENT(mm_vmscan_wakeup_kswapd, TP_PROTO(int nid, int zid, int order, gfp_t gfp_flags), @@ -123,7 +118,8 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_wakeup_kswapd, ) #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,2,0) || \ + LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0)) LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, @@ -158,7 +154,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_begin_template, mm_vmsc TP_ARGS(order, gfp_flags) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,8,0)) LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, @@ -265,7 +261,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_end_template, mm_vmscan TP_ARGS(nr_reclaimed) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,16,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,16,0)) LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start, mm_vmscan_shrink_slab_start, @@ -290,7 +286,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start, ctf_integer(int, priority, priority) ) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) +#else LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start, mm_vmscan_shrink_slab_start, @@ -305,11 +301,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start, TP_FIELDS( ctf_integer_hex(struct shrinker *, shr, shr) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) ctf_integer_hex(void *, shrink, shr->scan_objects) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ - ctf_integer_hex(void *, shrink, shr->shrink) -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ ctf_integer(long, nr_objects_to_shrink, nr_objects_to_shrink) ctf_integer(gfp_t, gfp_flags, sc->gfp_mask) ctf_integer(unsigned long, pgs_scanned, pgs_scanned) @@ -321,7 +313,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start, ) #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end, mm_vmscan_shrink_slab_end, @@ -342,32 +333,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end, ctf_integer(long, total_scan, total_scan) ) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) -LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end, - - mm_vmscan_shrink_slab_end, - - TP_PROTO(struct shrinker *shr, int shrinker_retval, - long unused_scan_cnt, long new_scan_cnt), - - TP_ARGS(shr, shrinker_retval, unused_scan_cnt, new_scan_cnt), - TP_FIELDS( - ctf_integer_hex(struct shrinker *, shr, shr) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) - ctf_integer_hex(void *, shrink, shr->scan_objects) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ - ctf_integer_hex(void *, shrink, shr->shrink) -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ - ctf_integer(long, unused_scan, unused_scan_cnt) - ctf_integer(long, new_scan, new_scan_cnt) - ctf_integer(int, retval, shrinker_retval) - ctf_integer(long, total_scan, new_scan_cnt - unused_scan_cnt) - ) -) -#endif - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_isolate, TP_PROTO(int classzone_idx, @@ -395,7 +362,7 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_isolate, ctf_integer(int, lru, lru) ) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,8,0)) LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_lru_isolate_template, TP_PROTO(int classzone_idx, @@ -462,28 +429,12 @@ LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_lru_isolate_template, unsigned long nr_requested, unsigned long nr_scanned, unsigned long nr_taken, -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - unsigned long nr_lumpy_taken, - unsigned long nr_lumpy_dirty, - unsigned long nr_lumpy_failed, -#endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)) - isolate_mode_t isolate_mode -#else isolate_mode_t isolate_mode, int file -#endif ), TP_ARGS(order, nr_requested, nr_scanned, nr_taken, -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, -#endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)) - isolate_mode -#else isolate_mode, file -#endif ), @@ -492,15 +443,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_lru_isolate_template, ctf_integer(unsigned long, nr_requested, nr_requested) ctf_integer(unsigned long, nr_scanned, nr_scanned) ctf_integer(unsigned long, nr_taken, nr_taken) -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - ctf_integer(unsigned long, nr_lumpy_taken, nr_lumpy_taken) - ctf_integer(unsigned long, nr_lumpy_dirty, nr_lumpy_dirty) - ctf_integer(unsigned long, nr_lumpy_failed, nr_lumpy_failed) -#endif ctf_integer(isolate_mode_t, isolate_mode, isolate_mode) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) ctf_integer(int, file, file) -#endif ) ) @@ -510,28 +454,12 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_lru_isolate_template, mm_vmscan_lru_is unsigned long nr_requested, unsigned long nr_scanned, unsigned long nr_taken, -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - unsigned long nr_lumpy_taken, - unsigned long nr_lumpy_dirty, - unsigned long nr_lumpy_failed, -#endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)) - isolate_mode_t isolate_mode -#else isolate_mode_t isolate_mode, int file -#endif ), TP_ARGS(order, nr_requested, nr_scanned, nr_taken, -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, -#endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)) - isolate_mode -#else isolate_mode, file -#endif ) ) @@ -542,33 +470,17 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_ unsigned long nr_requested, unsigned long nr_scanned, unsigned long nr_taken, -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - unsigned long nr_lumpy_taken, - unsigned long nr_lumpy_dirty, - unsigned long nr_lumpy_failed, -#endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)) - isolate_mode_t isolate_mode -#else isolate_mode_t isolate_mode, int file -#endif ), TP_ARGS(order, nr_requested, nr_scanned, nr_taken, -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) - nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, -#endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)) - isolate_mode -#else isolate_mode, file -#endif ) ) #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,7,0)) LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage, TP_PROTO(struct page *page), @@ -581,7 +493,7 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage, page_is_file_lru(page))) ) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,2,0)) LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage, TP_PROTO(struct page *page), @@ -594,7 +506,7 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage, page_is_file_cache(page))) ) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0)) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,5,0)) LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage, TP_PROTO(struct page *page), @@ -621,7 +533,8 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage, ) #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,2,0) || \ + LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0)) LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive, TP_PROTO(int nid, @@ -646,7 +559,7 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive, ctf_integer(int, reclaim_flags, trace_reclaim_flags(file)) ) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0)) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,17,0)) LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive, TP_PROTO(int nid, @@ -670,7 +583,7 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive, ctf_integer(int, reclaim_flags, trace_shrink_flags(file)) ) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive, TP_PROTO(int nid, @@ -700,7 +613,7 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive, ctf_integer(int, reclaim_flags, trace_shrink_flags(file)) ) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,8,0)) LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive, TP_PROTO(int nid, @@ -717,7 +630,7 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive, ctf_integer(int, reclaim_flags, trace_shrink_flags(file)) ) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0)) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,5,0)) LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive, TP_PROTO(struct zone *zone, @@ -755,70 +668,6 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive, ) #endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) -LTTNG_TRACEPOINT_EVENT_MAP(replace_swap_token, - - mm_vmscan_replace_swap_token, - - TP_PROTO(struct mm_struct *old_mm, - struct mm_struct *new_mm), - - TP_ARGS(old_mm, new_mm), - - TP_FIELDS( - ctf_integer_hex(struct mm_struct *, old_mm, old_mm) - ctf_integer(unsigned int, old_prio, old_mm ? old_mm->token_priority : 0) - ctf_integer_hex(struct mm_struct *, new_mm, new_mm) - ctf_integer(unsigned int, new_prio, new_mm->token_priority) - ) -) - -LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_put_swap_token_template, - TP_PROTO(struct mm_struct *swap_token_mm), - - TP_ARGS(swap_token_mm), - - TP_FIELDS( - ctf_integer_hex(struct mm_struct*, swap_token_mm, swap_token_mm) - ) -) - -LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(mm_vmscan_put_swap_token_template, put_swap_token, - - mm_vmscan_put_swap_token, - - TP_PROTO(struct mm_struct *swap_token_mm), - TP_ARGS(swap_token_mm) -) - -LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(mm_vmscan_put_swap_token_template, disable_swap_token, - - mm_vmscan_disable_swap_token, - - TP_PROTO(struct mm_struct *swap_token_mm), - TP_ARGS(swap_token_mm) -) - -LTTNG_TRACEPOINT_EVENT_MAP(update_swap_token_priority, - - mm_vmscan_update_swap_token_priority, - - TP_PROTO(struct mm_struct *mm, - unsigned int old_prio, - struct mm_struct *swap_token_mm), - - TP_ARGS(mm, old_prio, swap_token_mm), - - TP_FIELDS( - ctf_integer_hex(struct mm_struct *, mm, mm) - ctf_integer(unsigned int, old_prio, old_prio) - ctf_integer(unsigned int, new_prio, mm->token_priority) - ctf_integer_hex(struct mm_struct *, swap_token_mm, swap_token_mm) - ctf_integer(unsigned int, swap_token_prio, swap_token_mm ? swap_token_mm->token_priority : 0) - ) -) -#endif - #endif /* LTTNG_TRACE_MM_VMSCAN_H */ /* This part must be outside protection */