X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-tracepoint%2Ftracepoint.c;h=12bc561c3342693cbdafbefac0a87612b5852981;hb=6f78600e9600f413ebdf532e154d8946725d83fd;hp=e166372b4612df63cd7554959dd0416e8ea75b76;hpb=096c06e5c6f0a44f261b53c473c223ba88b686fd;p=lttng-ust.git diff --git a/src/lib/lttng-ust-tracepoint/tracepoint.c b/src/lib/lttng-ust-tracepoint/tracepoint.c index e166372b..12bc561c 100644 --- a/src/lib/lttng-ust-tracepoint/tracepoint.c +++ b/src/lib/lttng-ust-tracepoint/tracepoint.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -74,8 +75,8 @@ static CDS_LIST_HEAD(libs); * The tracepoint mutex protects the library tracepoints, the hash table, and * the library list. * All calls to the tracepoint API must be protected by the tracepoint mutex, - * excepts calls to lttng_ust_tracepoint_register_lib and - * lttng_ust_tracepoint_unregister_lib, which take the tracepoint mutex themselves. + * excepts calls to lttng_ust_tracepoint_module_register and + * lttng_ust_tracepoint_module_unregister, which take the tracepoint mutex themselves. */ /* @@ -607,8 +608,41 @@ static void tracepoint_release_queue_add_old_probes(void *old) } } +/* + * Use a symbol of the previous ABI to detect if liblttng-ust-tracepoint.so.0 + * is loaded in the current process. + */ +#define LTTNG_UST_TRACEPOINT_SONAME_0_SYM "tracepoint_unregister_lib" + +static +void lttng_ust_tracepoint_check_soname_0(void) +{ + if (!dlsym(RTLD_DEFAULT, LTTNG_UST_TRACEPOINT_SONAME_0_SYM)) + return; + + CRIT("Incompatible library ABIs detected within the same process. " + "The process is likely linked against different major soname of LTTng-UST which is unsupported. " + "The detection was triggered by lookup of ABI 0 symbol \"%s\" in the Global Symbol Table\n", + LTTNG_UST_TRACEPOINT_SONAME_0_SYM); +} + +/* + * Expose a canary symbol of the previous ABI to ensure we catch uses of a + * liblttng-ust-tracepoint.so.0 dlopen'd after .so.1 has been loaded. Use a + * different symbol than the detection code to ensure we don't detect ourself. + */ +int tracepoint_register_lib(void *arg0 __attribute__((unused)), int arg1 __attribute__((unused))); +int tracepoint_register_lib(void *arg0 __attribute__((unused)), int arg1 __attribute__((unused))) +{ + CRIT("Incompatible library ABIs detected within the same process. " + "The process is likely linked against different major soname of LTTng-UST which is unsupported. " + "The detection was triggered by canary symbol \"%s\"\n", __func__); + + return -1; +} + /** - * lttng_ust_tracepoint_probe_register - Connect a probe to a tracepoint + * lttng_ust_tracepoint_provider_register - Connect a probe to a tracepoint * @name: tracepoint provider name * @name: tracepoint event name * @probe: probe handler @@ -617,12 +651,20 @@ static void tracepoint_release_queue_add_old_probes(void *old) * The probe address must at least be aligned on the architecture pointer size. * Called with the tracepoint mutex held. */ -int lttng_ust_tracepoint_probe_register(const char *provider_name, const char *event_name, +int lttng_ust_tracepoint_provider_register(const char *provider_name, const char *event_name, void (*probe)(void), void *data, const char *signature) { void *old; int ret = 0; + /* + * Check if we find a symbol of the previous ABI in the current process + * as different ABIs of liblttng-ust can't co-exist in a process. If we + * do so, emit a critical log message which will also abort if the + * LTTNG_UST_ABORT_ON_CRITICAL environment variable is set. + */ + lttng_ust_tracepoint_check_soname_0(); + DBG("Registering probe to tracepoint \"%s:%s\"", provider_name, event_name); pthread_mutex_lock(&tracepoint_mutex); @@ -690,7 +732,7 @@ static void *tracepoint_remove_probe(const char *provider_name, const char *even * @probe: probe function pointer * @probe: probe data pointer */ -int lttng_ust_tracepoint_probe_unregister(const char *provider_name, const char *event_name, +int lttng_ust_tracepoint_provider_unregister(const char *provider_name, const char *event_name, void (*probe)(void), void *data) { void *old; @@ -877,9 +919,9 @@ static void new_tracepoints(struct lttng_ust_tracepoint * const *start, * against recent liblttng-ust headers require a recent liblttng-ust * runtime for those tracepoints to be taken into account. */ -int lttng_ust_tracepoint_register_lib(struct lttng_ust_tracepoint * const *tracepoints_start, +int lttng_ust_tracepoint_module_register(struct lttng_ust_tracepoint * const *tracepoints_start, int tracepoints_count); -int lttng_ust_tracepoint_register_lib(struct lttng_ust_tracepoint * const *tracepoints_start, +int lttng_ust_tracepoint_module_register(struct lttng_ust_tracepoint * const *tracepoints_start, int tracepoints_count) { struct tracepoint_lib *pl, *iter; @@ -932,8 +974,8 @@ lib_added: return 0; } -int lttng_ust_tracepoint_unregister_lib(struct lttng_ust_tracepoint * const *tracepoints_start); -int lttng_ust_tracepoint_unregister_lib(struct lttng_ust_tracepoint * const *tracepoints_start) +int lttng_ust_tracepoint_module_unregister(struct lttng_ust_tracepoint * const *tracepoints_start); +int lttng_ust_tracepoint_module_unregister(struct lttng_ust_tracepoint * const *tracepoints_start) { struct tracepoint_lib *lib; @@ -998,24 +1040,24 @@ void lttng_ust_tp_exit(void) /* * Create the wrapper symbols. */ -#undef tp_rcu_read_lock -#undef tp_rcu_read_unlock -#undef tp_rcu_dereference +#undef lttng_ust_tp_rcu_read_lock +#undef lttng_ust_tp_rcu_read_unlock +#undef lttng_ust_tp_rcu_dereference -void tp_rcu_read_lock(void); -void tp_rcu_read_lock(void) +void lttng_ust_tp_rcu_read_lock(void); +void lttng_ust_tp_rcu_read_lock(void) { lttng_ust_urcu_read_lock(); } -void tp_rcu_read_unlock(void); -void tp_rcu_read_unlock(void) +void lttng_ust_tp_rcu_read_unlock(void); +void lttng_ust_tp_rcu_read_unlock(void) { lttng_ust_urcu_read_unlock(); } -void *tp_rcu_dereference_sym(void *p); -void *tp_rcu_dereference_sym(void *p) +void *lttng_ust_tp_rcu_dereference_sym(void *p); +void *lttng_ust_tp_rcu_dereference_sym(void *p) { return lttng_ust_rcu_dereference(p); }