X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-statedump-impl.c;h=765fcea852279f211db220856d83358a6748b14a;hb=76b792cbd23db5a0d2856bdde006121f113ebba5;hp=cfcf4febb97b3ceff2a2bcd7c28c53f2fe17cc3d;hpb=c337ddc219f608d4d35f461bdc9d2246324d6708;p=lttng-modules.git

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index cfcf4feb..765fcea8 100644
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -1,15 +1,29 @@
 /*
+ * lttng-statedump.c
+ *
  * Linux Trace Toolkit Next Generation Kernel State Dump
  *
  * Copyright 2005 Jean-Hugues Deschenes <jean-hugues.deschenes@polymtl.ca>
  * Copyright 2006-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
  * Changes:
  *	Eric Clement:                   Add listing of network IP interface
  *	2006, 2007 Mathieu Desnoyers	Fix kernel threads
  *	                                Various updates
- *
- * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/init.h>
@@ -34,6 +48,7 @@
 
 #include "lttng-events.h"
 #include "wrapper/irqdesc.h"
+#include "wrapper/spinlock.h"
 
 #ifdef CONFIG_GENERIC_HARDIRQS
 #include <linux/irq.h>
@@ -172,6 +187,12 @@ int lttng_enumerate_file_descriptors(struct lttng_session *session)
 	return 0;
 }
 
+#if 0
+/*
+ * FIXME: we cannot take a mmap_sem while in a RCU read-side critical section
+ * (scheduling in atomic). Normally, the tasklist lock protects this kind of
+ * iteration, but it is not exported to modules.
+ */
 static
 void lttng_enumerate_task_vm_maps(struct lttng_session *session,
 		struct task_struct *p)
@@ -212,8 +233,14 @@ int lttng_enumerate_vm_maps(struct lttng_session *session)
 	rcu_read_unlock();
 	return 0;
 }
+#endif
 
 #ifdef CONFIG_GENERIC_HARDIRQS
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39))
+#define irq_desc_get_chip(desc) get_irq_desc_chip(desc)
+#endif
+
 static
 void lttng_list_interrupts(struct lttng_session *session)
 {
@@ -229,12 +256,12 @@ void lttng_list_interrupts(struct lttng_session *session)
 			irq_desc_get_chip(desc)->name ? : "unnamed_irq_chip";
 
 		local_irq_save(flags);
-		raw_spin_lock(&desc->lock);
+		wrapper_desc_spin_lock(&desc->lock);
 		for (action = desc->action; action; action = action->next) {
 			trace_lttng_statedump_interrupt(session,
 				irq, irq_chip_name, action);
 		}
-		raw_spin_unlock(&desc->lock);
+		wrapper_desc_spin_unlock(&desc->lock);
 		local_irq_restore(flags);
 	}
 #undef irq_to_desc
@@ -246,6 +273,33 @@ void list_interrupts(struct lttng_session *session)
 }
 #endif
 
+static
+void lttng_statedump_process_ns(struct lttng_session *session,
+		struct task_struct *p,
+		enum lttng_thread_type type,
+		enum lttng_execution_mode mode,
+		enum lttng_execution_submode submode,
+		enum lttng_process_status status)
+{
+	struct nsproxy *proxy;
+	struct pid_namespace *pid_ns;
+
+	rcu_read_lock();
+	proxy = task_nsproxy(p);
+	if (proxy) {
+		pid_ns = proxy->pid_ns;
+		do {
+			trace_lttng_statedump_process_state(session,
+				p, type, mode, submode, status, pid_ns);
+			pid_ns = pid_ns->parent;
+		} while (pid_ns);
+	} else {
+		trace_lttng_statedump_process_state(session,
+			p, type, mode, submode, status, NULL);
+	}
+	rcu_read_unlock();
+}
+
 static
 int lttng_enumerate_process_states(struct lttng_session *session)
 {
@@ -295,7 +349,7 @@ int lttng_enumerate_process_states(struct lttng_session *session)
 				type = LTTNG_USER_THREAD;
 			else
 				type = LTTNG_KERNEL_THREAD;
-			trace_lttng_statedump_process_state(session,
+			lttng_statedump_process_ns(session,
 				p, type, mode, submode, status);
 			task_unlock(p);
 		} while_each_thread(g, p);
@@ -322,7 +376,7 @@ int do_lttng_statedump(struct lttng_session *session)
 	trace_lttng_statedump_start(session);
 	lttng_enumerate_process_states(session);
 	lttng_enumerate_file_descriptors(session);
-	lttng_enumerate_vm_maps(session);
+	/* FIXME lttng_enumerate_vm_maps(session); */
 	lttng_list_interrupts(session);
 	lttng_enumerate_network_ip_interface(session);
 
@@ -343,7 +397,7 @@ int do_lttng_statedump(struct lttng_session *session)
 		schedule_delayed_work_on(cpu, &cpu_work[cpu], 0);
 	}
 	/* Wait for all threads to run */
-	__wait_event(statedump_wq, (atomic_read(&kernel_threads_to_run) != 0));
+	wait_event(statedump_wq, (atomic_read(&kernel_threads_to_run) != 0));
 	put_online_cpus();
 	/* Our work is done */
 	printk(KERN_DEBUG "LTT state dump end\n");