change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/include/trace/events/compaction.h
..
..
@@ -64,6 +64,7 @@
64
64
 	TP_ARGS(start_pfn, end_pfn, nr_scanned, nr_taken)
65
65
 );
66
66
 
67
+#ifdef CONFIG_COMPACTION
67
68
 TRACE_EVENT(mm_compaction_migratepages,
68
69
 
69
70
 	TP_PROTO(unsigned long nr_all,
..
..
@@ -132,7 +133,6 @@
132
133
 		__entry->sync ? "sync" : "async")
133
134
 );
134
135
 
135
-#ifdef CONFIG_COMPACTION
136
136
 TRACE_EVENT(mm_compaction_end,
137
137
 	TP_PROTO(unsigned long zone_start, unsigned long migrate_pfn,
138
138
 		unsigned long free_pfn, unsigned long zone_end, bool sync,
..
..
@@ -166,7 +166,6 @@
166
166
 		__entry->sync ? "sync" : "async",
167
167
 		__print_symbolic(__entry->status, COMPACTION_STATUS))
168
168
 );
169
-#endif
170
169
 
171
170
 TRACE_EVENT(mm_compaction_try_to_compact_pages,
172
171
 
..
..
@@ -189,13 +188,12 @@
189
188
 		__entry->prio = prio;
190
189
 	),
191
190
 
192
-	TP_printk("order=%d gfp_mask=0x%x priority=%d",
191
+	TP_printk("order=%d gfp_mask=%s priority=%d",
193
192
 		__entry->order,
194
-		__entry->gfp_mask,
193
+		show_gfp_flags(__entry->gfp_mask),
195
194
 		__entry->prio)
196
195
 );
197
196
 
198
-#ifdef CONFIG_COMPACTION
199
197
 DECLARE_EVENT_CLASS(mm_compaction_suitable_template,
200
198
 
201
199
 	TP_PROTO(struct zone *zone,
..
..
@@ -296,7 +294,6 @@
296
294
 
297
295
 	TP_ARGS(zone, order)
298
296
 );
299
-#endif
300
297
 
301
298
 TRACE_EVENT(mm_compaction_kcompactd_sleep,
302
299
 
..
..
@@ -317,41 +314,46 @@
317
314
 
318
315
 DECLARE_EVENT_CLASS(kcompactd_wake_template,
319
316
 
320
-	TP_PROTO(int nid, int order, enum zone_type classzone_idx),
317
+	TP_PROTO(int nid, int order, enum zone_type highest_zoneidx),
321
318
 
322
-	TP_ARGS(nid, order, classzone_idx),
319
+	TP_ARGS(nid, order, highest_zoneidx),
323
320
 
324
321
 	TP_STRUCT__entry(
325
322
 		__field(int, nid)
326
323
 		__field(int, order)
327
-		__field(enum zone_type, classzone_idx)
324
+		__field(enum zone_type, highest_zoneidx)
328
325
 	),
329
326
 
330
327
 	TP_fast_assign(
331
328
 		__entry->nid = nid;
332
329
 		__entry->order = order;
333
-		__entry->classzone_idx = classzone_idx;
330
+		__entry->highest_zoneidx = highest_zoneidx;
334
331
 	),
335
332
 
333
+	/*
334
+	 * classzone_idx is previous name of the highest_zoneidx.
335
+	 * Reason not to change it is the ABI requirement of the tracepoint.
336
+	 */
336
337
 	TP_printk("nid=%d order=%d classzone_idx=%-8s",
337
338
 		__entry->nid,
338
339
 		__entry->order,
339
-		__print_symbolic(__entry->classzone_idx, ZONE_TYPE))
340
+		__print_symbolic(__entry->highest_zoneidx, ZONE_TYPE))
340
341
 );
341
342
 
342
343
 DEFINE_EVENT(kcompactd_wake_template, mm_compaction_wakeup_kcompactd,
343
344
 
344
-	TP_PROTO(int nid, int order, enum zone_type classzone_idx),
345
+	TP_PROTO(int nid, int order, enum zone_type highest_zoneidx),
345
346
 
346
-	TP_ARGS(nid, order, classzone_idx)
347
+	TP_ARGS(nid, order, highest_zoneidx)
347
348
 );
348
349
 
349
350
 DEFINE_EVENT(kcompactd_wake_template, mm_compaction_kcompactd_wake,
350
351
 
351
-	TP_PROTO(int nid, int order, enum zone_type classzone_idx),
352
+	TP_PROTO(int nid, int order, enum zone_type highest_zoneidx),
352
353
 
353
-	TP_ARGS(nid, order, classzone_idx)
354
+	TP_ARGS(nid, order, highest_zoneidx)
354
355
 );
356
+#endif
355
357
 
356
358
 #endif /* _TRACE_COMPACTION_H */
357
359