forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376 
 kernel/kernel/trace/trace_entries.h
....@@ -61,13 +61,12 @@
6161 	TRACE_FN,
6262 
6363 	F_STRUCT(
64
-		__field(	unsigned long,	ip		)
65
-		__field(	unsigned long,	parent_ip	)
64
+		__field_fn(	unsigned long,	ip		)
65
+		__field_fn(	unsigned long,	parent_ip	)
6666 	),
6767 
68
-	F_printk(" %lx <-- %lx", __entry->ip, __entry->parent_ip),
69
-
70
-	FILTER_TRACE_FN,
68
+	F_printk(" %ps <-- %ps",
69
+		 (void *)__entry->ip, (void *)__entry->parent_ip),
7170 
7271 	perf_ftrace_event_register
7372 );
....@@ -79,13 +78,11 @@
7978 
8079 	F_STRUCT(
8180 		__field_struct(	struct ftrace_graph_ent,	graph_ent	)
82
-		__field_desc(	unsigned long,	graph_ent,	func		)
83
-		__field_desc(	int,		graph_ent,	depth		)
81
+		__field_packed(	unsigned long,	graph_ent,	func		)
82
+		__field_packed(	int,		graph_ent,	depth		)
8483 	),
8584 
86
-	F_printk("--> %lx (%d)", __entry->func, __entry->depth),
87
-
88
-	FILTER_OTHER
85
+	F_printk("--> %ps (%d)", (void *)__entry->func, __entry->depth)
8986 );
9087 
9188 /* Function return entry */
....@@ -95,19 +92,17 @@
9592 
9693 	F_STRUCT(
9794 		__field_struct(	struct ftrace_graph_ret,	ret	)
98
-		__field_desc(	unsigned long,	ret,		func	)
99
-		__field_desc(	unsigned long long, ret,	calltime)
100
-		__field_desc(	unsigned long long, ret,	rettime	)
101
-		__field_desc(	unsigned long,	ret,		overrun	)
102
-		__field_desc(	int,		ret,		depth	)
95
+		__field_packed(	unsigned long,	ret,		func	)
96
+		__field_packed(	unsigned long,	ret,		overrun	)
97
+		__field_packed(	unsigned long long, ret,	calltime)
98
+		__field_packed(	unsigned long long, ret,	rettime	)
99
+		__field_packed(	int,		ret,		depth	)
103100 	),
104101 
105
-	F_printk("<-- %lx (%d) (start: %llx  end: %llx) over: %d",
106
-		 __entry->func, __entry->depth,
102
+	F_printk("<-- %ps (%d) (start: %llx  end: %llx) over: %d",
103
+		 (void *)__entry->func, __entry->depth,
107104 		 __entry->calltime, __entry->rettime,
108
-		 __entry->depth),
109
-
110
-	FILTER_OTHER
105
+		 __entry->depth)
111106 );
112107 
113108 /*
....@@ -136,9 +131,7 @@
136131 	F_printk("%u:%u:%u  ==> %u:%u:%u [%03u]",
137132 		 __entry->prev_pid, __entry->prev_prio, __entry->prev_state,
138133 		 __entry->next_pid, __entry->next_prio, __entry->next_state,
139
-		 __entry->next_cpu),
140
-
141
-	FILTER_OTHER
134
+		 __entry->next_cpu)
142135 );
143136 
144137 /*
....@@ -156,9 +149,7 @@
156149 	F_printk("%u:%u:%u  ==+ %u:%u:%u [%03u]",
157150 		 __entry->prev_pid, __entry->prev_prio, __entry->prev_state,
158151 		 __entry->next_pid, __entry->next_prio, __entry->next_state,
159
-		 __entry->next_cpu),
160
-
161
-	FILTER_OTHER
152
+		 __entry->next_cpu)
162153 );
163154 
164155 /*
....@@ -166,12 +157,6 @@
166157  */
167158 
168159 #define FTRACE_STACK_ENTRIES	8
169
-
170
-#ifndef CONFIG_64BIT
171
-# define IP_FMT "%08lx"
172
-#else
173
-# define IP_FMT "%016lx"
174
-#endif
175160 
176161 FTRACE_ENTRY(kernel_stack, stack_entry,
177162 
....@@ -182,14 +167,13 @@
182167 		__array(	unsigned long,	caller,	FTRACE_STACK_ENTRIES	)
183168 	),
184169 
185
-	F_printk("\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n"
186
-		 "\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n"
187
-		 "\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n",
188
-		 __entry->caller[0], __entry->caller[1], __entry->caller[2],
189
-		 __entry->caller[3], __entry->caller[4], __entry->caller[5],
190
-		 __entry->caller[6], __entry->caller[7]),
191
-
192
-	FILTER_OTHER
170
+	F_printk("\t=> %ps\n\t=> %ps\n\t=> %ps\n"
171
+		 "\t=> %ps\n\t=> %ps\n\t=> %ps\n"
172
+		 "\t=> %ps\n\t=> %ps\n",
173
+		 (void *)__entry->caller[0], (void *)__entry->caller[1],
174
+		 (void *)__entry->caller[2], (void *)__entry->caller[3],
175
+		 (void *)__entry->caller[4], (void *)__entry->caller[5],
176
+		 (void *)__entry->caller[6], (void *)__entry->caller[7])
193177 );
194178 
195179 FTRACE_ENTRY(user_stack, userstack_entry,
....@@ -201,14 +185,13 @@
201185 		__array(	unsigned long,	caller, FTRACE_STACK_ENTRIES	)
202186 	),
203187 
204
-	F_printk("\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n"
205
-		 "\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n"
206
-		 "\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n",
207
-		 __entry->caller[0], __entry->caller[1], __entry->caller[2],
208
-		 __entry->caller[3], __entry->caller[4], __entry->caller[5],
209
-		 __entry->caller[6], __entry->caller[7]),
210
-
211
-	FILTER_OTHER
188
+	F_printk("\t=> %ps\n\t=> %ps\n\t=> %ps\n"
189
+		 "\t=> %ps\n\t=> %ps\n\t=> %ps\n"
190
+		 "\t=> %ps\n\t=> %ps\n",
191
+		 (void *)__entry->caller[0], (void *)__entry->caller[1],
192
+		 (void *)__entry->caller[2], (void *)__entry->caller[3],
193
+		 (void *)__entry->caller[4], (void *)__entry->caller[5],
194
+		 (void *)__entry->caller[6], (void *)__entry->caller[7])
212195 );
213196 
214197 /*
....@@ -225,9 +208,7 @@
225208 	),
226209 
227210 	F_printk("%ps: %s",
228
-		 (void *)__entry->ip, __entry->fmt),
229
-
230
-	FILTER_OTHER
211
+		 (void *)__entry->ip, __entry->fmt)
231212 );
232213 
233214 FTRACE_ENTRY_REG(print, print_entry,
....@@ -242,8 +223,6 @@
242223 	F_printk("%ps: %s",
243224 		 (void *)__entry->ip, __entry->buf),
244225 
245
-	FILTER_OTHER,
246
-
247226 	ftrace_event_register
248227 );
249228 
....@@ -257,9 +236,7 @@
257236 	),
258237 
259238 	F_printk("id:%04x %08x",
260
-		 __entry->id, (int)__entry->buf[0]),
261
-
262
-	FILTER_OTHER
239
+		 __entry->id, (int)__entry->buf[0])
263240 );
264241 
265242 FTRACE_ENTRY(bputs, bputs_entry,
....@@ -272,9 +249,7 @@
272249 	),
273250 
274251 	F_printk("%ps: %s",
275
-		 (void *)__entry->ip, __entry->str),
276
-
277
-	FILTER_OTHER
252
+		 (void *)__entry->ip, __entry->str)
278253 );
279254 
280255 FTRACE_ENTRY(mmiotrace_rw, trace_mmiotrace_rw,
....@@ -286,16 +261,14 @@
286261 		__field_desc(	resource_size_t, rw,	phys	)
287262 		__field_desc(	unsigned long,	rw,	value	)
288263 		__field_desc(	unsigned long,	rw,	pc	)
289
-		__field_desc(	int, 		rw,	map_id	)
264
+		__field_desc(	int,		rw,	map_id	)
290265 		__field_desc(	unsigned char,	rw,	opcode	)
291266 		__field_desc(	unsigned char,	rw,	width	)
292267 	),
293268 
294269 	F_printk("%lx %lx %lx %d %x %x",
295270 		 (unsigned long)__entry->phys, __entry->value, __entry->pc,
296
-		 __entry->map_id, __entry->opcode, __entry->width),
297
-
298
-	FILTER_OTHER
271
+		 __entry->map_id, __entry->opcode, __entry->width)
299272 );
300273 
301274 FTRACE_ENTRY(mmiotrace_map, trace_mmiotrace_map,
....@@ -307,15 +280,13 @@
307280 		__field_desc(	resource_size_t, map,	phys	)
308281 		__field_desc(	unsigned long,	map,	virt	)
309282 		__field_desc(	unsigned long,	map,	len	)
310
-		__field_desc(	int, 		map,	map_id	)
283
+		__field_desc(	int,		map,	map_id	)
311284 		__field_desc(	unsigned char,	map,	opcode	)
312285 	),
313286 
314287 	F_printk("%lx %lx %lx %d %x",
315288 		 (unsigned long)__entry->phys, __entry->virt, __entry->len,
316
-		 __entry->map_id, __entry->opcode),
317
-
318
-	FILTER_OTHER
289
+		 __entry->map_id, __entry->opcode)
319290 );
320291 
321292 
....@@ -337,9 +308,7 @@
337308 	F_printk("%u:%s:%s (%u)%s",
338309 		 __entry->line,
339310 		 __entry->func, __entry->file, __entry->correct,
340
-		 __entry->constant ? " CONSTANT" : ""),
341
-
342
-	FILTER_OTHER
311
+		 __entry->constant ? " CONSTANT" : "")
343312 );
344313 
345314 
....@@ -356,16 +325,16 @@
356325 		__field_desc(	long,	timestamp,	tv_nsec		)
357326 		__field(	unsigned int,		nmi_count	)
358327 		__field(	unsigned int,		seqnum		)
328
+		__field(	unsigned int,		count		)
359329 	),
360330 
361
-	F_printk("cnt:%u\tts:%010llu.%010lu\tinner:%llu\touter:%llu\tnmi-ts:%llu\tnmi-count:%u\n",
331
+	F_printk("cnt:%u\tts:%010llu.%010lu\tinner:%llu\touter:%llu\tcount:%d\tnmi-ts:%llu\tnmi-count:%u\n",
362332 		 __entry->seqnum,
363333 		 __entry->tv_sec,
364334 		 __entry->tv_nsec,
365335 		 __entry->duration,
366336 		 __entry->outer_duration,
337
+		 __entry->count,
367338 		 __entry->nmi_total_ts,
368
-		 __entry->nmi_count),
369
-
370
-	FILTER_OTHER
339
+		 __entry->nmi_count)
371340 );