*/
#include <linux/uaccess.h>
-#include <wrapper/frame.h>
-#include <wrapper/types.h>
+#include <linux/frame.h>
+#include <linux/limits.h>
#include <linux/swab.h>
-#include <lttng-filter.h>
-#include <lttng-string-utils.h>
+#include <lttng/lttng-filter.h>
+#include <lttng/lttng-string-utils.h>
-LTTNG_STACK_FRAME_NON_STANDARD(lttng_filter_interpret_bytecode);
+STACK_FRAME_NON_STANDARD(lttng_filter_interpret_bytecode);
/*
* get_char should be called with page fault handler disabled if it is expected
char c;
/* Handle invalid access as end of string. */
- if (unlikely(!access_ok(VERIFY_READ,
- reg->u.s.user_str + offset,
+ if (unlikely(!access_ok(reg->u.s.user_str + offset,
sizeof(c))))
return '\0';
/* Handle fault (nonzero return value) as end of string. */
switch (field->type.atype) {
case atype_integer:
ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
- if (field->type.u.basic.integer.signedness) {
+ if (field->type.u.integer.signedness) {
ptr->object_type = OBJECT_TYPE_S64;
ptr->u.s64 = v.s64;
ptr->ptr = &ptr->u.s64;
ptr->ptr = &ptr->u.u64;
}
break;
- case atype_enum:
+ case atype_enum_nestable:
{
const struct lttng_integer_type *itype =
- &field->type.u.basic.enumeration.container_type;
+ &field->type.u.enum_nestable.container_type->u.integer;
ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
if (itype->signedness) {
}
break;
}
- case atype_array:
- if (field->type.u.array.elem_type.atype != atype_integer) {
+ case atype_array_nestable:
+ if (!lttng_is_bytewise_integer(field->type.u.array_nestable.elem_type)) {
printk(KERN_WARNING "Array nesting only supports integer types.\n");
return -EINVAL;
}
- if (field->type.u.array.elem_type.u.basic.integer.encoding == lttng_encode_none) {
+ if (field->type.u.array_nestable.elem_type->u.integer.encoding == lttng_encode_none) {
printk(KERN_WARNING "Only string arrays are supported for contexts.\n");
return -EINVAL;
}
ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
ptr->ptr = v.str;
break;
- case atype_sequence:
- if (field->type.u.sequence.elem_type.atype != atype_integer) {
+ case atype_sequence_nestable:
+ if (!lttng_is_bytewise_integer(field->type.u.sequence_nestable.elem_type)) {
printk(KERN_WARNING "Sequence nesting only supports integer types.\n");
return -EINVAL;
}
- if (field->type.u.sequence.elem_type.u.basic.integer.encoding == lttng_encode_none) {
+ if (field->type.u.sequence_nestable.elem_type->u.integer.encoding == lttng_encode_none) {
printk(KERN_WARNING "Only string sequences are supported for contexts.\n");
return -EINVAL;
}
ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
ptr->ptr = v.str;
break;
- case atype_array_bitfield:
- printk(KERN_WARNING "Bitfield array type is not supported.\n");
- return -EINVAL;
- case atype_sequence_bitfield:
- printk(KERN_WARNING "Bitfield sequence type is not supported.\n");
- return -EINVAL;
case atype_string:
ptr->object_type = OBJECT_TYPE_STRING;
ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
ptr->ptr = v.str;
break;
- case atype_struct:
+ case atype_struct_nestable:
printk(KERN_WARNING "Structure type cannot be loaded.\n");
return -EINVAL;
+ case atype_variant_nestable:
+ printk(KERN_WARNING "Variant type cannot be loaded.\n");
+ return -EINVAL;
default:
printk(KERN_WARNING "Unknown type: %d", (int) field->type.atype);
return -EINVAL;
ret = -EINVAL;
goto end;
}
- stack_top->u.s.seq_len = LTTNG_SIZE_MAX;
+ stack_top->u.s.seq_len = SIZE_MAX;
stack_top->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_NONE;
break;
ret = -EINVAL;
goto end;
}
- estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
+ estack_ax(stack, top)->u.s.seq_len = SIZE_MAX;
estack_ax(stack, top)->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_NONE;
estack_ax(stack, top)->u.s.user = 0;
dbg_printk("load string %s\n", insn->data);
estack_push(stack, top, ax, bx);
estack_ax(stack, top)->u.s.str = insn->data;
- estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
+ estack_ax(stack, top)->u.s.seq_len = SIZE_MAX;
estack_ax(stack, top)->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_PLAIN;
estack_ax(stack, top)->u.s.user = 0;
dbg_printk("load globbing pattern %s\n", insn->data);
estack_push(stack, top, ax, bx);
estack_ax(stack, top)->u.s.str = insn->data;
- estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
+ estack_ax(stack, top)->u.s.seq_len = SIZE_MAX;
estack_ax(stack, top)->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_STAR_GLOB;
estack_ax(stack, top)->u.s.user = 0;
ret = -EINVAL;
goto end;
}
- estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
+ estack_ax(stack, top)->u.s.seq_len = SIZE_MAX;
estack_ax(stack, top)->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_NONE;
estack_ax(stack, top)->u.s.user = 0;
ret = -EINVAL;
goto end;
}
- estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
+ estack_ax(stack, top)->u.s.seq_len = SIZE_MAX;
estack_ax(stack, top)->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_NONE;
estack_ax(stack, top)->u.s.user = 1;
ret = -EINVAL;
goto end;
}
- estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
+ estack_ax(stack, top)->u.s.seq_len = SIZE_MAX;
estack_ax(stack, top)->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_NONE;
next_pc += sizeof(struct load_op);