Fix: perform TLS fixup in all UST entry points from each thread

[lttng-ust.git] / liblttng-ust / lttng-ust-statedump.c

diff --git a/liblttng-ust/lttng-ust-statedump.c b/liblttng-ust/lttng-ust-statedump.c
index c8e508cdf9e9bd477f333ce79046e42625d64922..171cbaec0a666a83699d952cb31767c7ec3234bf 100644 (file)
--- a/liblttng-ust/lttng-ust-statedump.c
+++ b/liblttng-ust/lttng-ust-statedump.c
@@ -431,13 +431,13 @@ void iter_end(struct dl_iterate_data *data, void *ip)
                                        trace_lib_load(&e->bin_data, ip);
                                        e->traced = true;
                                }
+                               e->marked = false;
                        } else {
                                if (e->traced)
                                        trace_lib_unload(&e->bin_data, ip);
                                remove_dl_node(e);
                                free_dl_node(e);
                        }
-                       e->marked = false;
                }
        }
        ust_unlock();
@@ -551,6 +551,12 @@ void lttng_ust_dl_update(void *ip)
        if (getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
                return;
 
+       /*
+        * Fixup lttng-ust TLS when called from dlopen/dlclose
+        * instrumentation.
+        */
+       lttng_ust_fixup_tls();
+
        data.exec_found = 0;
        data.first = true;
        data.cancel = false;
@@ -590,12 +596,22 @@ int do_baddr_statedump(void *owner)
  * session, statedumps from different processes may be
  * interleaved. The vpid context should be used to identify which
  * events belong to which process.
+ *
+ * Grab the ust_lock outside of the RCU read-side lock because we
+ * perform synchronize_rcu with the ust_lock held, which can trigger
+ * deadlocks otherwise.
  */
 int do_lttng_ust_statedump(void *owner)
 {
+       ust_lock_nocheck();
        trace_statedump_start(owner);
+       ust_unlock();
+
        do_baddr_statedump(owner);
+
+       ust_lock_nocheck();
        trace_statedump_end(owner);
+       ust_unlock();
 
        return 0;
 }