diff options
Diffstat (limited to 'include/trace/ftrace.h')
-rw-r--r-- | include/trace/ftrace.h | 93 |
1 files changed, 62 insertions, 31 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index f64fbaae781a..308bafd93325 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h | |||
@@ -21,11 +21,14 @@ | |||
21 | #undef __field | 21 | #undef __field |
22 | #define __field(type, item) type item; | 22 | #define __field(type, item) type item; |
23 | 23 | ||
24 | #undef __field_ext | ||
25 | #define __field_ext(type, item, filter_type) type item; | ||
26 | |||
24 | #undef __array | 27 | #undef __array |
25 | #define __array(type, item, len) type item[len]; | 28 | #define __array(type, item, len) type item[len]; |
26 | 29 | ||
27 | #undef __dynamic_array | 30 | #undef __dynamic_array |
28 | #define __dynamic_array(type, item, len) unsigned short __data_loc_##item; | 31 | #define __dynamic_array(type, item, len) u32 __data_loc_##item; |
29 | 32 | ||
30 | #undef __string | 33 | #undef __string |
31 | #define __string(item, src) __dynamic_array(char, item, -1) | 34 | #define __string(item, src) __dynamic_array(char, item, -1) |
@@ -42,6 +45,16 @@ | |||
42 | }; \ | 45 | }; \ |
43 | static struct ftrace_event_call event_##name | 46 | static struct ftrace_event_call event_##name |
44 | 47 | ||
48 | #undef __cpparg | ||
49 | #define __cpparg(arg...) arg | ||
50 | |||
51 | /* Callbacks are meaningless to ftrace. */ | ||
52 | #undef TRACE_EVENT_FN | ||
53 | #define TRACE_EVENT_FN(name, proto, args, tstruct, \ | ||
54 | assign, print, reg, unreg) \ | ||
55 | TRACE_EVENT(name, __cpparg(proto), __cpparg(args), \ | ||
56 | __cpparg(tstruct), __cpparg(assign), __cpparg(print)) \ | ||
57 | |||
45 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) | 58 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) |
46 | 59 | ||
47 | 60 | ||
@@ -51,23 +64,27 @@ | |||
51 | * Include the following: | 64 | * Include the following: |
52 | * | 65 | * |
53 | * struct ftrace_data_offsets_<call> { | 66 | * struct ftrace_data_offsets_<call> { |
54 | * int <item1>; | 67 | * u32 <item1>; |
55 | * int <item2>; | 68 | * u32 <item2>; |
56 | * [...] | 69 | * [...] |
57 | * }; | 70 | * }; |
58 | * | 71 | * |
59 | * The __dynamic_array() macro will create each int <item>, this is | 72 | * The __dynamic_array() macro will create each u32 <item>, this is |
60 | * to keep the offset of each array from the beginning of the event. | 73 | * to keep the offset of each array from the beginning of the event. |
74 | * The size of an array is also encoded, in the higher 16 bits of <item>. | ||
61 | */ | 75 | */ |
62 | 76 | ||
63 | #undef __field | 77 | #undef __field |
64 | #define __field(type, item); | 78 | #define __field(type, item) |
79 | |||
80 | #undef __field_ext | ||
81 | #define __field_ext(type, item, filter_type) | ||
65 | 82 | ||
66 | #undef __array | 83 | #undef __array |
67 | #define __array(type, item, len) | 84 | #define __array(type, item, len) |
68 | 85 | ||
69 | #undef __dynamic_array | 86 | #undef __dynamic_array |
70 | #define __dynamic_array(type, item, len) int item; | 87 | #define __dynamic_array(type, item, len) u32 item; |
71 | 88 | ||
72 | #undef __string | 89 | #undef __string |
73 | #define __string(item, src) __dynamic_array(char, item, -1) | 90 | #define __string(item, src) __dynamic_array(char, item, -1) |
@@ -109,6 +126,9 @@ | |||
109 | if (!ret) \ | 126 | if (!ret) \ |
110 | return 0; | 127 | return 0; |
111 | 128 | ||
129 | #undef __field_ext | ||
130 | #define __field_ext(type, item, filter_type) __field(type, item) | ||
131 | |||
112 | #undef __array | 132 | #undef __array |
113 | #define __array(type, item, len) \ | 133 | #define __array(type, item, len) \ |
114 | ret = trace_seq_printf(s, "\tfield:" #type " " #item "[" #len "];\t" \ | 134 | ret = trace_seq_printf(s, "\tfield:" #type " " #item "[" #len "];\t" \ |
@@ -120,7 +140,7 @@ | |||
120 | 140 | ||
121 | #undef __dynamic_array | 141 | #undef __dynamic_array |
122 | #define __dynamic_array(type, item, len) \ | 142 | #define __dynamic_array(type, item, len) \ |
123 | ret = trace_seq_printf(s, "\tfield:__data_loc " #item ";\t" \ | 143 | ret = trace_seq_printf(s, "\tfield:__data_loc " #type "[] " #item ";\t"\ |
124 | "offset:%u;\tsize:%u;\n", \ | 144 | "offset:%u;\tsize:%u;\n", \ |
125 | (unsigned int)offsetof(typeof(field), \ | 145 | (unsigned int)offsetof(typeof(field), \ |
126 | __data_loc_##item), \ | 146 | __data_loc_##item), \ |
@@ -150,7 +170,8 @@ | |||
150 | #undef TRACE_EVENT | 170 | #undef TRACE_EVENT |
151 | #define TRACE_EVENT(call, proto, args, tstruct, func, print) \ | 171 | #define TRACE_EVENT(call, proto, args, tstruct, func, print) \ |
152 | static int \ | 172 | static int \ |
153 | ftrace_format_##call(struct trace_seq *s) \ | 173 | ftrace_format_##call(struct ftrace_event_call *unused, \ |
174 | struct trace_seq *s) \ | ||
154 | { \ | 175 | { \ |
155 | struct ftrace_raw_##call field __attribute__((unused)); \ | 176 | struct ftrace_raw_##call field __attribute__((unused)); \ |
156 | int ret = 0; \ | 177 | int ret = 0; \ |
@@ -210,7 +231,7 @@ ftrace_format_##call(struct trace_seq *s) \ | |||
210 | 231 | ||
211 | #undef __get_dynamic_array | 232 | #undef __get_dynamic_array |
212 | #define __get_dynamic_array(field) \ | 233 | #define __get_dynamic_array(field) \ |
213 | ((void *)__entry + __entry->__data_loc_##field) | 234 | ((void *)__entry + (__entry->__data_loc_##field & 0xffff)) |
214 | 235 | ||
215 | #undef __get_str | 236 | #undef __get_str |
216 | #define __get_str(field) (char *)__get_dynamic_array(field) | 237 | #define __get_str(field) (char *)__get_dynamic_array(field) |
@@ -263,28 +284,33 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags) \ | |||
263 | 284 | ||
264 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) | 285 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) |
265 | 286 | ||
266 | #undef __field | 287 | #undef __field_ext |
267 | #define __field(type, item) \ | 288 | #define __field_ext(type, item, filter_type) \ |
268 | ret = trace_define_field(event_call, #type, #item, \ | 289 | ret = trace_define_field(event_call, #type, #item, \ |
269 | offsetof(typeof(field), item), \ | 290 | offsetof(typeof(field), item), \ |
270 | sizeof(field.item), is_signed_type(type)); \ | 291 | sizeof(field.item), \ |
292 | is_signed_type(type), filter_type); \ | ||
271 | if (ret) \ | 293 | if (ret) \ |
272 | return ret; | 294 | return ret; |
273 | 295 | ||
296 | #undef __field | ||
297 | #define __field(type, item) __field_ext(type, item, FILTER_OTHER) | ||
298 | |||
274 | #undef __array | 299 | #undef __array |
275 | #define __array(type, item, len) \ | 300 | #define __array(type, item, len) \ |
276 | BUILD_BUG_ON(len > MAX_FILTER_STR_VAL); \ | 301 | BUILD_BUG_ON(len > MAX_FILTER_STR_VAL); \ |
277 | ret = trace_define_field(event_call, #type "[" #len "]", #item, \ | 302 | ret = trace_define_field(event_call, #type "[" #len "]", #item, \ |
278 | offsetof(typeof(field), item), \ | 303 | offsetof(typeof(field), item), \ |
279 | sizeof(field.item), 0); \ | 304 | sizeof(field.item), 0, FILTER_OTHER); \ |
280 | if (ret) \ | 305 | if (ret) \ |
281 | return ret; | 306 | return ret; |
282 | 307 | ||
283 | #undef __dynamic_array | 308 | #undef __dynamic_array |
284 | #define __dynamic_array(type, item, len) \ | 309 | #define __dynamic_array(type, item, len) \ |
285 | ret = trace_define_field(event_call, "__data_loc" "[" #type "]", #item,\ | 310 | ret = trace_define_field(event_call, "__data_loc " #type "[]", #item, \ |
286 | offsetof(typeof(field), __data_loc_##item), \ | 311 | offsetof(typeof(field), __data_loc_##item), \ |
287 | sizeof(field.__data_loc_##item), 0); | 312 | sizeof(field.__data_loc_##item), 0, \ |
313 | FILTER_OTHER); | ||
288 | 314 | ||
289 | #undef __string | 315 | #undef __string |
290 | #define __string(item, src) __dynamic_array(char, item, -1) | 316 | #define __string(item, src) __dynamic_array(char, item, -1) |
@@ -292,17 +318,14 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags) \ | |||
292 | #undef TRACE_EVENT | 318 | #undef TRACE_EVENT |
293 | #define TRACE_EVENT(call, proto, args, tstruct, func, print) \ | 319 | #define TRACE_EVENT(call, proto, args, tstruct, func, print) \ |
294 | int \ | 320 | int \ |
295 | ftrace_define_fields_##call(void) \ | 321 | ftrace_define_fields_##call(struct ftrace_event_call *event_call) \ |
296 | { \ | 322 | { \ |
297 | struct ftrace_raw_##call field; \ | 323 | struct ftrace_raw_##call field; \ |
298 | struct ftrace_event_call *event_call = &event_##call; \ | ||
299 | int ret; \ | 324 | int ret; \ |
300 | \ | 325 | \ |
301 | __common_field(int, type, 1); \ | 326 | ret = trace_define_common_fields(event_call); \ |
302 | __common_field(unsigned char, flags, 0); \ | 327 | if (ret) \ |
303 | __common_field(unsigned char, preempt_count, 0); \ | 328 | return ret; \ |
304 | __common_field(int, pid, 1); \ | ||
305 | __common_field(int, tgid, 1); \ | ||
306 | \ | 329 | \ |
307 | tstruct; \ | 330 | tstruct; \ |
308 | \ | 331 | \ |
@@ -321,6 +344,9 @@ ftrace_define_fields_##call(void) \ | |||
321 | #undef __field | 344 | #undef __field |
322 | #define __field(type, item) | 345 | #define __field(type, item) |
323 | 346 | ||
347 | #undef __field_ext | ||
348 | #define __field_ext(type, item, filter_type) | ||
349 | |||
324 | #undef __array | 350 | #undef __array |
325 | #define __array(type, item, len) | 351 | #define __array(type, item, len) |
326 | 352 | ||
@@ -328,6 +354,7 @@ ftrace_define_fields_##call(void) \ | |||
328 | #define __dynamic_array(type, item, len) \ | 354 | #define __dynamic_array(type, item, len) \ |
329 | __data_offsets->item = __data_size + \ | 355 | __data_offsets->item = __data_size + \ |
330 | offsetof(typeof(*entry), __data); \ | 356 | offsetof(typeof(*entry), __data); \ |
357 | __data_offsets->item |= (len * sizeof(type)) << 16; \ | ||
331 | __data_size += (len) * sizeof(type); | 358 | __data_size += (len) * sizeof(type); |
332 | 359 | ||
333 | #undef __string | 360 | #undef __string |
@@ -433,13 +460,15 @@ static void ftrace_profile_disable_##call(struct ftrace_event_call *event_call)\ | |||
433 | * { | 460 | * { |
434 | * struct ring_buffer_event *event; | 461 | * struct ring_buffer_event *event; |
435 | * struct ftrace_raw_<call> *entry; <-- defined in stage 1 | 462 | * struct ftrace_raw_<call> *entry; <-- defined in stage 1 |
463 | * struct ring_buffer *buffer; | ||
436 | * unsigned long irq_flags; | 464 | * unsigned long irq_flags; |
437 | * int pc; | 465 | * int pc; |
438 | * | 466 | * |
439 | * local_save_flags(irq_flags); | 467 | * local_save_flags(irq_flags); |
440 | * pc = preempt_count(); | 468 | * pc = preempt_count(); |
441 | * | 469 | * |
442 | * event = trace_current_buffer_lock_reserve(event_<call>.id, | 470 | * event = trace_current_buffer_lock_reserve(&buffer, |
471 | * event_<call>.id, | ||
443 | * sizeof(struct ftrace_raw_<call>), | 472 | * sizeof(struct ftrace_raw_<call>), |
444 | * irq_flags, pc); | 473 | * irq_flags, pc); |
445 | * if (!event) | 474 | * if (!event) |
@@ -449,7 +478,7 @@ static void ftrace_profile_disable_##call(struct ftrace_event_call *event_call)\ | |||
449 | * <assign>; <-- Here we assign the entries by the __field and | 478 | * <assign>; <-- Here we assign the entries by the __field and |
450 | * __array macros. | 479 | * __array macros. |
451 | * | 480 | * |
452 | * trace_current_buffer_unlock_commit(event, irq_flags, pc); | 481 | * trace_current_buffer_unlock_commit(buffer, event, irq_flags, pc); |
453 | * } | 482 | * } |
454 | * | 483 | * |
455 | * static int ftrace_raw_reg_event_<call>(void) | 484 | * static int ftrace_raw_reg_event_<call>(void) |
@@ -541,6 +570,7 @@ static void ftrace_raw_event_##call(proto) \ | |||
541 | struct ftrace_event_call *event_call = &event_##call; \ | 570 | struct ftrace_event_call *event_call = &event_##call; \ |
542 | struct ring_buffer_event *event; \ | 571 | struct ring_buffer_event *event; \ |
543 | struct ftrace_raw_##call *entry; \ | 572 | struct ftrace_raw_##call *entry; \ |
573 | struct ring_buffer *buffer; \ | ||
544 | unsigned long irq_flags; \ | 574 | unsigned long irq_flags; \ |
545 | int __data_size; \ | 575 | int __data_size; \ |
546 | int pc; \ | 576 | int pc; \ |
@@ -550,7 +580,8 @@ static void ftrace_raw_event_##call(proto) \ | |||
550 | \ | 580 | \ |
551 | __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ | 581 | __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ |
552 | \ | 582 | \ |
553 | event = trace_current_buffer_lock_reserve(event_##call.id, \ | 583 | event = trace_current_buffer_lock_reserve(&buffer, \ |
584 | event_##call.id, \ | ||
554 | sizeof(*entry) + __data_size, \ | 585 | sizeof(*entry) + __data_size, \ |
555 | irq_flags, pc); \ | 586 | irq_flags, pc); \ |
556 | if (!event) \ | 587 | if (!event) \ |
@@ -562,11 +593,12 @@ static void ftrace_raw_event_##call(proto) \ | |||
562 | \ | 593 | \ |
563 | { assign; } \ | 594 | { assign; } \ |
564 | \ | 595 | \ |
565 | if (!filter_current_check_discard(event_call, entry, event)) \ | 596 | if (!filter_current_check_discard(buffer, event_call, entry, event)) \ |
566 | trace_nowake_buffer_unlock_commit(event, irq_flags, pc); \ | 597 | trace_nowake_buffer_unlock_commit(buffer, \ |
598 | event, irq_flags, pc); \ | ||
567 | } \ | 599 | } \ |
568 | \ | 600 | \ |
569 | static int ftrace_raw_reg_event_##call(void) \ | 601 | static int ftrace_raw_reg_event_##call(void *ptr) \ |
570 | { \ | 602 | { \ |
571 | int ret; \ | 603 | int ret; \ |
572 | \ | 604 | \ |
@@ -577,7 +609,7 @@ static int ftrace_raw_reg_event_##call(void) \ | |||
577 | return ret; \ | 609 | return ret; \ |
578 | } \ | 610 | } \ |
579 | \ | 611 | \ |
580 | static void ftrace_raw_unreg_event_##call(void) \ | 612 | static void ftrace_raw_unreg_event_##call(void *ptr) \ |
581 | { \ | 613 | { \ |
582 | unregister_trace_##call(ftrace_raw_event_##call); \ | 614 | unregister_trace_##call(ftrace_raw_event_##call); \ |
583 | } \ | 615 | } \ |
@@ -595,7 +627,6 @@ static int ftrace_raw_init_event_##call(void) \ | |||
595 | return -ENODEV; \ | 627 | return -ENODEV; \ |
596 | event_##call.id = id; \ | 628 | event_##call.id = id; \ |
597 | INIT_LIST_HEAD(&event_##call.fields); \ | 629 | INIT_LIST_HEAD(&event_##call.fields); \ |
598 | init_preds(&event_##call); \ | ||
599 | return 0; \ | 630 | return 0; \ |
600 | } \ | 631 | } \ |
601 | \ | 632 | \ |