X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-context-vppid.c;h=cb5c050ee12ddd2bdfb5979632395f1f6e053b89;hb=1b25fe5879436a90fd22a731e9d3371807e78ba1;hp=365d97394e89c98094b43dacc5918ee353271c00;hpb=de544ea58e0231054bb62e2c814c662b894d6e25;p=lttng-modules.git

diff --git a/lttng-context-vppid.c b/lttng-context-vppid.c
index 365d9739..cb5c050e 100644
--- a/lttng-context-vppid.c
+++ b/lttng-context-vppid.c
@@ -24,10 +24,10 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/syscalls.h>
-#include "lttng-events.h"
-#include "wrapper/ringbuffer/frontend_types.h"
-#include "wrapper/vmalloc.h"
-#include "lttng-tracer.h"
+#include <lttng-events.h>
+#include <wrapper/ringbuffer/frontend_types.h>
+#include <wrapper/vmalloc.h>
+#include <lttng-tracer.h>
 
 static
 size_t vppid_get_size(size_t offset)
@@ -51,6 +51,15 @@ void vppid_record(struct lttng_ctx_field *field,
 	 * current nsproxy can be NULL when scheduled out of exit. pid_vnr uses
 	 * the current thread nsproxy to perform the lookup.
 	 */
+
+	/*
+	 * TODO: when we eventually add RCU subsystem instrumentation,
+	 * taking the rcu read lock here will trigger RCU tracing
+	 * recursively. We should modify the kernel synchronization so
+	 * it synchronizes both for RCU and RCU sched, and rely on
+	 * rcu_read_lock_sched_notrace.
+	 */
+
 	rcu_read_lock();
 	parent = rcu_dereference(current->real_parent);
 	if (!current->nsproxy)
@@ -62,6 +71,37 @@ void vppid_record(struct lttng_ctx_field *field,
 	chan->ops->event_write(ctx, &vppid, sizeof(vppid));
 }
 
+static
+void vppid_get_value(struct lttng_ctx_field *field,
+		struct lttng_probe_ctx *lttng_probe_ctx,
+		union lttng_ctx_value *value)
+{
+	struct task_struct *parent;
+	pid_t vppid;
+
+	/*
+	 * current nsproxy can be NULL when scheduled out of exit. pid_vnr uses
+	 * the current thread nsproxy to perform the lookup.
+	 */
+
+	/*
+	 * TODO: when we eventually add RCU subsystem instrumentation,
+	 * taking the rcu read lock here will trigger RCU tracing
+	 * recursively. We should modify the kernel synchronization so
+	 * it synchronizes both for RCU and RCU sched, and rely on
+	 * rcu_read_lock_sched_notrace.
+	 */
+
+	rcu_read_lock();
+	parent = rcu_dereference(current->real_parent);
+	if (!current->nsproxy)
+		vppid = 0;
+	else
+		vppid = task_tgid_vnr(parent);
+	rcu_read_unlock();
+	value->s64 = vppid;
+}
+
 int lttng_add_vppid_to_ctx(struct lttng_ctx **ctx)
 {
 	struct lttng_ctx_field *field;
@@ -77,17 +117,15 @@ int lttng_add_vppid_to_ctx(struct lttng_ctx **ctx)
 	field->event_field.type.atype = atype_integer;
 	field->event_field.type.u.basic.integer.size = sizeof(pid_t) * CHAR_BIT;
 	field->event_field.type.u.basic.integer.alignment = lttng_alignof(pid_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness = is_signed_type(pid_t);
+	field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(pid_t);
 	field->event_field.type.u.basic.integer.reverse_byte_order = 0;
 	field->event_field.type.u.basic.integer.base = 10;
 	field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
 	field->get_size = vppid_get_size;
 	field->record = vppid_record;
+	field->get_value = vppid_get_value;
+	lttng_context_update(*ctx);
 	wrapper_vmalloc_sync_all();
 	return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_vppid_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit vPPID Context");