#include <ust/immediate.h>
//ust// #include <linux/ltt-channels.h>
#include <ust/kernelcompat.h>
-#include <kcompat/list.h>
+#include <urcu/list.h>
#include <ust/processor.h>
+#include <bits/wordsize.h>
+
//ust// struct module;
//ust// struct task_struct;
struct marker;
#define CONFIG_MARKERS
#ifdef CONFIG_MARKERS
-#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 }; \
- \
+#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. */ \
+ * 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_" XSTR(channel) "_" XSTR(name) "_channel_" XSTR(unique) "\n\t" \
".section __markers_strings,\"aw\",@progbits\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" \
+ ".string " "\"" format "\"" "\n\t" \
".previous\n\t" \
+ ".endif\n\t" \
+ ); \
+ asm volatile ( \
".section __markers,\"aw\",@progbits\n\t" \
".align 8\n\t" \
- "__mark_struct_" XSTR(unique) ":\n\t" \
+ "2:\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 */ \
+ ".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(__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 */ \
- "__mark_location_" XSTR(unique) ":\n\t" \
- _ASM_PTR "(1f)\n\t" /* location */ \
- ".previous\n\t" \
- "1:\n\t" \
- ); \
- asm volatile ( \
- "mov ""$__mark_struct_" XSTR(unique) ", %[pmark_struct]\n\t" \
- : [pmark_struct] "=r" (__pmark_##channel##_##name) :: "memory" \
- ); \
- \
+ _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("2b", "%[outptr]") "\n\t" \
+ : [outptr] "=r" (m) ); \
+ \
save_registers(®s)
-#define DEFINE_MARKER(channel, name, format) \
- _DEFINE_MARKER(channel, name, NULL, NULL, format, __COUNTER__)
+#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(channel, name, #tp_name, tp_cb, format, __COUNTER__)
+#define DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format, unique, m) \
+ _DEFINE_MARKER(channel, name, #tp_name, tp_cb, format, unique, m)
/*
* Make sure the alignment of the structure in the __markers section will
* 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( \
- __pmark_##channel##_##name->state))) \
- (*__pmark_##channel##_##name->call) \
- (__pmark_##channel##_##name, \
- call_private, ®s, ## args); \
+ if (unlikely(imv_read(m->state))) \
+ (m->call)(m, call_private, ®s, ## args); \
} else { \
- if (unlikely(_imv_read( \
- __pmark_##channel##_##name->state))) \
- (__pmark_##channel##_##name->call) \
- (__pmark_##channel##_##name, \
- call_private, ®s, ## 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 marker m; \
void __check_tp_type(void) \
{ \
register_trace_##tp_name(tp_cb); \
} \
- DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format);\
+ DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format, unique, m);\
__mark_check_format(format, ## args); \
(*__mark_##channel##_##name.call)(&__mark_##channel##_##name, \
call_private, ®s, ## args); \
#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, \
*
* 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)
projects / ust.git / blobdiff