X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-statedump.c;h=171cbaec0a666a83699d952cb31767c7ec3234bf;hb=cfbdb7732a22a21b2803a7aed6962d72bef54f5a;hp=2fb8f34d9b4f4e34d803813498187273441fc487;hpb=b891574ec1aaaddf943361927da7a31ebb9db03d;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-statedump.c b/liblttng-ust/lttng-ust-statedump.c
index 2fb8f34d..171cbaec 100644
--- a/liblttng-ust/lttng-ust-statedump.c
+++ b/liblttng-ust/lttng-ust-statedump.c
@@ -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;
 }