Ensures we don't end up running in gcc/linker structure alignment problems by
exporting an array of pointers instead of the structures per se.
Same fix as done for tracepoints for the mainline kernel.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
const char *tp_name; /* Optional tracepoint name */
void *tp_cb; /* Optional tracepoint callback */
void *location; /* Address of marker in code */
const char *tp_name; /* Optional tracepoint name */
void *tp_cb; /* Optional tracepoint callback */
void *location; /* Address of marker in code */
-} __attribute__((aligned(128)));/*
- * Aligned on 128 bytes because it is
- * globally visible and gcc happily
- * align these on the structure size.
- */
#define GET_MARKER(channel, name) (__mark_##channel##_##name)
#define GET_MARKER(channel, name) (__mark_##channel##_##name)
asm volatile ( \
/*".section __markers\n\t"*/ \
".section __markers,\"aw\",@progbits\n\t" \
asm volatile ( \
/*".section __markers\n\t"*/ \
".section __markers,\"aw\",@progbits\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 */ \
"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 "0\n\t" /* tp_cb */ \
_ASM_PTR "(1f)\n\t" /* location */ \
".previous\n\t" \
_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\",@progbits\n\t" \
+ ".balign 8\n\t" \
+ _ASM_PTR "(2b)\n\t" \
+ ".previous\n\t" \
+ "1:\n\t" \
ARCH_COPY_ADDR("%[outptr]") \
: [outptr] "=r" (m) ); \
\
ARCH_COPY_ADDR("%[outptr]") \
: [outptr] "=r" (m) ); \
\
__attribute__((section("__markers_strings"))) \
= #channel "\0" #name "\0" format; \
static struct marker GET_MARKER(channel, name) \
__attribute__((section("__markers_strings"))) \
= #channel "\0" #name "\0" format; \
static struct marker GET_MARKER(channel, name) \
- __attribute__((section("__markers"), aligned(128))) = \
+ __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}, \
{ __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, tp_name_str, tp_cb }; \
+ static struct marker * const __mark_ptr_##channel##_##name \
+ __attribute__((used, section("__markers_ptrs"))) = \
+ &GET_MARKER(channel, name);
/*
* Make sure the alignment of the structure in the __markers section will
/*
* Make sure the alignment of the structure in the __markers section will
call_private, ®s, ## args); \
} while (0)
call_private, ®s, ## args); \
} while (0)
-extern void marker_update_probe_range(struct marker *begin,
- struct marker *end);
+extern void marker_update_probe_range(struct marker * const *begin,
+ struct marker * const *end);
/**
* trace_mark - Marker using code patching
/**
* trace_mark - Marker using code patching
struct marker_iter {
//ust// struct module *module;
struct lib *lib;
struct marker_iter {
//ust// struct module *module;
struct lib *lib;
+ 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 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);
extern void marker_update_process(void);
extern int is_marker_enabled(const char *channel, const char *name);
- struct marker *markers_start;
+ struct marker * const *markers_start;
#ifdef CONFIG_UST_GDB_INTEGRATION
struct marker_addr *markers_addr_start;
#endif
#ifdef CONFIG_UST_GDB_INTEGRATION
struct marker_addr *markers_addr_start;
#endif
struct cds_list_head list;
};
struct cds_list_head list;
};
-extern int marker_register_lib(struct marker *markers_start, int markers_count);
-extern int marker_unregister_lib(struct marker *markers_start);
+extern int marker_register_lib(struct marker * const *markers_start, int markers_count);
+extern int marker_unregister_lib(struct marker * const *markers_start);
- extern struct marker __start___markers[] __attribute__((weak, visibility("hidden"))); \
- extern struct marker __stop___markers[] __attribute__((weak, visibility("hidden"))); \
+ extern struct marker * const __start___markers[] __attribute__((weak, visibility("hidden"))); \
+ extern struct marker * const __stop___markers[] __attribute__((weak, visibility("hidden"))); \
\
static void __attribute__((constructor)) __markers__init(void) \
{ \
\
static void __attribute__((constructor)) __markers__init(void) \
{ \
- marker_register_lib(__start___markers, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \
+ marker_register_lib(__start___markers, \
+ (((long)__stop___markers) - ((long)__start___markers)) \
+ / sizeof(*__start___markers)); \
} \
\
static void __attribute__((destructor)) __markers__destroy(void) \
} \
\
static void __attribute__((destructor)) __markers__destroy(void) \
__thread long ust_reg_stack[500];
volatile __thread long *ust_reg_stack_ptr = (long *) 0;
__thread long ust_reg_stack[500];
volatile __thread long *ust_reg_stack_ptr = (long *) 0;
-extern struct marker __start___markers[] __attribute__((visibility("hidden")));
-extern struct marker __stop___markers[] __attribute__((visibility("hidden")));
+extern struct marker * const __start___markers[] __attribute__((visibility("hidden")));
+extern struct marker * const __stop___markers[] __attribute__((visibility("hidden")));
/* Set to 1 to enable marker debug output */
static const int marker_debug;
/* Set to 1 to enable marker debug output */
static const int marker_debug;
*
* Updates the probe callback corresponding to a range of markers.
*/
*
* Updates the probe callback corresponding to a range of markers.
*/
-void marker_update_probe_range(struct marker *begin,
- struct marker *end)
+void marker_update_probe_range(struct marker * const *begin,
+ struct marker * const *end)
+ struct marker * const *iter;
struct marker_entry *mark_entry;
pthread_mutex_lock(&markers_mutex);
for (iter = begin; iter < end; iter++) {
struct marker_entry *mark_entry;
pthread_mutex_lock(&markers_mutex);
for (iter = begin; iter < end; iter++) {
- mark_entry = get_marker(iter->channel, iter->name);
+ mark_entry = get_marker((*iter)->channel, (*iter)->name);
- set_marker(mark_entry, iter, !!mark_entry->refcount);
+ set_marker(mark_entry, *iter, !!mark_entry->refcount);
/*
* ignore error, continue
*/
/*
* ignore error, continue
*/
"channel %s name %s event_id %hu "
"int #1u%zu long #1u%zu pointer #1u%zu "
"size_t #1u%zu alignment #1u%u",
"channel %s name %s event_id %hu "
"int #1u%zu long #1u%zu pointer #1u%zu "
"size_t #1u%zu alignment #1u%u",
- iter->channel, iter->name, mark_entry->event_id,
+ (*iter)->channel, (*iter)->name, mark_entry->event_id,
sizeof(int), sizeof(long), sizeof(void *),
sizeof(size_t), ltt_get_alignment());
} else {
sizeof(int), sizeof(long), sizeof(void *),
sizeof(size_t), ltt_get_alignment());
} else {
}
}
pthread_mutex_unlock(&markers_mutex);
}
}
pthread_mutex_unlock(&markers_mutex);
* Returns whether a next marker has been found (1) or not (0).
* Will return the first marker in the range if the input marker is NULL.
*/
* Returns whether a next marker has been found (1) or not (0).
* Will return the first marker in the range if the input marker is NULL.
*/
-int marker_get_iter_range(struct marker **marker, struct marker *begin,
- struct marker *end)
+int marker_get_iter_range(struct marker * const **marker,
+ struct marker * const *begin,
+ struct marker * const *end)
{
if (!*marker && begin != end) {
*marker = begin;
{
if (!*marker && begin != end) {
*marker = begin;
-static void new_markers(struct marker *start, struct marker *end)
+static void new_markers(struct marker * const *start, struct marker * const *end)
- if(new_marker_cb) {
- struct marker *m;
+ if (new_marker_cb) {
+ struct marker * const *m;
for(m=start; m < end; m++) {
for(m=start; m < end; m++) {
-int marker_register_lib(struct marker *markers_start, int markers_count)
+int marker_register_lib(struct marker * const *markers_start, int markers_count)
-int marker_unregister_lib(struct marker *markers_start)
+int marker_unregister_lib(struct marker * const *markers_start)
void __attribute__((constructor)) init_markers(void)
{
if(!initialized) {
void __attribute__((constructor)) init_markers(void)
{
if(!initialized) {
- marker_register_lib(__start___markers, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker));
+ marker_register_lib(__start___markers,
+ (((long)__stop___markers) - ((long)__start___markers))
+ / sizeof(*__start___markers));
while (iter.marker) {
fprintf(fp, "marker: %s/%s %d \"%s\" %p\n",
while (iter.marker) {
fprintf(fp, "marker: %s/%s %d \"%s\" %p\n",
- iter.marker->channel,
- iter.marker->name,
- (int)imv_read(iter.marker->state),
- iter.marker->format,
- iter.marker->location);
+ (*iter.marker)->channel,
+ (*iter.marker)->name,
+ (int)imv_read((*iter.marker)->state),
+ (*iter.marker)->format,
+ (*iter.marker)->location);
marker_iter_next(&iter);
}
unlock_markers();
marker_iter_next(&iter);
}
unlock_markers();
DBG("now iterating on markers already registered");
while (iter.marker) {
DBG("now iterating on markers already registered");
while (iter.marker) {
- DBG("now iterating on marker %s", iter.marker->name);
- auto_probe_connect(iter.marker);
+ DBG("now iterating on marker %s", (*iter.marker)->name);
+ auto_probe_connect(*iter.marker);
marker_iter_next(&iter);
}
}
marker_iter_next(&iter);
}
}