X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=287f20f5feebe1a466e59cde943b45c723d1581f;hb=7b2c500757f1e2f25c6d8872110d45a343e7bbbe;hp=2b5a0c38ba701dfe6f1874eecee097b6bbd47e5a;hpb=fbca6b624335eef18c8d86194aeb101a720168f4;p=ust.git diff --git a/include/ust/marker.h b/include/ust/marker.h index 2b5a0c3..287f20f 100644 --- a/include/ust/marker.h +++ b/include/ust/marker.h @@ -21,18 +21,19 @@ * 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 -#include +#include +#include +#include +#include +#include + +#include -//ust// struct module; -//ust// struct task_struct; struct marker; /** @@ -49,7 +50,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 { @@ -68,21 +69,83 @@ 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) \ +#define GET_MARKER(channel, name) (__mark_##channel##_##name) + +#define _DEFINE_MARKER(channel, name, tp_name_str, tp_cb, format, unique, m) \ + struct registers regs; \ + \ + /* 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 ( \ + /* We only define these symbols if they have not yet been defined. Indeed, \ + * if two markers with the same channel/name are on the same line, they \ + * will try to create the same symbols, resulting in a conflict. This \ + * is not unusual as it can be the result of function inlining. \ + */ \ + ".ifndef __mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) "\n\t" \ + /*".section __markers_strings\n\t"*/ \ + ".section __markers_strings,\"aw\",@progbits\n\t" \ + "__mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) ":\n\t" \ + ".string \"" __stringify(channel) "\"\n\t" \ + "__mstrtab_" __stringify(channel) "_" __stringify(name) "_name_" __stringify(unique) ":\n\t" \ + ".string \"" __stringify(name) "\"\n\t" \ + "__mstrtab_" __stringify(channel) "_" __stringify(name) "_format_" __stringify(unique) ":\n\t" \ + ".string " "\"" format "\"" "\n\t" \ + ".previous\n\t" \ + ".endif\n\t" \ + ); \ + asm volatile ( \ + /*".section __markers\n\t"*/ \ + ".section __markers,\"aw\",@progbits\n\t" \ + ".balign 8\n\t" \ + "2:\n\t" \ + _ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) ")\n\t" /* channel string */ \ + _ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_name_" __stringify(unique) ")\n\t" /* name string */ \ + _ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_format_" __stringify(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 */ \ + ".balign " __stringify(__WORDSIZE) " / 8\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 */ \ + _ASM_PTR "(1f)\n\t" /* location */ \ + ".previous\n\t" \ + "1:\n\t" \ + ARCH_COPY_ADDR("%[outptr]") \ + : [outptr] "=r" (m) ); \ + \ + save_registers(®s) + + +#define DEFINE_MARKER(channel, name, format, unique, m) \ + _DEFINE_MARKER(channel, name, NULL, NULL, format, unique, m) + +#define DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format) \ + _DEFINE_MARKER_TP(channel, name, #tp_name, tp_cb, format) + +#define _DEFINE_MARKER_TP(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 \ + static struct marker GET_MARKER(channel, name) \ __attribute__((section("__markers"), aligned(8))) = \ { __mstrtab_##channel##_##name, \ &__mstrtab_##channel##_##name[sizeof(#channel)], \ @@ -92,12 +155,6 @@ struct marker { { __mark_empty_function, NULL}, \ NULL, tp_name_str, tp_cb } -#define DEFINE_MARKER(channel, name, format) \ - _DEFINE_MARKER(channel, name, NULL, NULL, format) - -#define DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format) \ - _DEFINE_MARKER(channel, name, #tp_name, tp_cb, format) - /* * Make sure the alignment of the structure in the __markers section will * not add unwanted padding between the beginning of the section and the @@ -107,45 +164,45 @@ struct marker { * If generic is true, a variable read is used. * If generic is false, immediate values are used. */ + #define __trace_mark(generic, channel, name, call_private, format, args...) \ + __trace_mark_counter(generic, channel, name, __LINE__, call_private, format, ## args) + +#define __trace_mark_counter(generic, channel, name, unique, call_private, format, args...) \ do { \ - DEFINE_MARKER(channel, name, format); \ + struct marker *m; \ + DEFINE_MARKER(channel, name, format, unique, m); \ __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); \ + if (unlikely(imv_read(m->state))) \ + (m->call)(m, call_private, ®s, ## args); \ } else { \ - if (unlikely(_imv_read( \ - __mark_##channel##_##name.state))) \ - (*__mark_##channel##_##name.call) \ - (&__mark_##channel##_##name, \ - call_private, ## args); \ + if (unlikely(_imv_read(m->state))) \ + (m->call)(m, call_private, ®s, ## args); \ } \ } while (0) -#define __trace_mark_tp(channel, name, call_private, tp_name, tp_cb, \ - format, args...) \ +#define __trace_mark_tp(channel, name, call_private, tp_name, tp_cb, format, args...) \ + __trace_mark_tp_counter(channel, name, __LINE__, call_private, tp_name, tp_cb, format, ## args) + +#define __trace_mark_tp_counter(channel, name, unique, call_private, tp_name, tp_cb, format, args...) \ do { \ + struct registers regs; \ void __check_tp_type(void) \ { \ - register_trace_##tp_name(tp_cb); \ + register_trace_##tp_name(tp_cb, call_private); \ } \ 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); \ + (*GET_MARKER(channel, name).call)(&GET_MARKER(channel, name), \ + call_private, ®s, ## args); \ } while (0) extern void marker_update_probe_range(struct marker *begin, struct marker *end); -#define GET_MARKER(channel, name) (__mark_##channel##_##name) - #else /* !CONFIG_MARKERS */ -#define DEFINE_MARKER(channel, name, tp_name, tp_cb, format) +#define DEFINE_MARKER(channel, name, tp_name, tp_cb, format, m) #define __trace_mark(generic, channel, name, call_private, format, args...) \ __mark_check_format(format, ## args) #define __trace_mark_tp(channel, name, call_private, tp_name, tp_cb, \ @@ -153,7 +210,7 @@ extern void marker_update_probe_range(struct marker *begin, do { \ void __check_tp_type(void) \ { \ - register_trace_##tp_name(tp_cb); \ + register_trace_##tp_name(tp_cb, call_private); \ } \ __mark_check_format(format, ## args); \ } while (0) @@ -185,8 +242,7 @@ static inline void marker_update_probe_range(struct marker *begin, * * Places a marker using a standard memory read (_imv_read()) to be * enabled. Should be used for markers in code paths where instruction - * modification based enabling is not welcome. (__init and __exit functions, - * lockdep, some traps, printk). + * modification based enabling is not welcome. */ #define _trace_mark(channel, name, format, args...) \ __trace_mark(1, channel, name, NULL, format, ## args) @@ -230,7 +286,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. @@ -286,26 +342,38 @@ 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, - int markers_count); +extern int marker_register_lib(struct marker *markers_start, int markers_count); +extern int marker_unregister_lib(struct marker *markers_start); #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) \ -{ \ - 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"))); \ + \ + static void __attribute__((constructor)) __markers__init(void) \ + { \ + marker_register_lib(__start___markers, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \ + } \ + \ + static void __attribute__((destructor)) __markers__destroy(void) \ + { \ + marker_unregister_lib(__start___markers); \ + } extern void marker_set_new_marker_cb(void (*cb)(struct marker *)); extern void init_markers(void); -#endif +#endif /* _UST_MARKER_H */