* Copyright (C) 2010-2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
+#include <wrapper/compiler_attributes.h>
#include <wrapper/uaccess.h>
#include <wrapper/objtool.h>
#include <wrapper/types.h>
#include <lttng/lttng-bytecode.h>
#include <lttng/string-utils.h>
#include <lttng/events-internal.h>
+#include <lttng/probe-user.h>
/*
* get_char should be called with page fault handler disabled if it is expected
}
int lttng_bytecode_interpret_error(
- struct lttng_bytecode_runtime *bytecode_runtime __attribute__((unused)),
+ struct lttng_kernel_bytecode_runtime *bytecode_runtime __attribute__((unused)),
const char *stack_data __attribute__((unused)),
- struct lttng_probe_ctx *probe_ctx __attribute__((unused)),
+ struct lttng_kernel_probe_ctx *probe_ctx __attribute__((unused)),
void *ctx __attribute__((unused)))
{
return LTTNG_KERNEL_BYTECODE_INTERPRETER_ERROR;
#define IS_INTEGER_REGISTER(reg_type) \
(reg_type == REG_S64 || reg_type == REG_U64)
-static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx,
+static int context_get_index(struct lttng_kernel_probe_ctx *lttng_probe_ctx,
struct load_ptr *ptr,
uint32_t idx)
{
struct lttng_kernel_ctx_field *ctx_field;
const struct lttng_kernel_event_field *field;
- union lttng_ctx_value v;
+ struct lttng_ctx_value v;
ctx_field = <tng_static_ctx->fields[idx];
field = ctx_field->event_field;
switch (field->type->type) {
case lttng_kernel_type_integer:
- ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
+ {
+ const struct lttng_kernel_type_integer *integer_type = lttng_kernel_get_type_integer(field->type);
+
+ ctx_field->get_value(ctx_field->priv, lttng_probe_ctx, &v);
if (lttng_kernel_get_type_integer(field->type)->signedness) {
ptr->object_type = OBJECT_TYPE_S64;
- ptr->u.s64 = v.s64;
+ ptr->u.s64 = v.u.s64;
ptr->ptr = &ptr->u.s64;
} else {
ptr->object_type = OBJECT_TYPE_U64;
- ptr->u.u64 = v.s64; /* Cast. */
+ ptr->u.u64 = v.u.s64; /* Cast. */
ptr->ptr = &ptr->u.u64;
}
+ ptr->rev_bo = integer_type->reverse_byte_order;
+ ptr->user = integer_type->user;
break;
+ }
case lttng_kernel_type_enum:
{
const struct lttng_kernel_type_enum *enum_type = lttng_kernel_get_type_enum(field->type);
const struct lttng_kernel_type_integer *integer_type = lttng_kernel_get_type_integer(enum_type->container_type);
- ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
+ ctx_field->get_value(ctx_field->priv, lttng_probe_ctx, &v);
if (integer_type->signedness) {
ptr->object_type = OBJECT_TYPE_SIGNED_ENUM;
- ptr->u.s64 = v.s64;
+ ptr->u.s64 = v.u.s64;
ptr->ptr = &ptr->u.s64;
} else {
ptr->object_type = OBJECT_TYPE_UNSIGNED_ENUM;
- ptr->u.u64 = v.s64; /* Cast. */
+ ptr->u.u64 = v.u.s64; /* Cast. */
ptr->ptr = &ptr->u.u64;
}
+ ptr->rev_bo = integer_type->reverse_byte_order;
+ ptr->user = integer_type->user;
break;
}
case lttng_kernel_type_array:
{
const struct lttng_kernel_type_array *array_type = lttng_kernel_get_type_array(field->type);
+ const struct lttng_kernel_type_integer *integer_type;
if (!lttng_kernel_type_is_bytewise_integer(array_type->elem_type)) {
printk(KERN_WARNING "LTTng: bytecode: Array nesting only supports integer types.\n");
printk(KERN_WARNING "LTTng: bytecode: Only string arrays are supported for contexts.\n");
return -EINVAL;
}
+ integer_type = lttng_kernel_get_type_integer(array_type->elem_type);
ptr->object_type = OBJECT_TYPE_STRING;
- ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
- ptr->ptr = v.str;
+ ptr->user = integer_type->user;
+ ctx_field->get_value(ctx_field->priv, lttng_probe_ctx, &v);
+ ptr->ptr = v.u.str;
break;
}
case lttng_kernel_type_sequence:
{
const struct lttng_kernel_type_sequence *sequence_type = lttng_kernel_get_type_sequence(field->type);
+ const struct lttng_kernel_type_integer *integer_type;
if (!lttng_kernel_type_is_bytewise_integer(sequence_type->elem_type)) {
printk(KERN_WARNING "LTTng: bytecode: Sequence nesting only supports integer types.\n");
printk(KERN_WARNING "LTTng: bytecode: Only string sequences are supported for contexts.\n");
return -EINVAL;
}
+ integer_type = lttng_kernel_get_type_integer(sequence_type->elem_type);
ptr->object_type = OBJECT_TYPE_STRING;
- ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
- ptr->ptr = v.str;
+ ptr->user = integer_type->user;
+ ctx_field->get_value(ctx_field->priv, lttng_probe_ctx, &v);
+ ptr->ptr = v.u.str;
break;
}
case lttng_kernel_type_string:
+ {
+ const struct lttng_kernel_type_string *string_type = lttng_kernel_get_type_string(field->type);
+
ptr->object_type = OBJECT_TYPE_STRING;
- ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
- ptr->ptr = v.str;
+ ptr->user = string_type->user;
+ ctx_field->get_value(ctx_field->priv, lttng_probe_ctx, &v);
+ ptr->ptr = v.u.str;
break;
+ }
case lttng_kernel_type_struct:
printk(KERN_WARNING "LTTng: bytecode: Structure type cannot be loaded.\n");
return -EINVAL;
return 0;
}
-static int dynamic_get_index(struct lttng_probe_ctx *lttng_probe_ctx,
+static int dynamic_get_index(struct lttng_kernel_probe_ctx *lttng_probe_ctx,
struct bytecode_runtime *runtime,
uint64_t index, struct estack_entry *stack_top)
{
stack_top->u.ptr.ptr = ptr;
stack_top->u.ptr.object_type = gid->elem.type;
stack_top->u.ptr.rev_bo = gid->elem.rev_bo;
+ stack_top->u.ptr.user = gid->elem.user;
BUG_ON(stack_top->u.ptr.field->type->type != lttng_kernel_type_array);
stack_top->u.ptr.field = NULL;
break;
stack_top->u.ptr.ptr = ptr;
stack_top->u.ptr.object_type = gid->elem.type;
stack_top->u.ptr.rev_bo = gid->elem.rev_bo;
+ stack_top->u.ptr.user = gid->elem.user;
BUG_ON(stack_top->u.ptr.field->type->type != lttng_kernel_type_sequence);
stack_top->u.ptr.field = NULL;
break;
}
break;
case LOAD_ROOT_CONTEXT:
- case LOAD_ROOT_APP_CONTEXT: /* Fall-through */
+ lttng_fallthrough;
+ case LOAD_ROOT_APP_CONTEXT:
{
ret = context_get_index(lttng_probe_ctx,
&stack_top->u.ptr,
stack_top->u.ptr.type = LOAD_OBJECT;
stack_top->u.ptr.field = gid->field;
stack_top->u.ptr.rev_bo = gid->elem.rev_bo;
+ stack_top->u.ptr.user = gid->elem.user;
break;
}
switch (stack_top->u.ptr.object_type) {
case OBJECT_TYPE_S8:
dbg_printk("op load field s8\n");
- stack_top->u.v = *(int8_t *) stack_top->u.ptr.ptr;
+ if (stack_top->u.ptr.user) {
+ if (lttng_copy_from_user_check_nofault(&stack_top->u.v, (int8_t __user *) stack_top->u.ptr.ptr, sizeof(int8_t)))
+ stack_top->u.v = 0;
+ } else {
+ stack_top->u.v = *(int8_t *) stack_top->u.ptr.ptr;
+ }
stack_top->type = REG_S64;
break;
case OBJECT_TYPE_S16:
int16_t tmp;
dbg_printk("op load field s16\n");
- tmp = *(int16_t *) stack_top->u.ptr.ptr;
+ if (stack_top->u.ptr.user) {
+ if (lttng_copy_from_user_check_nofault(&tmp, (int16_t __user *) stack_top->u.ptr.ptr, sizeof(int16_t)))
+ tmp = 0;
+ } else {
+ tmp = *(int16_t *) stack_top->u.ptr.ptr;
+ }
if (stack_top->u.ptr.rev_bo)
__swab16s(&tmp);
stack_top->u.v = tmp;
int32_t tmp;
dbg_printk("op load field s32\n");
- tmp = *(int32_t *) stack_top->u.ptr.ptr;
+ if (stack_top->u.ptr.user) {
+ if (lttng_copy_from_user_check_nofault(&tmp, (int32_t __user *) stack_top->u.ptr.ptr, sizeof(int32_t)))
+ tmp = 0;
+ } else {
+ tmp = *(int32_t *) stack_top->u.ptr.ptr;
+ }
if (stack_top->u.ptr.rev_bo)
__swab32s(&tmp);
stack_top->u.v = tmp;
int64_t tmp;
dbg_printk("op load field s64\n");
- tmp = *(int64_t *) stack_top->u.ptr.ptr;
+ if (stack_top->u.ptr.user) {
+ if (lttng_copy_from_user_check_nofault(&tmp, (int64_t __user *) stack_top->u.ptr.ptr, sizeof(int64_t)))
+ tmp = 0;
+ } else {
+ tmp = *(int64_t *) stack_top->u.ptr.ptr;
+ }
if (stack_top->u.ptr.rev_bo)
__swab64s(&tmp);
stack_top->u.v = tmp;
int64_t tmp;
dbg_printk("op load field signed enumeration\n");
+ if (stack_top->u.ptr.user) {
+ dbg_printk("Bytecode warning: user enum unsupported.\n");
+ ret = -EINVAL;
+ goto end;
+ }
tmp = *(int64_t *) stack_top->u.ptr.ptr;
if (stack_top->u.ptr.rev_bo)
__swab64s(&tmp);
}
case OBJECT_TYPE_U8:
dbg_printk("op load field u8\n");
- stack_top->u.v = *(uint8_t *) stack_top->u.ptr.ptr;
+ if (stack_top->u.ptr.user) {
+ if (lttng_copy_from_user_check_nofault(&stack_top->u.v, (uint8_t __user *) stack_top->u.ptr.ptr, sizeof(uint8_t)))
+ stack_top->u.v = 0;
+ } else {
+ stack_top->u.v = *(uint8_t *) stack_top->u.ptr.ptr;
+ }
stack_top->type = REG_U64;
break;
case OBJECT_TYPE_U16:
uint16_t tmp;
dbg_printk("op load field u16\n");
- tmp = *(uint16_t *) stack_top->u.ptr.ptr;
+ if (stack_top->u.ptr.user) {
+ if (lttng_copy_from_user_check_nofault(&tmp, (uint16_t __user *) stack_top->u.ptr.ptr, sizeof(uint16_t)))
+ tmp = 0;
+ } else {
+ tmp = *(uint16_t *) stack_top->u.ptr.ptr;
+ }
if (stack_top->u.ptr.rev_bo)
__swab16s(&tmp);
stack_top->u.v = tmp;
uint32_t tmp;
dbg_printk("op load field u32\n");
- tmp = *(uint32_t *) stack_top->u.ptr.ptr;
+ if (stack_top->u.ptr.user) {
+ if (lttng_copy_from_user_check_nofault(&tmp, (uint32_t __user *) stack_top->u.ptr.ptr, sizeof(uint32_t)))
+ tmp = 0;
+ } else {
+ tmp = *(uint32_t *) stack_top->u.ptr.ptr;
+ }
if (stack_top->u.ptr.rev_bo)
__swab32s(&tmp);
stack_top->u.v = tmp;
uint64_t tmp;
dbg_printk("op load field u64\n");
- tmp = *(uint64_t *) stack_top->u.ptr.ptr;
+ if (stack_top->u.ptr.user) {
+ if (lttng_copy_from_user_check_nofault(&tmp, (uint64_t __user *) stack_top->u.ptr.ptr, sizeof(uint64_t)))
+ tmp = 0;
+ } else {
+ tmp = *(uint64_t *) stack_top->u.ptr.ptr;
+ }
if (stack_top->u.ptr.rev_bo)
__swab64s(&tmp);
stack_top->u.v = tmp;
uint64_t tmp;
dbg_printk("op load field unsigned enumeration\n");
+ if (stack_top->u.ptr.user) {
+ dbg_printk("Bytecode warning: user enum unsupported.\n");
+ ret = -EINVAL;
+ goto end;
+ }
tmp = *(uint64_t *) stack_top->u.ptr.ptr;
if (stack_top->u.ptr.rev_bo)
__swab64s(&tmp);
}
case OBJECT_TYPE_STRING:
{
- const char *str;
+ dbg_printk("op load field string: user=%d\n", stack_top->u.ptr.user);
+ if (stack_top->u.ptr.user) {
+ const char __user *user_str = (const char __user *) stack_top->u.ptr.ptr;
- dbg_printk("op load field string\n");
- str = (const char *) stack_top->u.ptr.ptr;
- stack_top->u.s.str = str;
- if (unlikely(!stack_top->u.s.str)) {
- dbg_printk("Bytecode warning: loading a NULL string.\n");
- ret = -EINVAL;
- goto end;
+ stack_top->u.s.user_str = user_str;
+ if (unlikely(!stack_top->u.s.user_str)) {
+ dbg_printk("Bytecode warning: loading a NULL user string.\n");
+ ret = -EINVAL;
+ goto end;
+ }
+ stack_top->u.s.user = 1;
+ } else {
+ const char *str = (const char *) stack_top->u.ptr.ptr;
+
+ stack_top->u.s.str = str;
+ if (unlikely(!stack_top->u.s.str)) {
+ dbg_printk("Bytecode warning: loading a NULL string.\n");
+ ret = -EINVAL;
+ goto end;
+ }
+ stack_top->u.s.user = 0;
}
stack_top->u.s.seq_len = LTTNG_SIZE_MAX;
- stack_top->u.s.literal_type =
- ESTACK_STRING_LITERAL_TYPE_NONE;
+ stack_top->u.s.literal_type = ESTACK_STRING_LITERAL_TYPE_NONE;
stack_top->type = REG_STRING;
break;
}
{
const char *ptr;
- dbg_printk("op load field string sequence\n");
+ dbg_printk("op load field string sequence: user=%d\n", stack_top->u.ptr.user);
ptr = stack_top->u.ptr.ptr;
stack_top->u.s.seq_len = *(unsigned long *) ptr;
- stack_top->u.s.str = *(const char **) (ptr + sizeof(unsigned long));
- if (unlikely(!stack_top->u.s.str)) {
- dbg_printk("Bytecode warning: loading a NULL sequence.\n");
- ret = -EINVAL;
- goto end;
+ if (stack_top->u.ptr.user) {
+ stack_top->u.s.user_str = *(const char __user **) (ptr + sizeof(unsigned long));
+ if (unlikely(!stack_top->u.s.user_str)) {
+ dbg_printk("Bytecode warning: loading a NULL user sequence.\n");
+ ret = -EINVAL;
+ goto end;
+ }
+ stack_top->u.s.user = 1;
+ } else {
+ stack_top->u.s.str = *(const char **) (ptr + sizeof(unsigned long));
+ if (unlikely(!stack_top->u.s.str)) {
+ dbg_printk("Bytecode warning: loading a NULL sequence.\n");
+ ret = -EINVAL;
+ goto end;
+ }
+ stack_top->u.s.user = 0;
}
- stack_top->u.s.literal_type =
- ESTACK_STRING_LITERAL_TYPE_NONE;
+ stack_top->u.s.literal_type = ESTACK_STRING_LITERAL_TYPE_NONE;
stack_top->type = REG_STRING;
break;
}
break;
case REG_STRING:
output->type = LTTNG_INTERPRETER_TYPE_STRING;
- output->u.str.str = ax->u.s.str;
output->u.str.len = ax->u.s.seq_len;
+ output->u.str.user = ax->u.s.user;
+ if (ax->u.s.user) {
+ output->u.str.user_str = ax->u.s.user_str;
+ } else {
+ output->u.str.str = ax->u.s.str;
+ }
break;
case REG_PTR:
switch (ax->u.ptr.object_type) {
* For CAPTURE bytecode: expect a struct lttng_interpreter_output *
* as @ctx argument.
*/
-int lttng_bytecode_interpret(struct lttng_bytecode_runtime *kernel_bytecode,
+int lttng_bytecode_interpret(struct lttng_kernel_bytecode_runtime *kernel_bytecode,
const char *interpreter_stack_data,
- struct lttng_probe_ctx *lttng_probe_ctx,
+ struct lttng_kernel_probe_ctx *lttng_probe_ctx,
void *caller_ctx)
{
struct bytecode_runtime *bytecode = container_of(kernel_bytecode, struct bytecode_runtime, p);
struct load_op *insn = (struct load_op *) pc;
struct field_ref *ref = (struct field_ref *) insn->data;
struct lttng_kernel_ctx_field *ctx_field;
- union lttng_ctx_value v;
+ struct lttng_ctx_value v;
dbg_printk("get context ref offset %u type string\n",
ref->offset);
ctx_field = <tng_static_ctx->fields[ref->offset];
- ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
+ ctx_field->get_value(ctx_field->priv, lttng_probe_ctx, &v);
estack_push(stack, top, ax, bx, ax_t, bx_t);
- estack_ax(stack, top)->u.s.str = v.str;
+ estack_ax(stack, top)->u.s.str = v.u.str;
if (unlikely(!estack_ax(stack, top)->u.s.str)) {
dbg_printk("Bytecode warning: loading a NULL string.\n");
ret = -EINVAL;
struct load_op *insn = (struct load_op *) pc;
struct field_ref *ref = (struct field_ref *) insn->data;
struct lttng_kernel_ctx_field *ctx_field;
- union lttng_ctx_value v;
+ struct lttng_ctx_value v;
dbg_printk("get context ref offset %u type s64\n",
ref->offset);
ctx_field = <tng_static_ctx->fields[ref->offset];
- ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
+ ctx_field->get_value(ctx_field->priv, lttng_probe_ctx, &v);
estack_push(stack, top, ax, bx, ax_t, bx_t);
- estack_ax_v = v.s64;
+ estack_ax_v = v.u.s64;
estack_ax_t = REG_S64;
dbg_printk("ref get context s64 %lld\n",
(long long) estack_ax_v);
estack_ax(stack, top)->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_NONE;
estack_ax(stack, top)->type = REG_STRING;
+ estack_ax(stack, top)->u.s.user = 0;
next_pc += sizeof(struct load_op);
PO;
}
estack_ax(stack, top)->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_NONE;
estack_ax(stack, top)->type = REG_STRING;
+ estack_ax(stack, top)->u.s.user = 0;
next_pc += sizeof(struct load_op);
PO;
}
*/
int lttng_kernel_interpret_event_filter(const struct lttng_kernel_event_common *event,
const char *interpreter_stack_data,
- struct lttng_probe_ctx *probe_ctx,
+ struct lttng_kernel_probe_ctx *probe_ctx,
void *event_filter_ctx __attribute__((unused)))
{
- struct lttng_bytecode_runtime *filter_bc_runtime;
+ struct lttng_kernel_bytecode_runtime *filter_bc_runtime;
struct list_head *filter_bytecode_runtime_head = &event->priv->filter_bytecode_runtime_head;
struct lttng_kernel_bytecode_filter_ctx bytecode_filter_ctx;
bool filter_record = false;
projects / lttng-modules.git / blobdiff