Version 2.5.6

[lttng-modules.git] / lttng-context-vppid.c

diff --git a/lttng-context-vppid.c b/lttng-context-vppid.c
index 3d55fc5d6a09750f23bb08561e9f8d9725ffb75e..c18c553148d6e41a0339b9f77faf0dbe0fd5c6f9 100644 (file)
--- a/lttng-context-vppid.c
+++ b/lttng-context-vppid.c
@@ -48,11 +48,21 @@ void vppid_record(struct lttng_ctx_field *field,
        pid_t vppid;
 
        /*
-        * nsproxy can be NULL when scheduled out of exit.
+        * 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 (!parent->nsproxy)
+       if (!current->nsproxy)
                vppid = 0;
        else
                vppid = task_tgid_vnr(parent);
@@ -76,12 +86,13 @@ 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;
+       lttng_context_update(*ctx);
        wrapper_vmalloc_sync_all();
        return 0;
 }
@@ -90,3 +101,7 @@ 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");
+MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
+       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
+       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
+       LTTNG_MODULES_EXTRAVERSION);