X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=da738d1f3254f67b566df5c54d1800ef161216f1;hb=37ee34e4d9b9363c758aa43255d71661900e89b0;hp=0c32586a58b6721708208fda7f4d469866168c5e;hpb=2782fc4bdcc62e3448c59f30dbb07d88d901a597;p=ust.git diff --git a/include/ust/marker.h b/include/ust/marker.h index 0c32586..da738d1 100644 --- a/include/ust/marker.h +++ b/include/ust/marker.h @@ -21,19 +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; /** @@ -64,7 +64,7 @@ struct marker { const char *format; /* Marker format string, describing the * variable argument list. */ - DEFINE_IMV(char, state);/* Immediate value state. */ + DEFINE_IMV(char, state);/* Immediate value state. */ char ptype; /* probe type : 0 : single, 1 : multi */ /* Probe wrapper */ u16 channel_id; /* Numeric channel identifier, dynamic */ @@ -75,39 +75,87 @@ struct marker { const char *tp_name; /* Optional tracepoint name */ void *tp_cb; /* Optional tracepoint callback */ void *location; /* Address of marker in code */ -} __attribute__((aligned(8))); +}; + +#define GET_MARKER(name) (__mark_ust_##name) + +#define _DEFINE_MARKER(channel, name, tp_name_str, tp_cb, format, unique, m) \ + struct registers __marker_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\"\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\"\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 */ \ + ".hword 0\n\t" /* channel_id */ \ + ".hword 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" \ + /*".section __markers_ptrs\n\t"*/ \ + ".section __markers_ptrs,\"a\"\n\t" \ + _ASM_PTR "(2b)\n\t" \ + ".previous\n\t" \ + "1:\n\t" \ + ARCH_COPY_ADDR("%[outptr]") \ + : [outptr] "=r" (m) ); \ + \ + save_registers(&__marker_regs) + + +#define DEFINE_MARKER(name, format, unique, m) \ + _DEFINE_MARKER(ust, name, NULL, NULL, format, unique, m) -#define CONFIG_MARKERS -#ifdef CONFIG_MARKERS +#define DEFINE_MARKER_TP(name, tp_name, tp_cb, format) \ + _DEFINE_MARKER_TP(ust, name, #tp_name, tp_cb, format) -#define _DEFINE_MARKER(channel, name, tp_name_str, 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; \ - struct registers regs; \ static struct marker __mark_##channel##_##name \ - __attribute__((section("__markers"), aligned(8))) = \ + __attribute__((section("__markers"))) = \ { __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, NULL }; \ - asm (".section __marker_addr,\"aw\",@progbits\n\t" \ - _ASM_PTR "%c[marker_struct], (1f)\n\t" \ - ".previous\n\t" \ - "1:\n\t" \ - :: [marker_struct] "i" (&__mark_##channel##_##name));\ - save_registers(®s) - - - -#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) + &__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 }; \ + static struct marker * const __mark_ptr_##channel##_##name \ + __attribute__((used, section("__markers_ptrs"))) = \ + &__mark_##channel##_##name; /* * Make sure the alignment of the structure in the __markers section will @@ -118,65 +166,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 *__marker_counter_ptr; \ + _DEFINE_MARKER(channel, name, NULL, NULL, format, unique, __marker_counter_ptr); \ __mark_check_format(format, ## args); \ if (!generic) { \ - if (unlikely(imv_read( \ - __mark_##channel##_##name.state))) \ - (*__mark_##channel##_##name.call) \ - (&__mark_##channel##_##name, \ - call_private, ®s, ## args); \ + if (unlikely(imv_read(__marker_counter_ptr->state))) \ + (__marker_counter_ptr->call)(__marker_counter_ptr, call_private, &__marker_regs, ## args); \ } else { \ - if (unlikely(_imv_read( \ - __mark_##channel##_##name.state))) \ - (*__mark_##channel##_##name.call) \ - (&__mark_##channel##_##name, \ - call_private, ®s, ## args); \ - } \ - } while (0) - -#define __trace_mark_tp(channel, name, call_private, tp_name, tp_cb, \ - format, args...) \ - do { \ - void __check_tp_type(void) \ - { \ - register_trace_##tp_name(tp_cb); \ + if (unlikely(_imv_read(__marker_counter_ptr->state))) \ + (__marker_counter_ptr->call)(__marker_counter_ptr, call_private, &__marker_regs, ## args); \ } \ - DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format);\ - __mark_check_format(format, ## args); \ - (*__mark_##channel##_##name.call)(&__mark_##channel##_##name, \ - call_private, ®s, ## args); \ } while (0) -extern void marker_update_probe_range(struct marker *begin, - struct marker *end); +#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 GET_MARKER(channel, name) (__mark_##channel##_##name) - -#else /* !CONFIG_MARKERS */ -#define DEFINE_MARKER(channel, name, tp_name, tp_cb, format) -#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, \ - format, args...) \ +#define __trace_mark_tp_counter(channel, name, unique, call_private, tp_name, tp_cb, format, args...) \ do { \ + struct registers __marker_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, &__marker_regs, ## args); \ } while (0) -static inline void marker_update_probe_range(struct marker *begin, - struct marker *end) -{ } -#define GET_MARKER(channel, name) -#endif /* CONFIG_MARKERS */ + +extern void marker_update_probe_range(struct marker * const *begin, + struct marker * const *end); /** * trace_mark - Marker using code patching - * @channel: marker channel (where to send the data), not quoted. * @name: marker name, not quoted. * @format: format string * @args...: variable argument list @@ -184,27 +212,24 @@ static inline void marker_update_probe_range(struct marker *begin, * Places a marker using optimized code patching technique (imv_read()) * to be enabled when immediate values are present. */ -#define trace_mark(channel, name, format, args...) \ - __trace_mark(0, channel, name, NULL, format, ## args) +#define trace_mark(name, format, args...) \ + __trace_mark(0, ust, name, NULL, format, ## args) /** * _trace_mark - Marker using variable read - * @channel: marker channel (where to send the data), not quoted. * @name: marker name, not quoted. * @format: format string * @args...: variable argument list * * 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) +#define _trace_mark(name, format, args...) \ + __trace_mark(1, ust, name, NULL, format, ## args) /** * trace_mark_tp - Marker in a tracepoint callback - * @channel: marker channel (where to send the data), not quoted. * @name: marker name, not quoted. * @tp_name: tracepoint name, not quoted. * @tp_cb: tracepoint callback. Should have an associated global symbol so it @@ -214,8 +239,8 @@ static inline void marker_update_probe_range(struct marker *begin, * * Places a marker in a tracepoint callback. */ -#define trace_mark_tp(channel, name, tp_name, tp_cb, format, args...) \ - __trace_mark_tp(channel, name, NULL, tp_name, tp_cb, format, ## args) +#define trace_mark_tp(name, tp_name, tp_cb, format, args...) \ + __trace_mark_tp(ust, name, NULL, tp_name, tp_cb, format, ## args) /** * MARK_NOARGS - Format string for a marker with no argument. @@ -276,15 +301,15 @@ extern void *marker_get_private_data(const char *channel, const char *name, struct marker_iter { //ust// struct module *module; struct lib *lib; - struct marker *marker; + struct marker * const *marker; }; extern void marker_iter_start(struct marker_iter *iter); extern void marker_iter_next(struct marker_iter *iter); extern void marker_iter_stop(struct marker_iter *iter); extern void marker_iter_reset(struct marker_iter *iter); -extern int marker_get_iter_range(struct marker **marker, struct marker *begin, - struct marker *end); +extern int marker_get_iter_range(struct marker * const **marker, struct marker * const *begin, + struct marker * const *end); extern void marker_update_process(void); extern int is_marker_enabled(const char *channel, const char *name); @@ -303,26 +328,36 @@ struct marker_addr { }; struct lib { - struct marker *markers_start; + struct marker * const *markers_start; +#ifdef CONFIG_UST_GDB_INTEGRATION struct marker_addr *markers_addr_start; +#endif int markers_count; - struct list_head list; + struct cds_list_head list; }; -extern int marker_register_lib(struct marker *markers_start, struct marker_addr *marker_addr_start, int markers_count); - -#define MARKER_LIB \ -extern struct marker __start___markers[] __attribute__((visibility("hidden"))); \ -extern struct marker __stop___markers[] __attribute__((visibility("hidden"))); \ -extern struct marker_addr __start___marker_addr[] __attribute__((visibility("hidden"))); \ -extern struct marker_addr __stop___marker_addr[] __attribute__((visibility("hidden"))); \ - \ -static void __attribute__((constructor)) __markers__init(void) \ -{ \ - marker_register_lib(__start___markers, __start___marker_addr, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \ -} +extern int marker_register_lib(struct marker * const *markers_start, int markers_count); +extern int marker_unregister_lib(struct marker * const *markers_start); + +#define MARKER_LIB \ + extern struct marker * const __start___markers_ptrs[] __attribute__((weak, visibility("hidden"))); \ + extern struct marker * const __stop___markers_ptrs[] __attribute__((weak, visibility("hidden"))); \ + static struct marker * const __mark_ptr_dummy \ + __attribute__((used, section("__markers_ptrs"))) = NULL;\ + \ + static void __attribute__((constructor)) __markers__init(void) \ + { \ + marker_register_lib(__start___markers_ptrs, \ + __stop___markers_ptrs \ + - __start___markers_ptrs); \ + } \ + \ + static void __attribute__((destructor)) __markers__destroy(void)\ + { \ + marker_unregister_lib(__start___markers_ptrs); \ + } extern void marker_set_new_marker_cb(void (*cb)(struct marker *)); extern void init_markers(void); -#endif +#endif /* _UST_MARKER_H */