#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 vuid_get_size(size_t offset)
+size_t vuid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
{
size_t size = 0;
}
static
-void vuid_record(struct lttng_ctx_field *field,
- struct lib_ring_buffer_ctx *ctx,
- struct lttng_channel *chan)
+void vuid_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 vuid;
- vuid = lttng_current_vuid();
- lib_ring_buffer_align_ctx(ctx, lttng_alignof(vuid));
- chan->ops->event_write(ctx, &vuid, sizeof(vuid));
+ vuid = from_kuid_munged(current_user_ns(), current_uid());
+ chan->ops->event_write(ctx, &vuid, sizeof(vuid), lttng_alignof(vuid));
}
static
-void vuid_get_value(struct lttng_ctx_field *field,
- struct lttng_probe_ctx *lttng_probe_ctx,
- union lttng_ctx_value *value)
+void vuid_get_value(void *priv,
+ struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+ struct lttng_ctx_value *value)
{
- value->s64 = lttng_current_vuid();
+ value->u.s64 = from_kuid_munged(current_user_ns(), current_uid());
}
-int lttng_add_vuid_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("vuid",
+ lttng_kernel_static_type_integer_from_type(uid_t, __BYTE_ORDER, 10),
+ false, false),
+ vuid_get_size,
+ vuid_record,
+ vuid_get_value,
+ NULL, NULL);
+
+int lttng_add_vuid_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, "vuid")) {
- lttng_remove_context_field(ctx, field);
+ if (lttng_kernel_find_context(*ctx, ctx_field->event_field->name))
return -EEXIST;
- }
- field->event_field.name = "vuid";
- field->event_field.type.type = lttng_kernel_type_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_kernel_string_encoding_none;
- field->get_size = vuid_get_size;
- field->record = vuid_record;
- field->get_value = vuid_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_vuid_to_ctx);