X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Flttng-context-euid.c;h=7d344b1fea69799aa03fc6e23e92f24560203548;hb=HEAD;hp=79faf3acbb955fe51ba23c3388cf3cb0dc04bacc;hpb=cfa6cc1d0f01c2cfcc1a679abf3a6572d411c309;p=lttng-modules.git

diff --git a/src/lttng-context-euid.c b/src/lttng-context-euid.c
index 79faf3ac..92c28681 100644
--- a/src/lttng-context-euid.c
+++ b/src/lttng-context-euid.c
@@ -11,14 +11,16 @@
 
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/user_namespace.h>
+
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <lttng/tracer.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
-#include <wrapper/user_namespace.h>
 
 static
-size_t euid_get_size(size_t offset)
+size_t euid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -28,49 +30,41 @@ size_t euid_get_size(size_t offset)
 }
 
 static
-void euid_record(struct lttng_ctx_field *field,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+void euid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+		 struct lttng_kernel_ring_buffer_ctx *ctx,
+		 struct lttng_kernel_channel_buffer *chan)
 {
 	uid_t euid;
 
-	euid = lttng_current_euid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(euid));
-	chan->ops->event_write(ctx, &euid, sizeof(euid));
+	euid = from_kuid_munged(&init_user_ns, current_euid());
+	chan->ops->event_write(ctx, &euid, sizeof(euid), lttng_alignof(euid));
 }
 
 static
-void euid_get_value(struct lttng_ctx_field *field,
-		struct lttng_probe_ctx *lttng_probe_ctx,
-		union lttng_ctx_value *value)
+void euid_get_value(void *priv,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+		struct lttng_ctx_value *value)
 {
-	value->s64 = lttng_current_euid();
+	value->u.s64 = from_kuid_munged(&init_user_ns, current_euid());
 }
 
-int lttng_add_euid_to_ctx(struct lttng_ctx **ctx)
+static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
+	lttng_kernel_static_event_field("euid",
+		lttng_kernel_static_type_integer_from_type(uid_t, __BYTE_ORDER, 10),
+		false, false),
+	euid_get_size,
+	euid_record,
+	euid_get_value,
+	NULL, NULL);
+
+int lttng_add_euid_to_ctx(struct lttng_kernel_ctx **ctx)
 {
-	struct lttng_ctx_field *field;
+	int ret;
 
-	field = lttng_append_context(ctx);
-	if (!field)
-		return -ENOMEM;
-	if (lttng_find_context(*ctx, "euid")) {
-		lttng_remove_context_field(ctx, field);
+	if (lttng_kernel_find_context(*ctx, ctx_field->event_field->name))
 		return -EEXIST;
-	}
-	field->event_field.name = "euid";
-	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.integer.size = sizeof(uid_t) * CHAR_BIT;
-	field->event_field.type.u.integer.alignment = lttng_alignof(uid_t) * CHAR_BIT;
-	field->event_field.type.u.integer.signedness = lttng_is_signed_type(uid_t);
-	field->event_field.type.u.integer.reverse_byte_order = 0;
-	field->event_field.type.u.integer.base = 10;
-	field->event_field.type.u.integer.encoding = lttng_encode_none;
-	field->get_size = euid_get_size;
-	field->record = euid_record;
-	field->get_value = euid_get_value;
-	lttng_context_update(*ctx);
+	ret = lttng_kernel_context_append(ctx, ctx_field);
 	wrapper_vmalloc_sync_mappings();
-	return 0;
+	return ret;
 }
 EXPORT_SYMBOL_GPL(lttng_add_euid_to_ctx);