mm, trace: extract COMPACTION_STATUS and ZONE_TYPE to a common header
COMPACTION_STATUS resp. ZONE_TYPE are currently used to translate enum compact_result resp. struct zone index into their symbolic names for an easier post processing. The follow up patch would like to reuse this as well. The code involves some preprocessor black magic which is better not duplicated elsewhere so move it to a common mm tracing relate header. Link: http://lkml.kernel.org/r/20161220130135.15719-2-mhocko@kernel.org Signed-off-by: Michal Hocko <mhocko@suse.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Cc: David Rientjes <rientjes@google.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
4583e77310
commit
aff28015fe
|
@ -9,62 +9,6 @@
|
||||||
#include <linux/tracepoint.h>
|
#include <linux/tracepoint.h>
|
||||||
#include <trace/events/mmflags.h>
|
#include <trace/events/mmflags.h>
|
||||||
|
|
||||||
#define COMPACTION_STATUS \
|
|
||||||
EM( COMPACT_SKIPPED, "skipped") \
|
|
||||||
EM( COMPACT_DEFERRED, "deferred") \
|
|
||||||
EM( COMPACT_CONTINUE, "continue") \
|
|
||||||
EM( COMPACT_SUCCESS, "success") \
|
|
||||||
EM( COMPACT_PARTIAL_SKIPPED, "partial_skipped") \
|
|
||||||
EM( COMPACT_COMPLETE, "complete") \
|
|
||||||
EM( COMPACT_NO_SUITABLE_PAGE, "no_suitable_page") \
|
|
||||||
EM( COMPACT_NOT_SUITABLE_ZONE, "not_suitable_zone") \
|
|
||||||
EMe(COMPACT_CONTENDED, "contended")
|
|
||||||
|
|
||||||
#ifdef CONFIG_ZONE_DMA
|
|
||||||
#define IFDEF_ZONE_DMA(X) X
|
|
||||||
#else
|
|
||||||
#define IFDEF_ZONE_DMA(X)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_ZONE_DMA32
|
|
||||||
#define IFDEF_ZONE_DMA32(X) X
|
|
||||||
#else
|
|
||||||
#define IFDEF_ZONE_DMA32(X)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_HIGHMEM
|
|
||||||
#define IFDEF_ZONE_HIGHMEM(X) X
|
|
||||||
#else
|
|
||||||
#define IFDEF_ZONE_HIGHMEM(X)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define ZONE_TYPE \
|
|
||||||
IFDEF_ZONE_DMA( EM (ZONE_DMA, "DMA")) \
|
|
||||||
IFDEF_ZONE_DMA32( EM (ZONE_DMA32, "DMA32")) \
|
|
||||||
EM (ZONE_NORMAL, "Normal") \
|
|
||||||
IFDEF_ZONE_HIGHMEM( EM (ZONE_HIGHMEM,"HighMem")) \
|
|
||||||
EMe(ZONE_MOVABLE,"Movable")
|
|
||||||
|
|
||||||
/*
|
|
||||||
* First define the enums in the above macros to be exported to userspace
|
|
||||||
* via TRACE_DEFINE_ENUM().
|
|
||||||
*/
|
|
||||||
#undef EM
|
|
||||||
#undef EMe
|
|
||||||
#define EM(a, b) TRACE_DEFINE_ENUM(a);
|
|
||||||
#define EMe(a, b) TRACE_DEFINE_ENUM(a);
|
|
||||||
|
|
||||||
COMPACTION_STATUS
|
|
||||||
ZONE_TYPE
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Now redefine the EM() and EMe() macros to map the enums to the strings
|
|
||||||
* that will be printed in the output.
|
|
||||||
*/
|
|
||||||
#undef EM
|
|
||||||
#undef EMe
|
|
||||||
#define EM(a, b) {a, b},
|
|
||||||
#define EMe(a, b) {a, b}
|
|
||||||
|
|
||||||
DECLARE_EVENT_CLASS(mm_compaction_isolate_template,
|
DECLARE_EVENT_CLASS(mm_compaction_isolate_template,
|
||||||
|
|
||||||
|
@ -187,6 +131,7 @@ TRACE_EVENT(mm_compaction_begin,
|
||||||
__entry->sync ? "sync" : "async")
|
__entry->sync ? "sync" : "async")
|
||||||
);
|
);
|
||||||
|
|
||||||
|
#ifdef CONFIG_COMPACTION
|
||||||
TRACE_EVENT(mm_compaction_end,
|
TRACE_EVENT(mm_compaction_end,
|
||||||
TP_PROTO(unsigned long zone_start, unsigned long migrate_pfn,
|
TP_PROTO(unsigned long zone_start, unsigned long migrate_pfn,
|
||||||
unsigned long free_pfn, unsigned long zone_end, bool sync,
|
unsigned long free_pfn, unsigned long zone_end, bool sync,
|
||||||
|
@ -220,6 +165,7 @@ TRACE_EVENT(mm_compaction_end,
|
||||||
__entry->sync ? "sync" : "async",
|
__entry->sync ? "sync" : "async",
|
||||||
__print_symbolic(__entry->status, COMPACTION_STATUS))
|
__print_symbolic(__entry->status, COMPACTION_STATUS))
|
||||||
);
|
);
|
||||||
|
#endif
|
||||||
|
|
||||||
TRACE_EVENT(mm_compaction_try_to_compact_pages,
|
TRACE_EVENT(mm_compaction_try_to_compact_pages,
|
||||||
|
|
||||||
|
@ -248,6 +194,7 @@ TRACE_EVENT(mm_compaction_try_to_compact_pages,
|
||||||
__entry->prio)
|
__entry->prio)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
#ifdef CONFIG_COMPACTION
|
||||||
DECLARE_EVENT_CLASS(mm_compaction_suitable_template,
|
DECLARE_EVENT_CLASS(mm_compaction_suitable_template,
|
||||||
|
|
||||||
TP_PROTO(struct zone *zone,
|
TP_PROTO(struct zone *zone,
|
||||||
|
@ -295,7 +242,6 @@ DEFINE_EVENT(mm_compaction_suitable_template, mm_compaction_suitable,
|
||||||
TP_ARGS(zone, order, ret)
|
TP_ARGS(zone, order, ret)
|
||||||
);
|
);
|
||||||
|
|
||||||
#ifdef CONFIG_COMPACTION
|
|
||||||
DECLARE_EVENT_CLASS(mm_compaction_defer_template,
|
DECLARE_EVENT_CLASS(mm_compaction_defer_template,
|
||||||
|
|
||||||
TP_PROTO(struct zone *zone, int order),
|
TP_PROTO(struct zone *zone, int order),
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
#include <linux/node.h>
|
||||||
|
#include <linux/mmzone.h>
|
||||||
|
#include <linux/compaction.h>
|
||||||
/*
|
/*
|
||||||
* The order of these masks is important. Matching masks will be seen
|
* The order of these masks is important. Matching masks will be seen
|
||||||
* first and the left over flags will end up showing by themselves.
|
* first and the left over flags will end up showing by themselves.
|
||||||
|
@ -171,3 +174,64 @@ IF_HAVE_VM_SOFTDIRTY(VM_SOFTDIRTY, "softdirty" ) \
|
||||||
(flags) ? __print_flags(flags, "|", \
|
(flags) ? __print_flags(flags, "|", \
|
||||||
__def_vmaflag_names \
|
__def_vmaflag_names \
|
||||||
) : "none"
|
) : "none"
|
||||||
|
|
||||||
|
#ifdef CONFIG_COMPACTION
|
||||||
|
#define COMPACTION_STATUS \
|
||||||
|
EM( COMPACT_SKIPPED, "skipped") \
|
||||||
|
EM( COMPACT_DEFERRED, "deferred") \
|
||||||
|
EM( COMPACT_CONTINUE, "continue") \
|
||||||
|
EM( COMPACT_SUCCESS, "success") \
|
||||||
|
EM( COMPACT_PARTIAL_SKIPPED, "partial_skipped") \
|
||||||
|
EM( COMPACT_COMPLETE, "complete") \
|
||||||
|
EM( COMPACT_NO_SUITABLE_PAGE, "no_suitable_page") \
|
||||||
|
EM( COMPACT_NOT_SUITABLE_ZONE, "not_suitable_zone") \
|
||||||
|
EMe(COMPACT_CONTENDED, "contended")
|
||||||
|
#else
|
||||||
|
#define COMPACTION_STATUS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_ZONE_DMA
|
||||||
|
#define IFDEF_ZONE_DMA(X) X
|
||||||
|
#else
|
||||||
|
#define IFDEF_ZONE_DMA(X)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_ZONE_DMA32
|
||||||
|
#define IFDEF_ZONE_DMA32(X) X
|
||||||
|
#else
|
||||||
|
#define IFDEF_ZONE_DMA32(X)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_HIGHMEM
|
||||||
|
#define IFDEF_ZONE_HIGHMEM(X) X
|
||||||
|
#else
|
||||||
|
#define IFDEF_ZONE_HIGHMEM(X)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define ZONE_TYPE \
|
||||||
|
IFDEF_ZONE_DMA( EM (ZONE_DMA, "DMA")) \
|
||||||
|
IFDEF_ZONE_DMA32( EM (ZONE_DMA32, "DMA32")) \
|
||||||
|
EM (ZONE_NORMAL, "Normal") \
|
||||||
|
IFDEF_ZONE_HIGHMEM( EM (ZONE_HIGHMEM,"HighMem")) \
|
||||||
|
EMe(ZONE_MOVABLE,"Movable")
|
||||||
|
|
||||||
|
/*
|
||||||
|
* First define the enums in the above macros to be exported to userspace
|
||||||
|
* via TRACE_DEFINE_ENUM().
|
||||||
|
*/
|
||||||
|
#undef EM
|
||||||
|
#undef EMe
|
||||||
|
#define EM(a, b) TRACE_DEFINE_ENUM(a);
|
||||||
|
#define EMe(a, b) TRACE_DEFINE_ENUM(a);
|
||||||
|
|
||||||
|
COMPACTION_STATUS
|
||||||
|
ZONE_TYPE
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Now redefine the EM() and EMe() macros to map the enums to the strings
|
||||||
|
* that will be printed in the output.
|
||||||
|
*/
|
||||||
|
#undef EM
|
||||||
|
#undef EMe
|
||||||
|
#define EM(a, b) {a, b},
|
||||||
|
#define EMe(a, b) {a, b}
|
||||||
|
|
Loading…
Reference in a new issue