X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=liblttng-ust%2Ftracepoint.c;h=ce7dbbb283947f608978d4948c2df62656f1275a;hb=a58c831a07058055a6e14d09d0e5a3f40f47eae3;hp=a594d73ddd7bc6a3c893acd3d645635d23bc6c73;hpb=5517d34d4c242bb2a5233e08e21eec7fa12f3489;p=deliverable%2Flttng-ust.git diff --git a/liblttng-ust/tracepoint.c b/liblttng-ust/tracepoint.c index a594d73d..ce7dbbb2 100644 --- a/liblttng-ust/tracepoint.c +++ b/liblttng-ust/tracepoint.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -44,11 +44,31 @@ #include "error.h" /* Test compiler support for weak symbols with hidden visibility. */ -char __tracepoint_test_symbol[9] __attribute__((weak, visibility("hidden"))); +int __tracepoint_test_symbol1 __attribute__((weak, visibility("hidden"))); +void *__tracepoint_test_symbol2 __attribute__((weak, visibility("hidden"))); +struct { + char a[24]; +} __tracepoint_test_symbol3 __attribute__((weak, visibility("hidden"))); /* Set to 1 to enable tracepoint debug output */ static const int tracepoint_debug; static int initialized; + +/* + * If tracepoint_destructors_state = 1, tracepoint destructors are + * enabled. They are disabled otherwise. + */ +static int tracepoint_destructors_state = 1; + +/* + * Expose the now deprecated symbol __tracepoints__disable_destructors for + * backward compatibility of applications built against old versions of + * lttng-ust. We need to keep __tracepoints__disable_destructors up to date + * within the new destructor disabling API because old applications read this + * symbol directly. + */ +int __tracepoints__disable_destructors __attribute__((weak)); + static void (*new_tracepoint_cb)(struct lttng_ust_tracepoint *); /* @@ -89,6 +109,9 @@ static struct cds_hlist_head tracepoint_table[TRACEPOINT_TABLE_SIZE]; static CDS_LIST_HEAD(old_probes); static int need_update; +static CDS_LIST_HEAD(release_queue); +static int release_queue_need_update; + /* * Note about RCU : * It is used to to delay the free of multiple probes array until a quiescent @@ -100,8 +123,8 @@ struct tracepoint_entry { struct lttng_ust_tracepoint_probe *probes; int refcount; /* Number of times armed. 0 if disarmed. */ int callsite_refcount; /* how many libs use this tracepoint */ - const char *signature; - char name[0]; + char *signature; + char *name; }; struct tp_probes { @@ -125,8 +148,89 @@ struct callsite_entry { struct cds_hlist_node hlist; /* hash table node */ struct cds_list_head node; /* lib list of callsites node */ struct lttng_ust_tracepoint *tp; + bool tp_entry_callsite_ref; /* Has a tp_entry took a ref on this callsite */ }; +static int tracepoint_v1_api_used; +static void (*lttng_ust_liburcu_bp_synchronize_rcu)(void); +static void (*lttng_ust_liburcu_bp_rcu_read_lock)(void); +static void (*lttng_ust_liburcu_bp_rcu_read_unlock)(void); +void (*lttng_ust_liburcu_bp_before_fork)(void); +void (*lttng_ust_liburcu_bp_after_fork_parent)(void); +void (*lttng_ust_liburcu_bp_after_fork_child)(void); + +static bool lttng_ust_tracepoint_v1_used(void) +{ + return uatomic_read(&tracepoint_v1_api_used); +} + +static void lttng_ust_tracepoint_set_v1_used(void) +{ + if (!lttng_ust_tracepoint_v1_used()) { + /* + * Perform dlsym here rather than lazily on first use to + * eliminate nesting of dynamic loader lock (used within + * dlsym) inside the ust lock. + */ + if (!lttng_ust_liburcu_bp_synchronize_rcu) { + lttng_ust_liburcu_bp_synchronize_rcu = URCU_FORCE_CAST(void (*)(void), + dlsym(RTLD_DEFAULT, "synchronize_rcu_bp")); + /* + * Allow legacy applications compiled without + * _LGPL_SOURCE to use v1 API. Those are not + * required to be linked against liburcu-bp, + * so in those situations the liburcu-bp symbols + * are not present in the global symbol table, + * and we do not need to call urcu-bp + * synchronize. + * + * However, nothing prevents a _LGPL_SOURCE + * instrumented library loaded afterwards to + * require liburcu-bp, so we need to check again + * in that situation. + */ + if (!lttng_ust_liburcu_bp_synchronize_rcu) + return; + } + if (!lttng_ust_liburcu_bp_before_fork) { + lttng_ust_liburcu_bp_before_fork = URCU_FORCE_CAST(void (*)(void), + dlsym(RTLD_DEFAULT, "rcu_bp_before_fork")); + if (!lttng_ust_liburcu_bp_before_fork) + abort(); + } + if (!lttng_ust_liburcu_bp_after_fork_parent) { + lttng_ust_liburcu_bp_after_fork_parent = URCU_FORCE_CAST(void (*)(void), + dlsym(RTLD_DEFAULT, "rcu_bp_after_fork_parent")); + if (!lttng_ust_liburcu_bp_after_fork_parent) + abort(); + } + if (!lttng_ust_liburcu_bp_after_fork_child) { + lttng_ust_liburcu_bp_after_fork_child = URCU_FORCE_CAST(void (*)(void), + dlsym(RTLD_DEFAULT, "rcu_bp_after_fork_child")); + if (!lttng_ust_liburcu_bp_after_fork_child) + abort(); + } + if (!lttng_ust_liburcu_bp_rcu_read_lock) { + lttng_ust_liburcu_bp_rcu_read_lock = URCU_FORCE_CAST(void (*)(void), + dlsym(RTLD_DEFAULT, "rcu_read_lock_bp")); + if (!lttng_ust_liburcu_bp_rcu_read_lock) + abort(); + } + if (!lttng_ust_liburcu_bp_rcu_read_unlock) { + lttng_ust_liburcu_bp_rcu_read_unlock = URCU_FORCE_CAST(void (*)(void), + dlsym(RTLD_DEFAULT, "rcu_read_unlock_bp")); + if (!lttng_ust_liburcu_bp_rcu_read_unlock) + abort(); + } + + /* Fixup URCU bp TLS. */ + lttng_ust_liburcu_bp_rcu_read_lock(); + lttng_ust_liburcu_bp_rcu_read_unlock(); + + uatomic_set(&tracepoint_v1_api_used, 1); + } +} + /* coverity[+alloc] */ static void *allocate_probes(int count) { @@ -142,7 +246,7 @@ static void release_probes(void *old) if (old) { struct tp_probes *tp_probes = caa_container_of(old, struct tp_probes, probes[0]); - synchronize_rcu(); + lttng_ust_synchronize_trace(); free(tp_probes); } } @@ -277,6 +381,8 @@ static struct tracepoint_entry *add_tracepoint(const char *name, struct cds_hlist_node *node; struct tracepoint_entry *e; size_t name_len = strlen(name); + size_t sig_len = strlen(signature); + size_t sig_off, name_off; uint32_t hash; if (name_len > LTTNG_UST_SYM_NAME_LEN - 1) { @@ -291,19 +397,29 @@ static struct tracepoint_entry *add_tracepoint(const char *name, return ERR_PTR(-EEXIST); /* Already there */ } } + /* - * Using zmalloc here to allocate a variable length element. Could - * cause some memory fragmentation if overused. + * Using zmalloc here to allocate a variable length elements: name and + * signature. Could cause some memory fragmentation if overused. */ - e = zmalloc(sizeof(struct tracepoint_entry) + name_len + 1); + name_off = sizeof(struct tracepoint_entry); + sig_off = name_off + name_len + 1; + + e = zmalloc(sizeof(struct tracepoint_entry) + name_len + 1 + sig_len + 1); if (!e) return ERR_PTR(-ENOMEM); - memcpy(&e->name[0], name, name_len + 1); + e->name = (char *) e + name_off; + memcpy(e->name, name, name_len + 1); e->name[name_len] = '\0'; + + e->signature = (char *) e + sig_off; + memcpy(e->signature, signature, sig_len + 1); + e->signature[sig_len] = '\0'; + e->probes = NULL; e->refcount = 0; e->callsite_refcount = 0; - e->signature = signature; + cds_hlist_add_head(&e->hlist, head); return e; } @@ -350,7 +466,7 @@ static void set_tracepoint(struct tracepoint_entry **entry, * include/linux/tracepoints.h. A matching cmm_smp_read_barrier_depends() * is used. */ - rcu_assign_pointer(elem->probes, (*entry)->probes); + lttng_ust_rcu_assign_pointer(elem->probes, (*entry)->probes); CMM_STORE_SHARED(elem->state, active); } @@ -363,7 +479,7 @@ static void set_tracepoint(struct tracepoint_entry **entry, static void disable_tracepoint(struct lttng_ust_tracepoint *elem) { CMM_STORE_SHARED(elem->state, 0); - rcu_assign_pointer(elem->probes, NULL); + lttng_ust_rcu_assign_pointer(elem->probes, NULL); } /* @@ -398,6 +514,7 @@ static void add_callsite(struct tracepoint_lib * lib, struct lttng_ust_tracepoin if (!tp_entry) return; tp_entry->callsite_refcount++; + e->tp_entry_callsite_ref = true; } /* @@ -410,7 +527,8 @@ static void remove_callsite(struct callsite_entry *e) tp_entry = get_tracepoint(e->tp->name); if (tp_entry) { - tp_entry->callsite_refcount--; + if (e->tp_entry_callsite_ref) + tp_entry->callsite_refcount--; if (tp_entry->callsite_refcount == 0) disable_tracepoint(e->tp); } @@ -446,10 +564,15 @@ static void tracepoint_sync_callsites(const char *name) if (strncmp(name, tp->name, LTTNG_UST_SYM_NAME_LEN - 1)) continue; if (tp_entry) { + if (!e->tp_entry_callsite_ref) { + tp_entry->callsite_refcount++; + e->tp_entry_callsite_ref = true; + } set_tracepoint(&tp_entry, tp, !!tp_entry->refcount); } else { disable_tracepoint(tp); + e->tp_entry_callsite_ref = false; } } } @@ -538,7 +661,12 @@ tracepoint_add_probe(const char *name, void (*probe)(void), void *data, struct lttng_ust_tracepoint_probe *old; entry = get_tracepoint(name); - if (!entry) { + if (entry) { + if (strcmp(entry->signature, signature) != 0) { + ERR("Tracepoint and probe signature do not match."); + return ERR_PTR(-EINVAL); + } + } else { entry = add_tracepoint(name, signature); if (IS_ERR(entry)) return (struct lttng_ust_tracepoint_probe *)entry; @@ -549,6 +677,16 @@ tracepoint_add_probe(const char *name, void (*probe)(void), void *data, return old; } +static void tracepoint_release_queue_add_old_probes(void *old) +{ + release_queue_need_update = 1; + if (old) { + struct tp_probes *tp_probes = caa_container_of(old, + struct tp_probes, probes[0]); + cds_list_add(&tp_probes->u.list, &release_queue); + } +} + /** * __tracepoint_probe_register - Connect a probe to a tracepoint * @name: tracepoint name @@ -580,6 +718,33 @@ end: return ret; } +/* + * Caller needs to invoke __tracepoint_probe_release_queue() after + * calling __tracepoint_probe_register_queue_release() one or multiple + * times to ensure it does not leak memory. + */ +int __tracepoint_probe_register_queue_release(const char *name, + void (*probe)(void), void *data, const char *signature) +{ + void *old; + int ret = 0; + + DBG("Registering probe to tracepoint %s. Queuing release.", name); + + pthread_mutex_lock(&tracepoint_mutex); + old = tracepoint_add_probe(name, probe, data, signature); + if (IS_ERR(old)) { + ret = PTR_ERR(old); + goto end; + } + + tracepoint_sync_callsites(name); + tracepoint_release_queue_add_old_probes(old); +end: + pthread_mutex_unlock(&tracepoint_mutex); + return ret; +} + static void *tracepoint_remove_probe(const char *name, void (*probe)(void), void *data) { @@ -624,6 +789,57 @@ end: return ret; } +/* + * Caller needs to invoke __tracepoint_probe_release_queue() after + * calling __tracepoint_probe_unregister_queue_release() one or multiple + * times to ensure it does not leak memory. + */ +int __tracepoint_probe_unregister_queue_release(const char *name, + void (*probe)(void), void *data) +{ + void *old; + int ret = 0; + + DBG("Un-registering probe from tracepoint %s. Queuing release.", name); + + pthread_mutex_lock(&tracepoint_mutex); + old = tracepoint_remove_probe(name, probe, data); + if (IS_ERR(old)) { + ret = PTR_ERR(old); + goto end; + } + tracepoint_sync_callsites(name); + tracepoint_release_queue_add_old_probes(old); +end: + pthread_mutex_unlock(&tracepoint_mutex); + return ret; +} + +void __tracepoint_probe_prune_release_queue(void) +{ + CDS_LIST_HEAD(release_probes); + struct tp_probes *pos, *next; + + DBG("Release queue of unregistered tracepoint probes."); + + pthread_mutex_lock(&tracepoint_mutex); + if (!release_queue_need_update) + goto end; + if (!cds_list_empty(&release_queue)) + cds_list_replace_init(&release_queue, &release_probes); + release_queue_need_update = 0; + + /* Wait for grace period between all sync_callsites and free. */ + lttng_ust_synchronize_trace(); + + cds_list_for_each_entry_safe(pos, next, &release_probes, u.list) { + cds_list_del(&pos->u.list); + free(pos); + } +end: + pthread_mutex_unlock(&tracepoint_mutex); +} + static void tracepoint_add_old_probes(void *old) { need_update = 1; @@ -704,9 +920,10 @@ void tracepoint_probe_update_all(void) need_update = 0; tracepoint_update_probes(); + /* Wait for grace period between update_probes and free. */ + lttng_ust_synchronize_trace(); cds_list_for_each_entry_safe(pos, next, &release_probes, u.list) { cds_list_del(&pos->u.list); - synchronize_rcu(); free(pos); } end: @@ -731,8 +948,20 @@ static void new_tracepoints(struct lttng_ust_tracepoint * const *start, } } -int tracepoint_register_lib(struct lttng_ust_tracepoint * const *tracepoints_start, - int tracepoints_count) +/* + * tracepoint_{un,}register_lib is meant to be looked up by instrumented + * applications through dlsym(). If found, those can register their + * tracepoints, else those tracepoints will not be available for + * tracing. The number at the end of those symbols acts as a major + * version for tracepoints. + * + * Older instrumented applications should still work with newer + * liblttng-ust, but it is fine that instrumented applications compiled + * against recent liblttng-ust headers require a recent liblttng-ust + * runtime for those tracepoints to be taken into account. + */ +int tracepoint_register_lib2(struct lttng_ust_tracepoint * const *tracepoints_start, + int tracepoints_count) { struct tracepoint_lib *pl, *iter; @@ -780,7 +1009,15 @@ lib_added: return 0; } -int tracepoint_unregister_lib(struct lttng_ust_tracepoint * const *tracepoints_start) +/* Exposed for backward compatibility with old instrumented applications. */ +int tracepoint_register_lib(struct lttng_ust_tracepoint * const *tracepoints_start, + int tracepoints_count) +{ + lttng_ust_tracepoint_set_v1_used(); + return tracepoint_register_lib2(tracepoints_start, tracepoints_count); +} + +int tracepoint_unregister_lib2(struct lttng_ust_tracepoint * const *tracepoints_start) { struct tracepoint_lib *lib; @@ -806,6 +1043,13 @@ int tracepoint_unregister_lib(struct lttng_ust_tracepoint * const *tracepoints_s return 0; } +/* Exposed for backward compatibility with old instrumented applications. */ +int tracepoint_unregister_lib(struct lttng_ust_tracepoint * const *tracepoints_start) +{ + lttng_ust_tracepoint_set_v1_used(); + return tracepoint_unregister_lib2(tracepoints_start); +} + /* * Report in debug message whether the compiler correctly supports weak * hidden symbols. This test checks that the address associated with two @@ -814,10 +1058,18 @@ int tracepoint_unregister_lib(struct lttng_ust_tracepoint * const *tracepoints_s */ static void check_weak_hidden(void) { - DBG("Your compiler support for weak symbols with hidden visibility is %s", - __tracepoint_test_symbol == lttng_ust_tp_check_weak_hidden() ? - "OK" : - "BROKEN. Please upgrade or fix your compiler to use LTTng-UST tracepoints."); + DBG("Your compiler treats weak symbols with hidden visibility for integer objects as %s between compile units part of the same module.", + &__tracepoint_test_symbol1 == lttng_ust_tp_check_weak_hidden1() ? + "SAME address" : + "DIFFERENT addresses"); + DBG("Your compiler treats weak symbols with hidden visibility for pointer objects as %s between compile units part of the same module.", + &__tracepoint_test_symbol2 == lttng_ust_tp_check_weak_hidden2() ? + "SAME address" : + "DIFFERENT addresses"); + DBG("Your compiler treats weak symbols with hidden visibility for 24-byte structure objects as %s between compile units part of the same module.", + &__tracepoint_test_symbol3 == lttng_ust_tp_check_weak_hidden3() ? + "SAME address" : + "DIFFERENT addresses"); } void init_tracepoint(void) @@ -836,21 +1088,75 @@ void exit_tracepoint(void) /* * Create the wrapper symbols. */ -#undef tp_rcu_read_lock_bp -#undef tp_rcu_read_unlock_bp -#undef tp_rcu_dereference_bp +#undef tp_rcu_read_lock +#undef tp_rcu_read_unlock +#undef tp_rcu_dereference + +void tp_rcu_read_lock(void) +{ + lttng_ust_urcu_read_lock(); +} + +void tp_rcu_read_unlock(void) +{ + lttng_ust_urcu_read_unlock(); +} + +void *tp_rcu_dereference_sym(void *p) +{ + return lttng_ust_rcu_dereference(p); +} + +/* + * Programs that have threads that survive after they exit, and therefore call + * library destructors, should disable the tracepoint destructors by calling + * tp_disable_destructors(). This will leak the tracepoint + * instrumentation library shared object, leaving its teardown to the operating + * system process teardown. + * + * To access and/or modify this value, users need to use a combination of + * dlopen(3) and dlsym(3) to get an handle on the + * tp_disable_destructors and tp_get_destructors_state symbols below. + */ +void tp_disable_destructors(void) +{ + uatomic_set(&tracepoint_destructors_state, 0); +} +/* + * Returns 1 if the destructors are enabled and should be executed. + * Returns 0 if the destructors are disabled. + */ +int tp_get_destructors_state(void) +{ + return uatomic_read(&tracepoint_destructors_state); +} + +void lttng_ust_synchronize_trace(void) +{ + lttng_ust_urcu_synchronize_rcu(); + /* + * For legacy tracepoint instrumentation, also wait for urcu-bp + * grace period. + */ + if (lttng_ust_liburcu_bp_synchronize_rcu) + lttng_ust_liburcu_bp_synchronize_rcu(); +} + +/* + * Create the wrapper symbols for legacy v1 API. + */ void tp_rcu_read_lock_bp(void) { - rcu_read_lock_bp(); + lttng_ust_urcu_read_lock(); } void tp_rcu_read_unlock_bp(void) { - rcu_read_unlock_bp(); + lttng_ust_urcu_read_unlock(); } void *tp_rcu_dereference_sym_bp(void *p) { - return rcu_dereference_bp(p); + return lttng_ust_rcu_dereference(p); }