X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=77605009ab3b299403102e5e3b9be140b5953ef0;hb=443addf602cf18828df3ef75cc82374f2a4f874c;hp=cb2c46d974a1b0f16e69d87231b43591e39a7c2b;hpb=93d0f2eaff675059588e958e3de74a1bb7dd4028;p=ust.git diff --git a/include/ust/marker.h b/include/ust/marker.h index cb2c46d..7760500 100644 --- a/include/ust/marker.h +++ b/include/ust/marker.h @@ -21,21 +21,25 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _LINUX_MARKER_H -#define _LINUX_MARKER_H +#ifndef _UST_MARKER_H +#define _UST_MARKER_H #include //ust// #include #include //ust// #include -#include "kernelcompat.h" +#include #include -#include "usterr.h" +#include //ust// struct module; //ust// struct task_struct; struct marker; +/* To stringify the expansion of a define */ +#define XSTR(d) STR(d) +#define STR(s) #s + /** * marker_probe_func - Type of a marker probe function * @mdata: marker data @@ -50,7 +54,7 @@ struct marker; * format string to recover the variable argument list. */ typedef void marker_probe_func(const struct marker *mdata, - void *probe_private, void *call_private, + void *probe_private, struct registers *regs, void *call_private, const char *fmt, va_list *args); struct marker_probe_closure { @@ -69,35 +73,80 @@ struct marker { /* Probe wrapper */ u16 channel_id; /* Numeric channel identifier, dynamic */ u16 event_id; /* Numeric event identifier, dynamic */ - void (*call)(const struct marker *mdata, void *call_private, ...); + void (*call)(const struct marker *mdata, void *call_private, struct registers *regs, ...); struct marker_probe_closure single; struct marker_probe_closure *multi; const char *tp_name; /* Optional tracepoint name */ void *tp_cb; /* Optional tracepoint callback */ + void *location; /* Address of marker in code */ } __attribute__((aligned(8))); #define CONFIG_MARKERS #ifdef CONFIG_MARKERS -#define _DEFINE_MARKER(channel, name, tp_name_str, tp_cb, format) \ - static const char __mstrtab_##channel##_##name[] \ - __attribute__((section("__markers_strings"))) \ - = #channel "\0" #name "\0" format; \ - static struct marker __mark_##channel##_##name \ - __attribute__((section("__markers"), aligned(8))) = \ - { __mstrtab_##channel##_##name, \ - &__mstrtab_##channel##_##name[sizeof(#channel)], \ - &__mstrtab_##channel##_##name[sizeof(#channel) + \ - sizeof(#name)], \ - 0, 0, 0, 0, marker_probe_cb, \ - { __mark_empty_function, NULL}, \ - NULL, tp_name_str, tp_cb } +#define _DEFINE_MARKER(channel, name, tp_name_str, tp_cb, format, unique) \ + static const char __old_mstrtab_##channel##_##name[] \ + __attribute__((section("__old_markers_strings"))) \ + = #channel "\0" #name "\0" format; \ + struct registers regs; \ + static struct marker *__pmark_##channel##_##name; \ + static struct marker __old_mark_##channel##_##name \ + __attribute__((section("__old_markers"), aligned(8))) = \ + { __old_mstrtab_##channel##_##name, \ + &__old_mstrtab_##channel##_##name[sizeof(#channel)], \ + &__old_mstrtab_##channel##_##name[sizeof(#channel) + \ + sizeof(#name)], \ + 0, 0, 0, 0, marker_probe_cb, \ + { __mark_empty_function, NULL}, \ + NULL, tp_name_str, tp_cb, NULL }; \ + \ + /* This next asm has to be a basic inline asm (no input/output/clobber), \ + because it must not require %-sign escaping, as we most certainly \ + have some %-signs in the format string. */ \ + asm volatile ( \ + ".section __markers_strings,\"aw\",@progbits\n\t" \ + "__mstrtab_" XSTR(channel) "_" XSTR(name) "_" XSTR(unique) ":\n\t" \ + "__mstrtab_" XSTR(channel) "_" XSTR(name) "_channel_" XSTR(unique) ":\n\t" \ + ".string \"" XSTR(channel) "\"\n\t" \ + "__mstrtab_" XSTR(channel) "_" XSTR(name) "_name_" XSTR(unique) ":\n\t" \ + ".string \"" XSTR(name) "\"\n\t" \ + "__mstrtab_" XSTR(channel) "_" XSTR(name) "_format_" XSTR(unique) ":\n\t" \ + ".string " XSTR(format) "\n\t" \ + ".previous\n\t" \ + ".section __markers,\"aw\",@progbits\n\t" \ + ".align 8\n\t" \ + _ASM_PTR "__mstrtab_" XSTR(channel) "_" XSTR(name) "_channel_" XSTR(unique) "\n\t" /* channel string */ \ + _ASM_PTR "__mstrtab_" XSTR(channel) "_" XSTR(name) "_name_" XSTR(unique) "\n\t" /* name string */ \ + _ASM_PTR "__mstrtab_" XSTR(channel) "_" XSTR(name) "_format_" XSTR(unique) "\n\t" /* format string */ \ + ".byte 0\n\t" /* state imv */ \ + ".byte 0\n\t" /* ptype */ \ + ".word 0\n\t" /* channel_id */ \ + ".word 0\n\t" /* event_id */ \ + ".align " XSTR(__SIZEOF_POINTER__) "\n\t" /* alignment */ \ + _ASM_PTR "marker_probe_cb\n\t" /* call */ \ + _ASM_PTR "__mark_empty_function\n\t" /* marker_probe_closure single.field1 */ \ + _ASM_PTR "0\n\t" /* marker_probe_closure single.field2 */ \ + _ASM_PTR "0\n\t" /* marker_probe_closure *multi */ \ + _ASM_PTR "0\n\t" /* tp_name */ \ + _ASM_PTR "0\n\t" /* tp_cb */ \ + "__mark_location_" XSTR(unique) ":\n\t" \ + _ASM_PTR "(1f)\n\t" /* location */ \ + ".previous\n\t" \ + "1:\n\t" \ + ); \ + asm volatile ( \ + "mov ""__mstrtab_" XSTR(channel) "_" XSTR(name) "_" XSTR(unique) ", %[pmark_struct]\n\t" \ + : [pmark_struct] "=r" (__pmark_##channel##_##name) \ + ); \ + \ + save_registers(®s) + #define DEFINE_MARKER(channel, name, format) \ - _DEFINE_MARKER(channel, name, NULL, NULL, format) + _DEFINE_MARKER(channel, name, NULL, NULL, format, __COUNTER__) #define DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format) \ - _DEFINE_MARKER(channel, name, #tp_name, tp_cb, format) + _DEFINE_MARKER(channel, name, #tp_name, tp_cb, format, __COUNTER__) /* * Make sure the alignment of the structure in the __markers section will @@ -114,16 +163,16 @@ struct marker { __mark_check_format(format, ## args); \ if (!generic) { \ if (unlikely(imv_read( \ - __mark_##channel##_##name.state))) \ - (*__mark_##channel##_##name.call) \ - (&__mark_##channel##_##name, \ - call_private, ## args); \ + __pmark_##channel##_##name->state))) \ + (*__pmark_##channel##_##name->call) \ + (__pmark_##channel##_##name, \ + call_private, ®s, ## args); \ } else { \ if (unlikely(_imv_read( \ - __mark_##channel##_##name.state))) \ - (*__mark_##channel##_##name.call) \ - (&__mark_##channel##_##name, \ - call_private, ## args); \ + __pmark_##channel##_##name->state))) \ + (__pmark_##channel##_##name->call) \ + (__pmark_##channel##_##name, \ + call_private, ®s, ## args); \ } \ } while (0) @@ -137,7 +186,7 @@ struct marker { DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format);\ __mark_check_format(format, ## args); \ (*__mark_##channel##_##name.call)(&__mark_##channel##_##name, \ - call_private, ## args); \ + call_private, ®s, ## args); \ } while (0) extern void marker_update_probe_range(struct marker *begin, @@ -231,7 +280,7 @@ static inline void __printf(1, 2) ___mark_check_format(const char *fmt, ...) extern marker_probe_func __mark_empty_function; extern void marker_probe_cb(const struct marker *mdata, - void *call_private, ...); + void *call_private, struct registers *regs, ...); /* * Connect a probe to a marker. @@ -287,27 +336,54 @@ extern int is_marker_enabled(const char *channel, const char *name); //ust// } //ust// #endif +struct marker_addr { + struct marker *marker; + void *addr; +}; struct lib { struct marker *markers_start; +#ifdef CONFIG_UST_GDB_INTEGRATION + struct marker_addr *markers_addr_start; +#endif int markers_count; struct list_head list; }; extern int marker_register_lib(struct marker *markers_start, + struct marker_addr *marker_addr_start, int markers_count); +#ifdef CONFIG_UST_GDB_INTEGRATION + #define MARKER_LIB \ -extern struct marker __start___markers[] __attribute__((visibility("hidden"))); \ -extern struct marker __stop___markers[] __attribute__((visibility("hidden"))); \ - \ -static void __attribute__((constructor)) __markers__init(void) \ -{ \ - DBG("next registration in "__FILE__"\n");\ - marker_register_lib(__start___markers, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker));\ -} + extern struct marker __start___markers[] __attribute__((weak, visibility("hidden"))); \ + extern struct marker __stop___markers[] __attribute__((weak, visibility("hidden"))); \ + extern struct marker_addr __start___marker_addr[] __attribute__((weak, visibility("hidden"))); \ + extern struct marker_addr __stop___marker_addr[] __attribute__((weak, visibility("hidden"))); \ + \ + static void __attribute__((constructor)) __markers__init(void) \ + { \ + marker_register_lib(__start___markers, /*__start___marker_addr*/ NULL, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \ + } extern void marker_set_new_marker_cb(void (*cb)(struct marker *)); extern void init_markers(void); -#endif +#else /* CONFIG_UST_GDB_INTEGRATION */ + +#define MARKER_LIB \ + extern struct marker __start___markers[] __attribute__((weak, visibility("hidden"))); \ + extern struct marker __stop___markers[] __attribute__((weak, visibility("hidden"))); \ + \ + static void __attribute__((constructor)) __markers__init(void) \ + { \ + marker_register_lib(__start___markers, NULL, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \ + } + +extern void marker_set_new_marker_cb(void (*cb)(struct marker *)); +extern void init_markers(void); + +#endif /* CONFIG_UST_GDB_INTEGRATION */ + +#endif /* _UST_MARKER_H */