Message ID | 1551161954-11025-1-git-send-email-laoar.shao@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | mm: compaction: remove unnecessary CONFIG_COMPACTION | expand |
On 2/26/19 7:19 AM, Yafang Shao wrote: > The file trace/events/compaction.h is included only when > CONFIG_COMPACTION is defined, so it is unnecessary to use > CONFIG_COMPACTION again in this file. Are you sure? What about CONFIG_CMA? #if defined CONFIG_COMPACTION || defined CONFIG_CMA #define CREATE_TRACE_POINTS #include <trace/events/compaction.h> > Signed-off-by: Yafang Shao <laoar.shao@gmail.com> > --- > include/trace/events/compaction.h | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/include/trace/events/compaction.h b/include/trace/events/compaction.h > index 6074eff..06fb680 100644 > --- a/include/trace/events/compaction.h > +++ b/include/trace/events/compaction.h > @@ -132,7 +132,6 @@ > __entry->sync ? "sync" : "async") > ); > > -#ifdef CONFIG_COMPACTION > TRACE_EVENT(mm_compaction_end, > TP_PROTO(unsigned long zone_start, unsigned long migrate_pfn, > unsigned long free_pfn, unsigned long zone_end, bool sync, > @@ -166,7 +165,6 @@ > __entry->sync ? "sync" : "async", > __print_symbolic(__entry->status, COMPACTION_STATUS)) > ); > -#endif > > TRACE_EVENT(mm_compaction_try_to_compact_pages, > > @@ -195,7 +193,6 @@ > __entry->prio) > ); > > -#ifdef CONFIG_COMPACTION > DECLARE_EVENT_CLASS(mm_compaction_suitable_template, > > TP_PROTO(struct zone *zone, > @@ -296,7 +293,6 @@ > > TP_ARGS(zone, order) > ); > -#endif > > TRACE_EVENT(mm_compaction_kcompactd_sleep, > >
On Tue, Feb 26, 2019 at 8:32 PM Vlastimil Babka <vbabka@suse.cz> wrote: > > On 2/26/19 7:19 AM, Yafang Shao wrote: > > The file trace/events/compaction.h is included only when > > CONFIG_COMPACTION is defined, so it is unnecessary to use > > CONFIG_COMPACTION again in this file. > > Are you sure? What about CONFIG_CMA? > Oops. My bad. Sorry about the noise. > #if defined CONFIG_COMPACTION || defined CONFIG_CMA > > #define CREATE_TRACE_POINTS > #include <trace/events/compaction.h> > > > > Signed-off-by: Yafang Shao <laoar.shao@gmail.com> > > --- > > include/trace/events/compaction.h | 4 ---- > > 1 file changed, 4 deletions(-) > > > > diff --git a/include/trace/events/compaction.h b/include/trace/events/compaction.h > > index 6074eff..06fb680 100644 > > --- a/include/trace/events/compaction.h > > +++ b/include/trace/events/compaction.h > > @@ -132,7 +132,6 @@ > > __entry->sync ? "sync" : "async") > > ); > > > > -#ifdef CONFIG_COMPACTION > > TRACE_EVENT(mm_compaction_end, > > TP_PROTO(unsigned long zone_start, unsigned long migrate_pfn, > > unsigned long free_pfn, unsigned long zone_end, bool sync, > > @@ -166,7 +165,6 @@ > > __entry->sync ? "sync" : "async", > > __print_symbolic(__entry->status, COMPACTION_STATUS)) > > ); > > -#endif > > > > TRACE_EVENT(mm_compaction_try_to_compact_pages, > > > > @@ -195,7 +193,6 @@ > > __entry->prio) > > ); > > > > -#ifdef CONFIG_COMPACTION > > DECLARE_EVENT_CLASS(mm_compaction_suitable_template, > > > > TP_PROTO(struct zone *zone, > > @@ -296,7 +293,6 @@ > > > > TP_ARGS(zone, order) > > ); > > -#endif > > > > TRACE_EVENT(mm_compaction_kcompactd_sleep, > > > > >
Hi Yafang, Thank you for the patch! Yet something to improve: [auto build test ERROR on tip/perf/core] [also build test ERROR on v5.0-rc8 next-20190226] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Yafang-Shao/mm-compaction-remove-unnecessary-CONFIG_COMPACTION/20190226-154127 config: x86_64-randconfig-k3-02241946 (attached as .config) compiler: gcc-8 (Debian 8.2.0-20) 8.2.0 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All error/warnings (new ones prefixed by >>): In file included from include/trace/define_trace.h:96, from include/trace/events/compaction.h:355, from mm/compaction.c:46: include/trace/events/compaction.h: In function 'trace_raw_output_mm_compaction_end': include/trace/trace_events.h:299:18: error: expected expression before ',' token { symbol_array, { -1, NULL }}; \ ^ include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_seq_printf(s, print); \ ^~~~~ include/trace/trace_events.h:79:9: note: in expansion of macro 'PARAMS' PARAMS(print)); \ ^~~~~~ include/trace/events/compaction.h:135:1: note: in expansion of macro 'TRACE_EVENT' TRACE_EVENT(mm_compaction_end, ^~~~~~~~~~~ include/trace/events/compaction.h:160:2: note: in expansion of macro 'TP_printk' TP_printk("zone_start=0x%lx migrate_pfn=0x%lx free_pfn=0x%lx zone_end=0x%lx, mode=%s status=%s", ^~~~~~~~~ include/trace/events/compaction.h:166:3: note: in expansion of macro '__print_symbolic' __print_symbolic(__entry->status, COMPACTION_STATUS)) ^~~~~~~~~~~~~~~~ include/trace/events/compaction.h: In function 'trace_raw_output_mm_compaction_suitable_template': include/trace/trace_events.h:299:18: error: expected expression before ',' token { symbol_array, { -1, NULL }}; \ ^ include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_seq_printf(s, print); \ ^~~~~ include/trace/events/compaction.h:218:2: note: in expansion of macro 'TP_printk' TP_printk("node=%d zone=%-8s order=%d ret=%s", ^~~~~~~~~ include/trace/events/compaction.h:222:3: note: in expansion of macro '__print_symbolic' __print_symbolic(__entry->ret, COMPACTION_STATUS)) ^~~~~~~~~~~~~~~~ include/trace/trace_events.h:299:18: warning: initialization of 'long unsigned int' from 'const struct trace_print_flags *' makes integer from pointer without a cast [-Wint-conversion] { symbol_array, { -1, NULL }}; \ ^ include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_seq_printf(s, print); \ ^~~~~ include/trace/events/compaction.h:218:2: note: in expansion of macro 'TP_printk' TP_printk("node=%d zone=%-8s order=%d ret=%s", ^~~~~~~~~ include/trace/events/compaction.h:222:3: note: in expansion of macro '__print_symbolic' __print_symbolic(__entry->ret, COMPACTION_STATUS)) ^~~~~~~~~~~~~~~~ include/trace/trace_events.h:299:18: note: (near initialization for 'symbols[0].mask') { symbol_array, { -1, NULL }}; \ ^ include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_seq_printf(s, print); \ ^~~~~ include/trace/events/compaction.h:218:2: note: in expansion of macro 'TP_printk' TP_printk("node=%d zone=%-8s order=%d ret=%s", ^~~~~~~~~ include/trace/events/compaction.h:222:3: note: in expansion of macro '__print_symbolic' __print_symbolic(__entry->ret, COMPACTION_STATUS)) ^~~~~~~~~~~~~~~~ include/trace/trace_events.h:299:18: error: initializer element is not constant { symbol_array, { -1, NULL }}; \ ^ include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_seq_printf(s, print); \ ^~~~~ include/trace/events/compaction.h:218:2: note: in expansion of macro 'TP_printk' TP_printk("node=%d zone=%-8s order=%d ret=%s", ^~~~~~~~~ include/trace/events/compaction.h:222:3: note: in expansion of macro '__print_symbolic' __print_symbolic(__entry->ret, COMPACTION_STATUS)) ^~~~~~~~~~~~~~~~ include/trace/trace_events.h:299:18: note: (near initialization for 'symbols[0].mask') { symbol_array, { -1, NULL }}; \ ^ include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_seq_printf(s, print); \ ^~~~~ include/trace/events/compaction.h:218:2: note: in expansion of macro 'TP_printk' TP_printk("node=%d zone=%-8s order=%d ret=%s", ^~~~~~~~~ include/trace/events/compaction.h:222:3: note: in expansion of macro '__print_symbolic' __print_symbolic(__entry->ret, COMPACTION_STATUS)) ^~~~~~~~~~~~~~~~ In file included from include/trace/define_trace.h:96, from include/trace/events/compaction.h:355, from mm/compaction.c:46: include/trace/events/compaction.h: In function 'trace_event_raw_event_mm_compaction_defer_template': >> include/trace/events/compaction.h:262:31: error: 'struct zone' has no member named 'compact_considered'; did you mean 'compact_cached_free_pfn'? __entry->considered = zone->compact_considered; ^~~~~~~~~~~~~~~~~~ include/trace/trace_events.h:720:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^~~~~~ include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^~~~~~~~~~~~~~ >> include/trace/events/compaction.h:262:23: warning: assignment to 'unsigned int' from 'const struct trace_print_flags *' makes integer from pointer without a cast [-Wint-conversion] __entry->considered = zone->compact_considered; ^ include/trace/trace_events.h:720:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^~~~~~ include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^~~~~~~~~~~~~~ >> include/trace/events/compaction.h:263:30: error: 'struct zone' has no member named 'compact_defer_shift' __entry->defer_shift = zone->compact_defer_shift; ^~ include/trace/trace_events.h:720:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^~~~~~ include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^~~~~~~~~~~~~~ include/trace/events/compaction.h:263:24: warning: assignment to 'unsigned int' from 'const struct trace_print_flags *' makes integer from pointer without a cast [-Wint-conversion] __entry->defer_shift = zone->compact_defer_shift; ^ include/trace/trace_events.h:720:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^~~~~~ include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^~~~~~~~~~~~~~ >> include/trace/events/compaction.h:264:31: error: 'struct zone' has no member named 'compact_order_failed' __entry->order_failed = zone->compact_order_failed; ^~ include/trace/trace_events.h:720:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^~~~~~ include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^~~~~~~~~~~~~~ >> include/trace/events/compaction.h:264:25: warning: assignment to 'int' from 'const struct trace_print_flags *' makes integer from pointer without a cast [-Wint-conversion] __entry->order_failed = zone->compact_order_failed; ^ include/trace/trace_events.h:720:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^~~~~~ include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^~~~~~~~~~~~~~ In file included from include/trace/define_trace.h:97, from include/trace/events/compaction.h:355, from mm/compaction.c:46: include/trace/events/compaction.h: In function 'perf_trace_mm_compaction_defer_template': >> include/trace/events/compaction.h:262:31: error: 'struct zone' has no member named 'compact_considered'; did you mean 'compact_cached_free_pfn'? __entry->considered = zone->compact_considered; ^~~~~~~~~~~~~~~~~~ include/trace/perf.h:66:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^~~~~~ include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^~~~~~~~~~~~~~ >> include/trace/events/compaction.h:262:23: warning: assignment to 'unsigned int' from 'const struct trace_print_flags *' makes integer from pointer without a cast [-Wint-conversion] __entry->considered = zone->compact_considered; ^ include/trace/perf.h:66:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^~~~~~ include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^~~~~~~~~~~~~~ >> include/trace/events/compaction.h:263:30: error: 'struct zone' has no member named 'compact_defer_shift' __entry->defer_shift = zone->compact_defer_shift; ^~ include/trace/perf.h:66:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^~~~~~ include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^~~~~~~~~~~~~~ include/trace/events/compaction.h:263:24: warning: assignment to 'unsigned int' from 'const struct trace_print_flags *' makes integer from pointer without a cast [-Wint-conversion] __entry->defer_shift = zone->compact_defer_shift; ^ include/trace/perf.h:66:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^~~~~~ include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^~~~~~~~~~~~~~ >> include/trace/events/compaction.h:264:31: error: 'struct zone' has no member named 'compact_order_failed' __entry->order_failed = zone->compact_order_failed; ^~ include/trace/perf.h:66:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^~~~~~ include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^~~~~~~~~~~~~~ >> include/trace/events/compaction.h:264:25: warning: assignment to 'int' from 'const struct trace_print_flags *' makes integer from pointer without a cast [-Wint-conversion] __entry->order_failed = zone->compact_order_failed; ^ include/trace/perf.h:66:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^~~~~~ include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^~~~~~~~~~~~~~ vim +262 include/trace/events/compaction.h 837d026d5 Joonsoo Kim 2015-02-11 197 837d026d5 Joonsoo Kim 2015-02-11 198 TP_PROTO(struct zone *zone, 837d026d5 Joonsoo Kim 2015-02-11 199 int order, 837d026d5 Joonsoo Kim 2015-02-11 200 int ret), 837d026d5 Joonsoo Kim 2015-02-11 201 837d026d5 Joonsoo Kim 2015-02-11 202 TP_ARGS(zone, order, ret), 837d026d5 Joonsoo Kim 2015-02-11 203 837d026d5 Joonsoo Kim 2015-02-11 204 TP_STRUCT__entry( 837d026d5 Joonsoo Kim 2015-02-11 205 __field(int, nid) 1743d0506 Vlastimil Babka 2015-11-05 206 __field(enum zone_type, idx) 837d026d5 Joonsoo Kim 2015-02-11 207 __field(int, order) 837d026d5 Joonsoo Kim 2015-02-11 208 __field(int, ret) 837d026d5 Joonsoo Kim 2015-02-11 209 ), 837d026d5 Joonsoo Kim 2015-02-11 210 837d026d5 Joonsoo Kim 2015-02-11 211 TP_fast_assign( 837d026d5 Joonsoo Kim 2015-02-11 212 __entry->nid = zone_to_nid(zone); 1743d0506 Vlastimil Babka 2015-11-05 213 __entry->idx = zone_idx(zone); 837d026d5 Joonsoo Kim 2015-02-11 214 __entry->order = order; 837d026d5 Joonsoo Kim 2015-02-11 215 __entry->ret = ret; 837d026d5 Joonsoo Kim 2015-02-11 216 ), 837d026d5 Joonsoo Kim 2015-02-11 217 837d026d5 Joonsoo Kim 2015-02-11 218 TP_printk("node=%d zone=%-8s order=%d ret=%s", 837d026d5 Joonsoo Kim 2015-02-11 219 __entry->nid, 1743d0506 Vlastimil Babka 2015-11-05 220 __print_symbolic(__entry->idx, ZONE_TYPE), 837d026d5 Joonsoo Kim 2015-02-11 221 __entry->order, fa6c7b46a Vlastimil Babka 2015-11-05 @222 __print_symbolic(__entry->ret, COMPACTION_STATUS)) 837d026d5 Joonsoo Kim 2015-02-11 223 ); 837d026d5 Joonsoo Kim 2015-02-11 224 837d026d5 Joonsoo Kim 2015-02-11 225 DEFINE_EVENT(mm_compaction_suitable_template, mm_compaction_finished, 837d026d5 Joonsoo Kim 2015-02-11 226 837d026d5 Joonsoo Kim 2015-02-11 227 TP_PROTO(struct zone *zone, 837d026d5 Joonsoo Kim 2015-02-11 228 int order, 837d026d5 Joonsoo Kim 2015-02-11 229 int ret), 837d026d5 Joonsoo Kim 2015-02-11 230 837d026d5 Joonsoo Kim 2015-02-11 231 TP_ARGS(zone, order, ret) 837d026d5 Joonsoo Kim 2015-02-11 232 ); 837d026d5 Joonsoo Kim 2015-02-11 233 837d026d5 Joonsoo Kim 2015-02-11 234 DEFINE_EVENT(mm_compaction_suitable_template, mm_compaction_suitable, 837d026d5 Joonsoo Kim 2015-02-11 235 837d026d5 Joonsoo Kim 2015-02-11 236 TP_PROTO(struct zone *zone, 837d026d5 Joonsoo Kim 2015-02-11 237 int order, 837d026d5 Joonsoo Kim 2015-02-11 238 int ret), 837d026d5 Joonsoo Kim 2015-02-11 239 837d026d5 Joonsoo Kim 2015-02-11 240 TP_ARGS(zone, order, ret) 837d026d5 Joonsoo Kim 2015-02-11 241 ); 837d026d5 Joonsoo Kim 2015-02-11 242 24e2716f6 Joonsoo Kim 2015-02-11 243 DECLARE_EVENT_CLASS(mm_compaction_defer_template, 24e2716f6 Joonsoo Kim 2015-02-11 244 24e2716f6 Joonsoo Kim 2015-02-11 245 TP_PROTO(struct zone *zone, int order), 24e2716f6 Joonsoo Kim 2015-02-11 246 24e2716f6 Joonsoo Kim 2015-02-11 247 TP_ARGS(zone, order), 24e2716f6 Joonsoo Kim 2015-02-11 248 24e2716f6 Joonsoo Kim 2015-02-11 249 TP_STRUCT__entry( 24e2716f6 Joonsoo Kim 2015-02-11 250 __field(int, nid) 1743d0506 Vlastimil Babka 2015-11-05 251 __field(enum zone_type, idx) 24e2716f6 Joonsoo Kim 2015-02-11 252 __field(int, order) 24e2716f6 Joonsoo Kim 2015-02-11 253 __field(unsigned int, considered) 24e2716f6 Joonsoo Kim 2015-02-11 254 __field(unsigned int, defer_shift) 24e2716f6 Joonsoo Kim 2015-02-11 255 __field(int, order_failed) 24e2716f6 Joonsoo Kim 2015-02-11 256 ), 24e2716f6 Joonsoo Kim 2015-02-11 257 24e2716f6 Joonsoo Kim 2015-02-11 258 TP_fast_assign( 24e2716f6 Joonsoo Kim 2015-02-11 259 __entry->nid = zone_to_nid(zone); 1743d0506 Vlastimil Babka 2015-11-05 260 __entry->idx = zone_idx(zone); 24e2716f6 Joonsoo Kim 2015-02-11 261 __entry->order = order; 24e2716f6 Joonsoo Kim 2015-02-11 @262 __entry->considered = zone->compact_considered; 24e2716f6 Joonsoo Kim 2015-02-11 @263 __entry->defer_shift = zone->compact_defer_shift; 24e2716f6 Joonsoo Kim 2015-02-11 @264 __entry->order_failed = zone->compact_order_failed; 24e2716f6 Joonsoo Kim 2015-02-11 265 ), 24e2716f6 Joonsoo Kim 2015-02-11 266 24e2716f6 Joonsoo Kim 2015-02-11 267 TP_printk("node=%d zone=%-8s order=%d order_failed=%d consider=%u limit=%lu", 24e2716f6 Joonsoo Kim 2015-02-11 268 __entry->nid, 1743d0506 Vlastimil Babka 2015-11-05 269 __print_symbolic(__entry->idx, ZONE_TYPE), 24e2716f6 Joonsoo Kim 2015-02-11 270 __entry->order, 24e2716f6 Joonsoo Kim 2015-02-11 271 __entry->order_failed, 24e2716f6 Joonsoo Kim 2015-02-11 272 __entry->considered, 24e2716f6 Joonsoo Kim 2015-02-11 273 1UL << __entry->defer_shift) 24e2716f6 Joonsoo Kim 2015-02-11 274 ); 24e2716f6 Joonsoo Kim 2015-02-11 275 :::::: The code at line 262 was first introduced by commit :::::: 24e2716f63e613cf15d3beba3faa0711bcacc427 mm/compaction: add tracepoint to observe behaviour of compaction defer :::::: TO: Joonsoo Kim <iamjoonsoo.kim@lge.com> :::::: CC: Linus Torvalds <torvalds@linux-foundation.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hi Yafang, Thank you for the patch! Yet something to improve: [auto build test ERROR on tip/perf/core] [also build test ERROR on v5.0-rc8 next-20190226] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Yafang-Shao/mm-compaction-remove-unnecessary-CONFIG_COMPACTION/20190226-154127 config: i386-randconfig-b0-02261819 (attached as .config) compiler: gcc-4.9 (Debian 4.9.4-2) 4.9.4 reproduce: # save the attached .config to linux build tree make ARCH=i386 All error/warnings (new ones prefixed by >>): In file included from include/trace/define_trace.h:96:0, from include/trace/events/compaction.h:355, from mm/compaction.c:46: include/trace/events/compaction.h: In function 'trace_raw_output_mm_compaction_end': >> include/trace/trace_events.h:299:18: error: expected expression before ',' token { symbol_array, { -1, NULL }}; \ ^ include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_seq_printf(s, print); \ ^ include/trace/trace_events.h:79:9: note: in expansion of macro 'PARAMS' PARAMS(print)); \ ^ include/trace/events/compaction.h:135:1: note: in expansion of macro 'TRACE_EVENT' TRACE_EVENT(mm_compaction_end, ^ >> include/trace/events/compaction.h:160:2: note: in expansion of macro 'TP_printk' TP_printk("zone_start=0x%lx migrate_pfn=0x%lx free_pfn=0x%lx zone_end=0x%lx, mode=%s status=%s", ^ >> include/trace/events/compaction.h:166:3: note: in expansion of macro '__print_symbolic' __print_symbolic(__entry->status, COMPACTION_STATUS)) ^ include/trace/events/compaction.h: In function 'trace_raw_output_mm_compaction_suitable_template': >> include/trace/trace_events.h:299:18: error: expected expression before ',' token { symbol_array, { -1, NULL }}; \ ^ include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_seq_printf(s, print); \ ^ include/trace/events/compaction.h:218:2: note: in expansion of macro 'TP_printk' TP_printk("node=%d zone=%-8s order=%d ret=%s", ^ include/trace/events/compaction.h:222:3: note: in expansion of macro '__print_symbolic' __print_symbolic(__entry->ret, COMPACTION_STATUS)) ^ >> include/trace/trace_events.h:299:18: warning: missing braces around initializer [-Wmissing-braces] { symbol_array, { -1, NULL }}; \ ^ include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_seq_printf(s, print); \ ^ include/trace/events/compaction.h:218:2: note: in expansion of macro 'TP_printk' TP_printk("node=%d zone=%-8s order=%d ret=%s", ^ include/trace/events/compaction.h:222:3: note: in expansion of macro '__print_symbolic' __print_symbolic(__entry->ret, COMPACTION_STATUS)) ^ include/trace/trace_events.h:299:18: warning: (near initialization for 'symbols[0]') [-Wmissing-braces] { symbol_array, { -1, NULL }}; \ ^ include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_seq_printf(s, print); \ ^ include/trace/events/compaction.h:218:2: note: in expansion of macro 'TP_printk' TP_printk("node=%d zone=%-8s order=%d ret=%s", ^ include/trace/events/compaction.h:222:3: note: in expansion of macro '__print_symbolic' __print_symbolic(__entry->ret, COMPACTION_STATUS)) ^ >> include/trace/trace_events.h:299:18: error: initializer element is not constant { symbol_array, { -1, NULL }}; \ ^ include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_seq_printf(s, print); \ ^ include/trace/events/compaction.h:218:2: note: in expansion of macro 'TP_printk' TP_printk("node=%d zone=%-8s order=%d ret=%s", ^ include/trace/events/compaction.h:222:3: note: in expansion of macro '__print_symbolic' __print_symbolic(__entry->ret, COMPACTION_STATUS)) ^ include/trace/trace_events.h:299:18: error: (near initialization for 'symbols[0].mask') { symbol_array, { -1, NULL }}; \ ^ include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_seq_printf(s, print); \ ^ include/trace/events/compaction.h:218:2: note: in expansion of macro 'TP_printk' TP_printk("node=%d zone=%-8s order=%d ret=%s", ^ include/trace/events/compaction.h:222:3: note: in expansion of macro '__print_symbolic' __print_symbolic(__entry->ret, COMPACTION_STATUS)) ^ In file included from include/trace/define_trace.h:96:0, from include/trace/events/compaction.h:355, from mm/compaction.c:46: include/trace/events/compaction.h: In function 'trace_event_raw_event_mm_compaction_defer_template': >> include/trace/events/compaction.h:262:29: error: 'struct zone' has no member named 'compact_considered' __entry->considered = zone->compact_considered; ^ include/trace/trace_events.h:720:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ >> include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ >> include/trace/events/compaction.h:262:23: warning: assignment makes integer from pointer without a cast __entry->considered = zone->compact_considered; ^ include/trace/trace_events.h:720:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ >> include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ include/trace/events/compaction.h:263:30: error: 'struct zone' has no member named 'compact_defer_shift' __entry->defer_shift = zone->compact_defer_shift; ^ include/trace/trace_events.h:720:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ >> include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ include/trace/events/compaction.h:263:24: warning: assignment makes integer from pointer without a cast __entry->defer_shift = zone->compact_defer_shift; ^ include/trace/trace_events.h:720:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ >> include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ include/trace/events/compaction.h:264:31: error: 'struct zone' has no member named 'compact_order_failed' __entry->order_failed = zone->compact_order_failed; ^ include/trace/trace_events.h:720:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ >> include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ include/trace/events/compaction.h:264:25: warning: assignment makes integer from pointer without a cast __entry->order_failed = zone->compact_order_failed; ^ include/trace/trace_events.h:720:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ >> include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ In file included from include/trace/define_trace.h:97:0, from include/trace/events/compaction.h:355, from mm/compaction.c:46: include/trace/events/compaction.h: In function 'perf_trace_mm_compaction_defer_template': >> include/trace/events/compaction.h:262:29: error: 'struct zone' has no member named 'compact_considered' __entry->considered = zone->compact_considered; ^ include/trace/perf.h:66:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ >> include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ >> include/trace/events/compaction.h:262:23: warning: assignment makes integer from pointer without a cast __entry->considered = zone->compact_considered; ^ include/trace/perf.h:66:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ >> include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ include/trace/events/compaction.h:263:30: error: 'struct zone' has no member named 'compact_defer_shift' __entry->defer_shift = zone->compact_defer_shift; ^ include/trace/perf.h:66:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ >> include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ include/trace/events/compaction.h:263:24: warning: assignment makes integer from pointer without a cast __entry->defer_shift = zone->compact_defer_shift; ^ include/trace/perf.h:66:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ >> include/trace/events/compaction.h:258:2: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ include/trace/events/compaction.h:264:31: error: 'struct zone' has no member named 'compact_order_failed' __entry->order_failed = zone->compact_order_failed; ^ include/trace/perf.h:66:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ vim +262 include/trace/events/compaction.h 0eb927c0a Mel Gorman 2014-01-21 134 0eb927c0a Mel Gorman 2014-01-21 @135 TRACE_EVENT(mm_compaction_end, 16c4a097a Joonsoo Kim 2015-02-11 136 TP_PROTO(unsigned long zone_start, unsigned long migrate_pfn, 16c4a097a Joonsoo Kim 2015-02-11 137 unsigned long free_pfn, unsigned long zone_end, bool sync, 16c4a097a Joonsoo Kim 2015-02-11 138 int status), 0eb927c0a Mel Gorman 2014-01-21 139 16c4a097a Joonsoo Kim 2015-02-11 140 TP_ARGS(zone_start, migrate_pfn, free_pfn, zone_end, sync, status), 0eb927c0a Mel Gorman 2014-01-21 141 0eb927c0a Mel Gorman 2014-01-21 142 TP_STRUCT__entry( 16c4a097a Joonsoo Kim 2015-02-11 143 __field(unsigned long, zone_start) 16c4a097a Joonsoo Kim 2015-02-11 144 __field(unsigned long, migrate_pfn) 16c4a097a Joonsoo Kim 2015-02-11 145 __field(unsigned long, free_pfn) 16c4a097a Joonsoo Kim 2015-02-11 146 __field(unsigned long, zone_end) 16c4a097a Joonsoo Kim 2015-02-11 147 __field(bool, sync) 0eb927c0a Mel Gorman 2014-01-21 148 __field(int, status) 0eb927c0a Mel Gorman 2014-01-21 149 ), 0eb927c0a Mel Gorman 2014-01-21 150 0eb927c0a Mel Gorman 2014-01-21 151 TP_fast_assign( 16c4a097a Joonsoo Kim 2015-02-11 152 __entry->zone_start = zone_start; 16c4a097a Joonsoo Kim 2015-02-11 153 __entry->migrate_pfn = migrate_pfn; 16c4a097a Joonsoo Kim 2015-02-11 154 __entry->free_pfn = free_pfn; 16c4a097a Joonsoo Kim 2015-02-11 155 __entry->zone_end = zone_end; 16c4a097a Joonsoo Kim 2015-02-11 156 __entry->sync = sync; 0eb927c0a Mel Gorman 2014-01-21 157 __entry->status = status; 0eb927c0a Mel Gorman 2014-01-21 158 ), 0eb927c0a Mel Gorman 2014-01-21 159 16c4a097a Joonsoo Kim 2015-02-11 @160 TP_printk("zone_start=0x%lx migrate_pfn=0x%lx free_pfn=0x%lx zone_end=0x%lx, mode=%s status=%s", 16c4a097a Joonsoo Kim 2015-02-11 161 __entry->zone_start, 16c4a097a Joonsoo Kim 2015-02-11 162 __entry->migrate_pfn, 16c4a097a Joonsoo Kim 2015-02-11 163 __entry->free_pfn, 16c4a097a Joonsoo Kim 2015-02-11 164 __entry->zone_end, 16c4a097a Joonsoo Kim 2015-02-11 165 __entry->sync ? "sync" : "async", fa6c7b46a Vlastimil Babka 2015-11-05 @166 __print_symbolic(__entry->status, COMPACTION_STATUS)) 0eb927c0a Mel Gorman 2014-01-21 167 ); b7aba6984 Mel Gorman 2011-01-13 168 837d026d5 Joonsoo Kim 2015-02-11 169 TRACE_EVENT(mm_compaction_try_to_compact_pages, 837d026d5 Joonsoo Kim 2015-02-11 170 837d026d5 Joonsoo Kim 2015-02-11 171 TP_PROTO( 837d026d5 Joonsoo Kim 2015-02-11 172 int order, 837d026d5 Joonsoo Kim 2015-02-11 173 gfp_t gfp_mask, a5508cd83 Vlastimil Babka 2016-07-28 174 int prio), 837d026d5 Joonsoo Kim 2015-02-11 175 a5508cd83 Vlastimil Babka 2016-07-28 176 TP_ARGS(order, gfp_mask, prio), 837d026d5 Joonsoo Kim 2015-02-11 177 837d026d5 Joonsoo Kim 2015-02-11 178 TP_STRUCT__entry( 837d026d5 Joonsoo Kim 2015-02-11 179 __field(int, order) 837d026d5 Joonsoo Kim 2015-02-11 180 __field(gfp_t, gfp_mask) a5508cd83 Vlastimil Babka 2016-07-28 181 __field(int, prio) 837d026d5 Joonsoo Kim 2015-02-11 182 ), 837d026d5 Joonsoo Kim 2015-02-11 183 837d026d5 Joonsoo Kim 2015-02-11 184 TP_fast_assign( 837d026d5 Joonsoo Kim 2015-02-11 185 __entry->order = order; 837d026d5 Joonsoo Kim 2015-02-11 186 __entry->gfp_mask = gfp_mask; a5508cd83 Vlastimil Babka 2016-07-28 187 __entry->prio = prio; 837d026d5 Joonsoo Kim 2015-02-11 188 ), 837d026d5 Joonsoo Kim 2015-02-11 189 a5508cd83 Vlastimil Babka 2016-07-28 190 TP_printk("order=%d gfp_mask=0x%x priority=%d", 837d026d5 Joonsoo Kim 2015-02-11 191 __entry->order, 837d026d5 Joonsoo Kim 2015-02-11 192 __entry->gfp_mask, a5508cd83 Vlastimil Babka 2016-07-28 193 __entry->prio) 837d026d5 Joonsoo Kim 2015-02-11 194 ); 837d026d5 Joonsoo Kim 2015-02-11 195 837d026d5 Joonsoo Kim 2015-02-11 196 DECLARE_EVENT_CLASS(mm_compaction_suitable_template, 837d026d5 Joonsoo Kim 2015-02-11 197 837d026d5 Joonsoo Kim 2015-02-11 198 TP_PROTO(struct zone *zone, 837d026d5 Joonsoo Kim 2015-02-11 199 int order, 837d026d5 Joonsoo Kim 2015-02-11 200 int ret), 837d026d5 Joonsoo Kim 2015-02-11 201 837d026d5 Joonsoo Kim 2015-02-11 202 TP_ARGS(zone, order, ret), 837d026d5 Joonsoo Kim 2015-02-11 203 837d026d5 Joonsoo Kim 2015-02-11 204 TP_STRUCT__entry( 837d026d5 Joonsoo Kim 2015-02-11 205 __field(int, nid) 1743d0506 Vlastimil Babka 2015-11-05 206 __field(enum zone_type, idx) 837d026d5 Joonsoo Kim 2015-02-11 207 __field(int, order) 837d026d5 Joonsoo Kim 2015-02-11 208 __field(int, ret) 837d026d5 Joonsoo Kim 2015-02-11 209 ), 837d026d5 Joonsoo Kim 2015-02-11 210 837d026d5 Joonsoo Kim 2015-02-11 211 TP_fast_assign( 837d026d5 Joonsoo Kim 2015-02-11 212 __entry->nid = zone_to_nid(zone); 1743d0506 Vlastimil Babka 2015-11-05 213 __entry->idx = zone_idx(zone); 837d026d5 Joonsoo Kim 2015-02-11 214 __entry->order = order; 837d026d5 Joonsoo Kim 2015-02-11 215 __entry->ret = ret; 837d026d5 Joonsoo Kim 2015-02-11 216 ), 837d026d5 Joonsoo Kim 2015-02-11 217 837d026d5 Joonsoo Kim 2015-02-11 218 TP_printk("node=%d zone=%-8s order=%d ret=%s", 837d026d5 Joonsoo Kim 2015-02-11 219 __entry->nid, 1743d0506 Vlastimil Babka 2015-11-05 220 __print_symbolic(__entry->idx, ZONE_TYPE), 837d026d5 Joonsoo Kim 2015-02-11 221 __entry->order, fa6c7b46a Vlastimil Babka 2015-11-05 @222 __print_symbolic(__entry->ret, COMPACTION_STATUS)) 837d026d5 Joonsoo Kim 2015-02-11 223 ); 837d026d5 Joonsoo Kim 2015-02-11 224 837d026d5 Joonsoo Kim 2015-02-11 225 DEFINE_EVENT(mm_compaction_suitable_template, mm_compaction_finished, 837d026d5 Joonsoo Kim 2015-02-11 226 837d026d5 Joonsoo Kim 2015-02-11 227 TP_PROTO(struct zone *zone, 837d026d5 Joonsoo Kim 2015-02-11 228 int order, 837d026d5 Joonsoo Kim 2015-02-11 229 int ret), 837d026d5 Joonsoo Kim 2015-02-11 230 837d026d5 Joonsoo Kim 2015-02-11 231 TP_ARGS(zone, order, ret) 837d026d5 Joonsoo Kim 2015-02-11 232 ); 837d026d5 Joonsoo Kim 2015-02-11 233 837d026d5 Joonsoo Kim 2015-02-11 234 DEFINE_EVENT(mm_compaction_suitable_template, mm_compaction_suitable, 837d026d5 Joonsoo Kim 2015-02-11 235 837d026d5 Joonsoo Kim 2015-02-11 236 TP_PROTO(struct zone *zone, 837d026d5 Joonsoo Kim 2015-02-11 237 int order, 837d026d5 Joonsoo Kim 2015-02-11 238 int ret), 837d026d5 Joonsoo Kim 2015-02-11 239 837d026d5 Joonsoo Kim 2015-02-11 240 TP_ARGS(zone, order, ret) 837d026d5 Joonsoo Kim 2015-02-11 241 ); 837d026d5 Joonsoo Kim 2015-02-11 242 24e2716f6 Joonsoo Kim 2015-02-11 243 DECLARE_EVENT_CLASS(mm_compaction_defer_template, 24e2716f6 Joonsoo Kim 2015-02-11 244 24e2716f6 Joonsoo Kim 2015-02-11 245 TP_PROTO(struct zone *zone, int order), 24e2716f6 Joonsoo Kim 2015-02-11 246 24e2716f6 Joonsoo Kim 2015-02-11 247 TP_ARGS(zone, order), 24e2716f6 Joonsoo Kim 2015-02-11 248 24e2716f6 Joonsoo Kim 2015-02-11 249 TP_STRUCT__entry( 24e2716f6 Joonsoo Kim 2015-02-11 250 __field(int, nid) 1743d0506 Vlastimil Babka 2015-11-05 251 __field(enum zone_type, idx) 24e2716f6 Joonsoo Kim 2015-02-11 252 __field(int, order) 24e2716f6 Joonsoo Kim 2015-02-11 253 __field(unsigned int, considered) 24e2716f6 Joonsoo Kim 2015-02-11 254 __field(unsigned int, defer_shift) 24e2716f6 Joonsoo Kim 2015-02-11 255 __field(int, order_failed) 24e2716f6 Joonsoo Kim 2015-02-11 256 ), 24e2716f6 Joonsoo Kim 2015-02-11 257 24e2716f6 Joonsoo Kim 2015-02-11 @258 TP_fast_assign( 24e2716f6 Joonsoo Kim 2015-02-11 259 __entry->nid = zone_to_nid(zone); 1743d0506 Vlastimil Babka 2015-11-05 260 __entry->idx = zone_idx(zone); 24e2716f6 Joonsoo Kim 2015-02-11 261 __entry->order = order; 24e2716f6 Joonsoo Kim 2015-02-11 @262 __entry->considered = zone->compact_considered; 24e2716f6 Joonsoo Kim 2015-02-11 263 __entry->defer_shift = zone->compact_defer_shift; 24e2716f6 Joonsoo Kim 2015-02-11 264 __entry->order_failed = zone->compact_order_failed; 24e2716f6 Joonsoo Kim 2015-02-11 265 ), 24e2716f6 Joonsoo Kim 2015-02-11 266 24e2716f6 Joonsoo Kim 2015-02-11 267 TP_printk("node=%d zone=%-8s order=%d order_failed=%d consider=%u limit=%lu", 24e2716f6 Joonsoo Kim 2015-02-11 268 __entry->nid, 1743d0506 Vlastimil Babka 2015-11-05 269 __print_symbolic(__entry->idx, ZONE_TYPE), 24e2716f6 Joonsoo Kim 2015-02-11 270 __entry->order, 24e2716f6 Joonsoo Kim 2015-02-11 271 __entry->order_failed, 24e2716f6 Joonsoo Kim 2015-02-11 272 __entry->considered, 24e2716f6 Joonsoo Kim 2015-02-11 273 1UL << __entry->defer_shift) 24e2716f6 Joonsoo Kim 2015-02-11 274 ); 24e2716f6 Joonsoo Kim 2015-02-11 275 24e2716f6 Joonsoo Kim 2015-02-11 276 DEFINE_EVENT(mm_compaction_defer_template, mm_compaction_deferred, 24e2716f6 Joonsoo Kim 2015-02-11 277 24e2716f6 Joonsoo Kim 2015-02-11 278 TP_PROTO(struct zone *zone, int order), 24e2716f6 Joonsoo Kim 2015-02-11 279 24e2716f6 Joonsoo Kim 2015-02-11 280 TP_ARGS(zone, order) 24e2716f6 Joonsoo Kim 2015-02-11 281 ); 24e2716f6 Joonsoo Kim 2015-02-11 282 24e2716f6 Joonsoo Kim 2015-02-11 283 DEFINE_EVENT(mm_compaction_defer_template, mm_compaction_defer_compaction, 24e2716f6 Joonsoo Kim 2015-02-11 284 24e2716f6 Joonsoo Kim 2015-02-11 285 TP_PROTO(struct zone *zone, int order), 24e2716f6 Joonsoo Kim 2015-02-11 286 24e2716f6 Joonsoo Kim 2015-02-11 287 TP_ARGS(zone, order) 24e2716f6 Joonsoo Kim 2015-02-11 288 ); 24e2716f6 Joonsoo Kim 2015-02-11 289 24e2716f6 Joonsoo Kim 2015-02-11 290 DEFINE_EVENT(mm_compaction_defer_template, mm_compaction_defer_reset, 24e2716f6 Joonsoo Kim 2015-02-11 291 24e2716f6 Joonsoo Kim 2015-02-11 292 TP_PROTO(struct zone *zone, int order), 24e2716f6 Joonsoo Kim 2015-02-11 293 24e2716f6 Joonsoo Kim 2015-02-11 294 TP_ARGS(zone, order) 24e2716f6 Joonsoo Kim 2015-02-11 295 ); 24e2716f6 Joonsoo Kim 2015-02-11 296 698b1b306 Vlastimil Babka 2016-03-17 297 TRACE_EVENT(mm_compaction_kcompactd_sleep, 698b1b306 Vlastimil Babka 2016-03-17 298 698b1b306 Vlastimil Babka 2016-03-17 299 TP_PROTO(int nid), 698b1b306 Vlastimil Babka 2016-03-17 300 698b1b306 Vlastimil Babka 2016-03-17 301 TP_ARGS(nid), 698b1b306 Vlastimil Babka 2016-03-17 302 698b1b306 Vlastimil Babka 2016-03-17 303 TP_STRUCT__entry( 698b1b306 Vlastimil Babka 2016-03-17 304 __field(int, nid) 698b1b306 Vlastimil Babka 2016-03-17 305 ), 698b1b306 Vlastimil Babka 2016-03-17 306 698b1b306 Vlastimil Babka 2016-03-17 307 TP_fast_assign( 698b1b306 Vlastimil Babka 2016-03-17 308 __entry->nid = nid; 698b1b306 Vlastimil Babka 2016-03-17 309 ), 698b1b306 Vlastimil Babka 2016-03-17 310 698b1b306 Vlastimil Babka 2016-03-17 311 TP_printk("nid=%d", __entry->nid) 698b1b306 Vlastimil Babka 2016-03-17 312 ); 698b1b306 Vlastimil Babka 2016-03-17 313 698b1b306 Vlastimil Babka 2016-03-17 314 DECLARE_EVENT_CLASS(kcompactd_wake_template, 698b1b306 Vlastimil Babka 2016-03-17 315 698b1b306 Vlastimil Babka 2016-03-17 316 TP_PROTO(int nid, int order, enum zone_type classzone_idx), 698b1b306 Vlastimil Babka 2016-03-17 317 698b1b306 Vlastimil Babka 2016-03-17 318 TP_ARGS(nid, order, classzone_idx), 698b1b306 Vlastimil Babka 2016-03-17 319 698b1b306 Vlastimil Babka 2016-03-17 320 TP_STRUCT__entry( 698b1b306 Vlastimil Babka 2016-03-17 321 __field(int, nid) 698b1b306 Vlastimil Babka 2016-03-17 322 __field(int, order) 698b1b306 Vlastimil Babka 2016-03-17 323 __field(enum zone_type, classzone_idx) 698b1b306 Vlastimil Babka 2016-03-17 324 ), 698b1b306 Vlastimil Babka 2016-03-17 325 698b1b306 Vlastimil Babka 2016-03-17 326 TP_fast_assign( 698b1b306 Vlastimil Babka 2016-03-17 327 __entry->nid = nid; 698b1b306 Vlastimil Babka 2016-03-17 328 __entry->order = order; 698b1b306 Vlastimil Babka 2016-03-17 329 __entry->classzone_idx = classzone_idx; 698b1b306 Vlastimil Babka 2016-03-17 330 ), 698b1b306 Vlastimil Babka 2016-03-17 331 698b1b306 Vlastimil Babka 2016-03-17 332 TP_printk("nid=%d order=%d classzone_idx=%-8s", 698b1b306 Vlastimil Babka 2016-03-17 333 __entry->nid, 698b1b306 Vlastimil Babka 2016-03-17 334 __entry->order, 698b1b306 Vlastimil Babka 2016-03-17 335 __print_symbolic(__entry->classzone_idx, ZONE_TYPE)) 698b1b306 Vlastimil Babka 2016-03-17 336 ); 698b1b306 Vlastimil Babka 2016-03-17 337 698b1b306 Vlastimil Babka 2016-03-17 338 DEFINE_EVENT(kcompactd_wake_template, mm_compaction_wakeup_kcompactd, 698b1b306 Vlastimil Babka 2016-03-17 339 698b1b306 Vlastimil Babka 2016-03-17 340 TP_PROTO(int nid, int order, enum zone_type classzone_idx), 698b1b306 Vlastimil Babka 2016-03-17 341 698b1b306 Vlastimil Babka 2016-03-17 342 TP_ARGS(nid, order, classzone_idx) 698b1b306 Vlastimil Babka 2016-03-17 343 ); 698b1b306 Vlastimil Babka 2016-03-17 344 698b1b306 Vlastimil Babka 2016-03-17 345 DEFINE_EVENT(kcompactd_wake_template, mm_compaction_kcompactd_wake, 698b1b306 Vlastimil Babka 2016-03-17 346 698b1b306 Vlastimil Babka 2016-03-17 347 TP_PROTO(int nid, int order, enum zone_type classzone_idx), 698b1b306 Vlastimil Babka 2016-03-17 348 698b1b306 Vlastimil Babka 2016-03-17 349 TP_ARGS(nid, order, classzone_idx) 698b1b306 Vlastimil Babka 2016-03-17 350 ); 698b1b306 Vlastimil Babka 2016-03-17 351 b7aba6984 Mel Gorman 2011-01-13 352 #endif /* _TRACE_COMPACTION_H */ b7aba6984 Mel Gorman 2011-01-13 353 b7aba6984 Mel Gorman 2011-01-13 354 /* This part must be outside protection */ b7aba6984 Mel Gorman 2011-01-13 @355 #include <trace/define_trace.h> :::::: The code at line 262 was first introduced by commit :::::: 24e2716f63e613cf15d3beba3faa0711bcacc427 mm/compaction: add tracepoint to observe behaviour of compaction defer :::::: TO: Joonsoo Kim <iamjoonsoo.kim@lge.com> :::::: CC: Linus Torvalds <torvalds@linux-foundation.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/include/trace/events/compaction.h b/include/trace/events/compaction.h index 6074eff..06fb680 100644 --- a/include/trace/events/compaction.h +++ b/include/trace/events/compaction.h @@ -132,7 +132,6 @@ __entry->sync ? "sync" : "async") ); -#ifdef CONFIG_COMPACTION TRACE_EVENT(mm_compaction_end, TP_PROTO(unsigned long zone_start, unsigned long migrate_pfn, unsigned long free_pfn, unsigned long zone_end, bool sync, @@ -166,7 +165,6 @@ __entry->sync ? "sync" : "async", __print_symbolic(__entry->status, COMPACTION_STATUS)) ); -#endif TRACE_EVENT(mm_compaction_try_to_compact_pages, @@ -195,7 +193,6 @@ __entry->prio) ); -#ifdef CONFIG_COMPACTION DECLARE_EVENT_CLASS(mm_compaction_suitable_template, TP_PROTO(struct zone *zone, @@ -296,7 +293,6 @@ TP_ARGS(zone, order) ); -#endif TRACE_EVENT(mm_compaction_kcompactd_sleep,
The file trace/events/compaction.h is included only when CONFIG_COMPACTION is defined, so it is unnecessary to use CONFIG_COMPACTION again in this file. Signed-off-by: Yafang Shao <laoar.shao@gmail.com> --- include/trace/events/compaction.h | 4 ---- 1 file changed, 4 deletions(-)