X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=blobdiff_plain;f=lttng-filter-interpreter.c;h=5ba7e230094458fd864bc7500ce60bf6988dc391;hp=ffce2150af3aacdb62789a21e413f9d7bb50ccac;hb=cd4486798c2b046ea93b89439cd705e93c40b349;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2

diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c
index ffce2150..5ba7e230 100644
--- a/lttng-filter-interpreter.c
+++ b/lttng-filter-interpreter.c
@@ -1,28 +1,21 @@
-/*
+/* SPDX-License-Identifier: MIT
+ *
  * lttng-filter-interpreter.c
  *
  * LTTng modules filter interpreter.
  *
- * Copyright (C) 2010-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Copyright (C) 2010-2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include <linux/uaccess.h>
+#include <wrapper/uaccess.h>
+#include <wrapper/frame.h>
+#include <wrapper/types.h>
+#include <linux/swab.h>
 
-#include "lttng-filter.h"
+#include <lttng/filter.h>
+#include <lttng/string-utils.h>
+
+LTTNG_STACK_FRAME_NON_STANDARD(lttng_filter_interpret_bytecode);
 
 /*
  * get_char should be called with page fault handler disabled if it is expected
@@ -37,7 +30,7 @@ char get_char(struct estack_entry *reg, size_t offset)
 		char c;
 
 		/* Handle invalid access as end of string. */
-		if (unlikely(!access_ok(VERIFY_READ,
+		if (unlikely(!lttng_access_ok(VERIFY_READ,
 				reg->u.s.user_str + offset,
 				sizeof(c))))
 			return '\0';
@@ -78,6 +71,49 @@ int parse_char(struct estack_entry *reg, char *c, size_t *offset)
 	}
 }
 
+static
+char get_char_at_cb(size_t at, void *data)
+{
+	return get_char(data, at);
+}
+
+static
+int stack_star_glob_match(struct estack *stack, int top, const char *cmp_type)
+{
+	bool has_user = false;
+	mm_segment_t old_fs;
+	int result;
+	struct estack_entry *pattern_reg;
+	struct estack_entry *candidate_reg;
+
+	if (estack_bx(stack, top)->u.s.user
+			|| estack_ax(stack, top)->u.s.user) {
+		has_user = true;
+		old_fs = get_fs();
+		set_fs(KERNEL_DS);
+		pagefault_disable();
+	}
+
+	/* Find out which side is the pattern vs. the candidate. */
+	if (estack_ax(stack, top)->u.s.literal_type == ESTACK_STRING_LITERAL_TYPE_STAR_GLOB) {
+		pattern_reg = estack_ax(stack, top);
+		candidate_reg = estack_bx(stack, top);
+	} else {
+		pattern_reg = estack_bx(stack, top);
+		candidate_reg = estack_ax(stack, top);
+	}
+
+	/* Perform the match operation. */
+	result = !strutils_star_glob_match_char_cb(get_char_at_cb,
+		pattern_reg, get_char_at_cb, candidate_reg);
+	if (has_user) {
+		pagefault_enable();
+		set_fs(old_fs);
+	}
+
+	return result;
+}
+
 static
 int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 {
@@ -106,7 +142,8 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 				diff = 0;
 				break;
 			} else {
-				if (estack_ax(stack, top)->u.s.literal) {
+				if (estack_ax(stack, top)->u.s.literal_type ==
+						ESTACK_STRING_LITERAL_TYPE_PLAIN) {
 					ret = parse_char(estack_ax(stack, top),
 						&char_ax, &offset_ax);
 					if (ret == -1) {
@@ -119,23 +156,20 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 			}
 		}
 		if (unlikely(char_ax == '\0')) {
-			if (char_bx == '\0') {
-				diff = 0;
-				break;
-			} else {
-				if (estack_bx(stack, top)->u.s.literal) {
-					ret = parse_char(estack_bx(stack, top),
-						&char_bx, &offset_bx);
-					if (ret == -1) {
-						diff = 0;
-						break;
-					}
+			if (estack_bx(stack, top)->u.s.literal_type ==
+					ESTACK_STRING_LITERAL_TYPE_PLAIN) {
+				ret = parse_char(estack_bx(stack, top),
+					&char_bx, &offset_bx);
+				if (ret == -1) {
+					diff = 0;
+					break;
 				}
-				diff = 1;
-				break;
 			}
+			diff = 1;
+			break;
 		}
-		if (estack_bx(stack, top)->u.s.literal) {
+		if (estack_bx(stack, top)->u.s.literal_type ==
+				ESTACK_STRING_LITERAL_TYPE_PLAIN) {
 			ret = parse_char(estack_bx(stack, top),
 				&char_bx, &offset_bx);
 			if (ret == -1) {
@@ -146,7 +180,8 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 			}
 			/* else compare both char */
 		}
-		if (estack_ax(stack, top)->u.s.literal) {
+		if (estack_ax(stack, top)->u.s.literal_type ==
+				ESTACK_STRING_LITERAL_TYPE_PLAIN) {
 			ret = parse_char(estack_ax(stack, top),
 				&char_ax, &offset_ax);
 			if (ret == -1) {
@@ -183,6 +218,7 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 }
 
 uint64_t lttng_filter_false(void *filter_data,
+		struct lttng_probe_ctx *lttng_probe_ctx,
 		const char *filter_stack_data)
 {
 	return 0;
@@ -217,7 +253,7 @@ uint64_t lttng_filter_false(void *filter_data,
  */
 
 #define START_OP							\
-	start_pc = &bytecode->data[0];					\
+	start_pc = &bytecode->code[0];					\
 	pc = next_pc = start_pc;					\
 	if (unlikely(pc - start_pc >= bytecode->len))			\
 		goto end;						\
@@ -234,12 +270,341 @@ LABEL_##name
 
 #endif
 
+static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx,
+		struct load_ptr *ptr,
+		uint32_t idx)
+{
+
+	struct lttng_ctx_field *ctx_field;
+	struct lttng_event_field *field;
+	union lttng_ctx_value v;
+
+	ctx_field = &lttng_static_ctx->fields[idx];
+	field = &ctx_field->event_field;
+	ptr->type = LOAD_OBJECT;
+	/* field is only used for types nested within variants. */
+	ptr->field = NULL;
+
+	switch (field->type.atype) {
+	case atype_integer:
+		ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
+		if (field->type.u.integer.signedness) {
+			ptr->object_type = OBJECT_TYPE_S64;
+			ptr->u.s64 = v.s64;
+			ptr->ptr = &ptr->u.s64;
+		} else {
+			ptr->object_type = OBJECT_TYPE_U64;
+			ptr->u.u64 = v.s64;	/* Cast. */
+			ptr->ptr = &ptr->u.u64;
+		}
+		break;
+	case atype_enum_nestable:
+	{
+		const struct lttng_integer_type *itype =
+			&field->type.u.enum_nestable.container_type->u.integer;
+
+		ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
+		if (itype->signedness) {
+			ptr->object_type = OBJECT_TYPE_S64;
+			ptr->u.s64 = v.s64;
+			ptr->ptr = &ptr->u.s64;
+		} else {
+			ptr->object_type = OBJECT_TYPE_U64;
+			ptr->u.u64 = v.s64;	/* Cast. */
+			ptr->ptr = &ptr->u.u64;
+		}
+		break;
+	}
+	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_nestable.elem_type->u.integer.encoding == lttng_encode_none) {
+			printk(KERN_WARNING "Only string arrays are supported for contexts.\n");
+			return -EINVAL;
+		}
+		ptr->object_type = OBJECT_TYPE_STRING;
+		ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
+		ptr->ptr = v.str;
+		break;
+	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_nestable.elem_type->u.integer.encoding == lttng_encode_none) {
+			printk(KERN_WARNING "Only string sequences are supported for contexts.\n");
+			return -EINVAL;
+		}
+		ptr->object_type = OBJECT_TYPE_STRING;
+		ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
+		ptr->ptr = v.str;
+		break;
+	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_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;
+	}
+	return 0;
+}
+
+static int dynamic_get_index(struct lttng_probe_ctx *lttng_probe_ctx,
+		struct bytecode_runtime *runtime,
+		uint64_t index, struct estack_entry *stack_top)
+{
+	int ret;
+	const struct filter_get_index_data *gid;
+
+	/*
+	 * Types nested within variants need to perform dynamic lookup
+	 * based on the field descriptions. LTTng-UST does not implement
+	 * variants for now.
+	 */
+	if (stack_top->u.ptr.field)
+		return -EINVAL;
+	gid = (const struct filter_get_index_data *) &runtime->data[index];
+	switch (stack_top->u.ptr.type) {
+	case LOAD_OBJECT:
+		switch (stack_top->u.ptr.object_type) {
+		case OBJECT_TYPE_ARRAY:
+		{
+			const char *ptr;
+
+			WARN_ON_ONCE(gid->offset >= gid->array_len);
+			/* Skip count (unsigned long) */
+			ptr = *(const char **) (stack_top->u.ptr.ptr + sizeof(unsigned long));
+			ptr = ptr + gid->offset;
+			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;
+			/* field is only used for types nested within variants. */
+			stack_top->u.ptr.field = NULL;
+			break;
+		}
+		case OBJECT_TYPE_SEQUENCE:
+		{
+			const char *ptr;
+			size_t ptr_seq_len;
+
+			ptr = *(const char **) (stack_top->u.ptr.ptr + sizeof(unsigned long));
+			ptr_seq_len = *(unsigned long *) stack_top->u.ptr.ptr;
+			if (gid->offset >= gid->elem.len * ptr_seq_len) {
+				ret = -EINVAL;
+				goto end;
+			}
+			ptr = ptr + gid->offset;
+			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;
+			/* field is only used for types nested within variants. */
+			stack_top->u.ptr.field = NULL;
+			break;
+		}
+		case OBJECT_TYPE_STRUCT:
+			printk(KERN_WARNING "Nested structures are not supported yet.\n");
+			ret = -EINVAL;
+			goto end;
+		case OBJECT_TYPE_VARIANT:
+		default:
+			printk(KERN_WARNING "Unexpected get index type %d",
+				(int) stack_top->u.ptr.object_type);
+			ret = -EINVAL;
+			goto end;
+		}
+		break;
+	case LOAD_ROOT_CONTEXT:
+	case LOAD_ROOT_APP_CONTEXT:	/* Fall-through */
+	{
+		ret = context_get_index(lttng_probe_ctx,
+				&stack_top->u.ptr,
+				gid->ctx_index);
+		if (ret) {
+			goto end;
+		}
+		break;
+	}
+	case LOAD_ROOT_PAYLOAD:
+		stack_top->u.ptr.ptr += gid->offset;
+		if (gid->elem.type == OBJECT_TYPE_STRING)
+			stack_top->u.ptr.ptr = *(const char * const *) stack_top->u.ptr.ptr;
+		stack_top->u.ptr.object_type = gid->elem.type;
+		stack_top->u.ptr.type = LOAD_OBJECT;
+		/* field is only used for types nested within variants. */
+		stack_top->u.ptr.field = NULL;
+		break;
+	}
+	return 0;
+
+end:
+	return ret;
+}
+
+static int dynamic_load_field(struct estack_entry *stack_top)
+{
+	int ret;
+
+	switch (stack_top->u.ptr.type) {
+	case LOAD_OBJECT:
+		break;
+	case LOAD_ROOT_CONTEXT:
+	case LOAD_ROOT_APP_CONTEXT:
+	case LOAD_ROOT_PAYLOAD:
+	default:
+		dbg_printk("Filter warning: cannot load root, missing field name.\n");
+		ret = -EINVAL;
+		goto end;
+	}
+	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;
+		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.rev_bo)
+			__swab16s(&tmp);
+		stack_top->u.v = tmp;
+		break;
+	}
+	case OBJECT_TYPE_S32:
+	{
+		int32_t tmp;
+
+		dbg_printk("op load field s32\n");
+		tmp = *(int32_t *) stack_top->u.ptr.ptr;
+		if (stack_top->u.ptr.rev_bo)
+			__swab32s(&tmp);
+		stack_top->u.v = tmp;
+		break;
+	}
+	case OBJECT_TYPE_S64:
+	{
+		int64_t tmp;
+
+		dbg_printk("op load field s64\n");
+		tmp = *(int64_t *) stack_top->u.ptr.ptr;
+		if (stack_top->u.ptr.rev_bo)
+			__swab64s(&tmp);
+		stack_top->u.v = tmp;
+		break;
+	}
+	case OBJECT_TYPE_U8:
+		dbg_printk("op load field u8\n");
+		stack_top->u.v = *(uint8_t *) stack_top->u.ptr.ptr;
+		break;
+	case OBJECT_TYPE_U16:
+	{
+		uint16_t tmp;
+
+		dbg_printk("op load field s16\n");
+		tmp = *(uint16_t *) stack_top->u.ptr.ptr;
+		if (stack_top->u.ptr.rev_bo)
+			__swab16s(&tmp);
+		stack_top->u.v = tmp;
+		break;
+	}
+	case OBJECT_TYPE_U32:
+	{
+		uint32_t tmp;
+
+		dbg_printk("op load field u32\n");
+		tmp = *(uint32_t *) stack_top->u.ptr.ptr;
+		if (stack_top->u.ptr.rev_bo)
+			__swab32s(&tmp);
+		stack_top->u.v = tmp;
+		break;
+	}
+	case OBJECT_TYPE_U64:
+	{
+		uint64_t tmp;
+
+		dbg_printk("op load field u64\n");
+		tmp = *(uint64_t *) stack_top->u.ptr.ptr;
+		if (stack_top->u.ptr.rev_bo)
+			__swab64s(&tmp);
+		stack_top->u.v = tmp;
+		break;
+	}
+	case OBJECT_TYPE_STRING:
+	{
+		const char *str;
+
+		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("Filter warning: loading a NULL string.\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		stack_top->u.s.seq_len = LTTNG_SIZE_MAX;
+		stack_top->u.s.literal_type =
+			ESTACK_STRING_LITERAL_TYPE_NONE;
+		break;
+	}
+	case OBJECT_TYPE_STRING_SEQUENCE:
+	{
+		const char *ptr;
+
+		dbg_printk("op load field string sequence\n");
+		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("Filter warning: loading a NULL sequence.\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		stack_top->u.s.literal_type =
+			ESTACK_STRING_LITERAL_TYPE_NONE;
+		break;
+	}
+	case OBJECT_TYPE_DYNAMIC:
+		/*
+		 * Dynamic types in context are looked up
+		 * by context get index.
+		 */
+		ret = -EINVAL;
+		goto end;
+	case OBJECT_TYPE_DOUBLE:
+		ret = -EINVAL;
+		goto end;
+	case OBJECT_TYPE_SEQUENCE:
+	case OBJECT_TYPE_ARRAY:
+	case OBJECT_TYPE_STRUCT:
+	case OBJECT_TYPE_VARIANT:
+		printk(KERN_WARNING "Sequences, arrays, struct and variant cannot be loaded (nested types).\n");
+		ret = -EINVAL;
+		goto end;
+	}
+	return 0;
+
+end:
+	return ret;
+}
+
 /*
  * Return 0 (discard), or raise the 0x1 flag (log event).
  * Currently, other flags are kept for future extensions and have no
  * effect.
  */
 uint64_t lttng_filter_interpret_bytecode(void *filter_data,
+		struct lttng_probe_ctx *lttng_probe_ctx,
 		const char *filter_stack_data)
 {
 	struct bytecode_runtime *bytecode = filter_data;
@@ -262,11 +627,11 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		[ FILTER_OP_MOD ] = &&LABEL_FILTER_OP_MOD,
 		[ FILTER_OP_PLUS ] = &&LABEL_FILTER_OP_PLUS,
 		[ FILTER_OP_MINUS ] = &&LABEL_FILTER_OP_MINUS,
-		[ FILTER_OP_RSHIFT ] = &&LABEL_FILTER_OP_RSHIFT,
-		[ FILTER_OP_LSHIFT ] = &&LABEL_FILTER_OP_LSHIFT,
-		[ FILTER_OP_BIN_AND ] = &&LABEL_FILTER_OP_BIN_AND,
-		[ FILTER_OP_BIN_OR ] = &&LABEL_FILTER_OP_BIN_OR,
-		[ FILTER_OP_BIN_XOR ] = &&LABEL_FILTER_OP_BIN_XOR,
+		[ FILTER_OP_BIT_RSHIFT ] = &&LABEL_FILTER_OP_BIT_RSHIFT,
+		[ FILTER_OP_BIT_LSHIFT ] = &&LABEL_FILTER_OP_BIT_LSHIFT,
+		[ FILTER_OP_BIT_AND ] = &&LABEL_FILTER_OP_BIT_AND,
+		[ FILTER_OP_BIT_OR ] = &&LABEL_FILTER_OP_BIT_OR,
+		[ FILTER_OP_BIT_XOR ] = &&LABEL_FILTER_OP_BIT_XOR,
 
 		/* binary comparators */
 		[ FILTER_OP_EQ ] = &&LABEL_FILTER_OP_EQ,
@@ -284,6 +649,10 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		[ FILTER_OP_GE_STRING ] = &&LABEL_FILTER_OP_GE_STRING,
 		[ FILTER_OP_LE_STRING ] = &&LABEL_FILTER_OP_LE_STRING,
 
+		/* globbing pattern binary comparator */
+		[ FILTER_OP_EQ_STAR_GLOB_STRING ] = &&LABEL_FILTER_OP_EQ_STAR_GLOB_STRING,
+		[ FILTER_OP_NE_STAR_GLOB_STRING ] = &&LABEL_FILTER_OP_NE_STAR_GLOB_STRING,
+
 		/* s64 binary comparator */
 		[ FILTER_OP_EQ_S64 ] = &&LABEL_FILTER_OP_EQ_S64,
 		[ FILTER_OP_NE_S64 ] = &&LABEL_FILTER_OP_NE_S64,
@@ -339,6 +708,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 
 		/* load from immediate operand */
 		[ FILTER_OP_LOAD_STRING ] = &&LABEL_FILTER_OP_LOAD_STRING,
+		[ FILTER_OP_LOAD_STAR_GLOB_STRING ] = &&LABEL_FILTER_OP_LOAD_STAR_GLOB_STRING,
 		[ FILTER_OP_LOAD_S64 ] = &&LABEL_FILTER_OP_LOAD_S64,
 		[ FILTER_OP_LOAD_DOUBLE ] = &&LABEL_FILTER_OP_LOAD_DOUBLE,
 
@@ -356,6 +726,33 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		/* load userspace field ref */
 		[ FILTER_OP_LOAD_FIELD_REF_USER_STRING ] = &&LABEL_FILTER_OP_LOAD_FIELD_REF_USER_STRING,
 		[ FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE ] = &&LABEL_FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE,
+
+		/* Instructions for recursive traversal through composed types. */
+		[ FILTER_OP_GET_CONTEXT_ROOT ] = &&LABEL_FILTER_OP_GET_CONTEXT_ROOT,
+		[ FILTER_OP_GET_APP_CONTEXT_ROOT ] = &&LABEL_FILTER_OP_GET_APP_CONTEXT_ROOT,
+		[ FILTER_OP_GET_PAYLOAD_ROOT ] = &&LABEL_FILTER_OP_GET_PAYLOAD_ROOT,
+
+		[ FILTER_OP_GET_SYMBOL ] = &&LABEL_FILTER_OP_GET_SYMBOL,
+		[ FILTER_OP_GET_SYMBOL_FIELD ] = &&LABEL_FILTER_OP_GET_SYMBOL_FIELD,
+		[ FILTER_OP_GET_INDEX_U16 ] = &&LABEL_FILTER_OP_GET_INDEX_U16,
+		[ FILTER_OP_GET_INDEX_U64 ] = &&LABEL_FILTER_OP_GET_INDEX_U64,
+
+		[ FILTER_OP_LOAD_FIELD ] = &&LABEL_FILTER_OP_LOAD_FIELD,
+		[ FILTER_OP_LOAD_FIELD_S8	 ] = &&LABEL_FILTER_OP_LOAD_FIELD_S8,
+		[ FILTER_OP_LOAD_FIELD_S16 ] = &&LABEL_FILTER_OP_LOAD_FIELD_S16,
+		[ FILTER_OP_LOAD_FIELD_S32 ] = &&LABEL_FILTER_OP_LOAD_FIELD_S32,
+		[ FILTER_OP_LOAD_FIELD_S64 ] = &&LABEL_FILTER_OP_LOAD_FIELD_S64,
+		[ FILTER_OP_LOAD_FIELD_U8 ] = &&LABEL_FILTER_OP_LOAD_FIELD_U8,
+		[ FILTER_OP_LOAD_FIELD_U16 ] = &&LABEL_FILTER_OP_LOAD_FIELD_U16,
+		[ FILTER_OP_LOAD_FIELD_U32 ] = &&LABEL_FILTER_OP_LOAD_FIELD_U32,
+		[ FILTER_OP_LOAD_FIELD_U64 ] = &&LABEL_FILTER_OP_LOAD_FIELD_U64,
+		[ FILTER_OP_LOAD_FIELD_STRING ] = &&LABEL_FILTER_OP_LOAD_FIELD_STRING,
+		[ FILTER_OP_LOAD_FIELD_SEQUENCE ] = &&LABEL_FILTER_OP_LOAD_FIELD_SEQUENCE,
+		[ FILTER_OP_LOAD_FIELD_DOUBLE ] = &&LABEL_FILTER_OP_LOAD_FIELD_DOUBLE,
+
+		[ FILTER_OP_UNARY_BIT_NOT ] = &&LABEL_FILTER_OP_UNARY_BIT_NOT,
+
+		[ FILTER_OP_RETURN_S64 ] = &&LABEL_FILTER_OP_RETURN_S64,
 	};
 #endif /* #ifndef INTERPRETER_USE_SWITCH */
 
@@ -373,6 +770,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			goto end;
 
 		OP(FILTER_OP_RETURN):
+		OP(FILTER_OP_RETURN_S64):
 			/* LTTNG_FILTER_DISCARD  or LTTNG_FILTER_RECORD_FLAG */
 			retval = !!estack_ax_v;
 			ret = 0;
@@ -384,11 +782,6 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		OP(FILTER_OP_MOD):
 		OP(FILTER_OP_PLUS):
 		OP(FILTER_OP_MINUS):
-		OP(FILTER_OP_RSHIFT):
-		OP(FILTER_OP_LSHIFT):
-		OP(FILTER_OP_BIN_AND):
-		OP(FILTER_OP_BIN_OR):
-		OP(FILTER_OP_BIN_XOR):
 			printk(KERN_WARNING "unsupported bytecode op %u\n",
 				(unsigned int) *(filter_opcode_t *) pc);
 			ret = -EINVAL;
@@ -466,6 +859,27 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			PO;
 		}
 
+		OP(FILTER_OP_EQ_STAR_GLOB_STRING):
+		{
+			int res;
+
+			res = (stack_star_glob_match(stack, top, "==") == 0);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_NE_STAR_GLOB_STRING):
+		{
+			int res;
+
+			res = (stack_star_glob_match(stack, top, "!=") != 0);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+
 		OP(FILTER_OP_EQ_S64):
 		{
 			int res;
@@ -555,6 +969,66 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			BUG_ON(1);
 			PO;
 		}
+		OP(FILTER_OP_BIT_RSHIFT):
+		{
+			int64_t res;
+
+			/* Catch undefined behavior. */
+			if (unlikely(estack_ax_v < 0 || estack_ax_v >= 64)) {
+				ret = -EINVAL;
+				goto end;
+			}
+			res = ((uint64_t) estack_bx_v >> (uint32_t) estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_BIT_LSHIFT):
+		{
+			int64_t res;
+
+			/* Catch undefined behavior. */
+			if (unlikely(estack_ax_v < 0 || estack_ax_v >= 64)) {
+				ret = -EINVAL;
+				goto end;
+			}
+			res = ((uint64_t) estack_bx_v << (uint32_t) estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_BIT_AND):
+		{
+			int64_t res;
+
+			res = ((uint64_t) estack_bx_v & (uint64_t) estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_BIT_OR):
+		{
+			int64_t res;
+
+			res = ((uint64_t) estack_bx_v | (uint64_t) estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
+		OP(FILTER_OP_BIT_XOR):
+		{
+			int64_t res;
+
+			res = ((uint64_t) estack_bx_v ^ (uint64_t) estack_ax_v);
+			estack_pop(stack, top, ax, bx);
+			estack_ax_v = res;
+			next_pc += sizeof(struct binary_op);
+			PO;
+		}
 
 		/* unary */
 		OP(FILTER_OP_UNARY_PLUS):
@@ -566,6 +1040,13 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			goto end;
 
 
+		OP(FILTER_OP_UNARY_BIT_NOT):
+		{
+			estack_ax_v = ~(uint64_t) estack_ax_v;
+			next_pc += sizeof(struct unary_op);
+			PO;
+		}
+
 		OP(FILTER_OP_UNARY_PLUS_S64):
 		{
 			next_pc += sizeof(struct unary_op);
@@ -648,8 +1129,9 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 				ret = -EINVAL;
 				goto end;
 			}
-			estack_ax(stack, top)->u.s.seq_len = UINT_MAX;
-			estack_ax(stack, top)->u.s.literal = 0;
+			estack_ax(stack, top)->u.s.seq_len = LTTNG_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("ref load string %s\n", estack_ax(stack, top)->u.s.str);
 			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
@@ -674,7 +1156,8 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 				ret = -EINVAL;
 				goto end;
 			}
-			estack_ax(stack, top)->u.s.literal = 0;
+			estack_ax(stack, top)->u.s.literal_type =
+				ESTACK_STRING_LITERAL_TYPE_NONE;
 			estack_ax(stack, top)->u.s.user = 0;
 			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
 			PO;
@@ -710,8 +1193,24 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			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 = UINT_MAX;
-			estack_ax(stack, top)->u.s.literal = 1;
+			estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
+			estack_ax(stack, top)->u.s.literal_type =
+				ESTACK_STRING_LITERAL_TYPE_PLAIN;
+			estack_ax(stack, top)->u.s.user = 0;
+			next_pc += sizeof(struct load_op) + strlen(insn->data) + 1;
+			PO;
+		}
+
+		OP(FILTER_OP_LOAD_STAR_GLOB_STRING):
+		{
+			struct load_op *insn = (struct load_op *) pc;
+
+			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.literal_type =
+				ESTACK_STRING_LITERAL_TYPE_STAR_GLOB;
 			estack_ax(stack, top)->u.s.user = 0;
 			next_pc += sizeof(struct load_op) + strlen(insn->data) + 1;
 			PO;
@@ -766,7 +1265,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			dbg_printk("get context ref offset %u type string\n",
 				ref->offset);
 			ctx_field = &lttng_static_ctx->fields[ref->offset];
-			ctx_field->get_value(ctx_field, &v);
+			ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
 			estack_push(stack, top, ax, bx);
 			estack_ax(stack, top)->u.s.str = v.str;
 			if (unlikely(!estack_ax(stack, top)->u.s.str)) {
@@ -774,8 +1273,9 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 				ret = -EINVAL;
 				goto end;
 			}
-			estack_ax(stack, top)->u.s.seq_len = UINT_MAX;
-			estack_ax(stack, top)->u.s.literal = 0;
+			estack_ax(stack, top)->u.s.seq_len = LTTNG_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("ref get context string %s\n", estack_ax(stack, top)->u.s.str);
 			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
@@ -792,7 +1292,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			dbg_printk("get context ref offset %u type s64\n",
 				ref->offset);
 			ctx_field = &lttng_static_ctx->fields[ref->offset];
-			ctx_field->get_value(ctx_field, &v);
+			ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
 			estack_push(stack, top, ax, bx);
 			estack_ax_v = v.s64;
 			dbg_printk("ref get context s64 %lld\n",
@@ -816,15 +1316,16 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			dbg_printk("load field ref offset %u type user string\n",
 				ref->offset);
 			estack_push(stack, top, ax, bx);
-			estack_ax(stack, top)->u.s.str =
+			estack_ax(stack, top)->u.s.user_str =
 				*(const char * const *) &filter_stack_data[ref->offset];
 			if (unlikely(!estack_ax(stack, top)->u.s.str)) {
 				dbg_printk("Filter warning: loading a NULL string.\n");
 				ret = -EINVAL;
 				goto end;
 			}
-			estack_ax(stack, top)->u.s.seq_len = UINT_MAX;
-			estack_ax(stack, top)->u.s.literal = 0;
+			estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
+			estack_ax(stack, top)->u.s.literal_type =
+				ESTACK_STRING_LITERAL_TYPE_NONE;
 			estack_ax(stack, top)->u.s.user = 1;
 			dbg_printk("ref load string %s\n", estack_ax(stack, top)->u.s.str);
 			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
@@ -841,7 +1342,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			estack_push(stack, top, ax, bx);
 			estack_ax(stack, top)->u.s.seq_len =
 				*(unsigned long *) &filter_stack_data[ref->offset];
-			estack_ax(stack, top)->u.s.str =
+			estack_ax(stack, top)->u.s.user_str =
 				*(const char **) (&filter_stack_data[ref->offset
 								+ sizeof(unsigned long)]);
 			if (unlikely(!estack_ax(stack, top)->u.s.str)) {
@@ -849,12 +1350,221 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 				ret = -EINVAL;
 				goto end;
 			}
-			estack_ax(stack, top)->u.s.literal = 0;
+			estack_ax(stack, top)->u.s.literal_type =
+				ESTACK_STRING_LITERAL_TYPE_NONE;
 			estack_ax(stack, top)->u.s.user = 1;
 			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
 			PO;
 		}
 
+		OP(FILTER_OP_GET_CONTEXT_ROOT):
+		{
+			dbg_printk("op get context root\n");
+			estack_push(stack, top, ax, bx);
+			estack_ax(stack, top)->u.ptr.type = LOAD_ROOT_CONTEXT;
+			/* "field" only needed for variants. */
+			estack_ax(stack, top)->u.ptr.field = NULL;
+			next_pc += sizeof(struct load_op);
+			PO;
+		}
+
+		OP(FILTER_OP_GET_APP_CONTEXT_ROOT):
+		{
+			BUG_ON(1);
+			PO;
+		}
+
+		OP(FILTER_OP_GET_PAYLOAD_ROOT):
+		{
+			dbg_printk("op get app payload root\n");
+			estack_push(stack, top, ax, bx);
+			estack_ax(stack, top)->u.ptr.type = LOAD_ROOT_PAYLOAD;
+			estack_ax(stack, top)->u.ptr.ptr = filter_stack_data;
+			/* "field" only needed for variants. */
+			estack_ax(stack, top)->u.ptr.field = NULL;
+			next_pc += sizeof(struct load_op);
+			PO;
+		}
+
+		OP(FILTER_OP_GET_SYMBOL):
+		{
+			dbg_printk("op get symbol\n");
+			switch (estack_ax(stack, top)->u.ptr.type) {
+			case LOAD_OBJECT:
+				printk(KERN_WARNING "Nested fields not implemented yet.\n");
+				ret = -EINVAL;
+				goto end;
+			case LOAD_ROOT_CONTEXT:
+			case LOAD_ROOT_APP_CONTEXT:
+			case LOAD_ROOT_PAYLOAD:
+				/*
+				 * symbol lookup is performed by
+				 * specialization.
+				 */
+				ret = -EINVAL;
+				goto end;
+			}
+			next_pc += sizeof(struct load_op) + sizeof(struct get_symbol);
+			PO;
+		}
+
+		OP(FILTER_OP_GET_SYMBOL_FIELD):
+		{
+			/*
+			 * Used for first variant encountered in a
+			 * traversal. Variants are not implemented yet.
+			 */
+			ret = -EINVAL;
+			goto end;
+		}
+
+		OP(FILTER_OP_GET_INDEX_U16):
+		{
+			struct load_op *insn = (struct load_op *) pc;
+			struct get_index_u16 *index = (struct get_index_u16 *) insn->data;
+
+			dbg_printk("op get index u16\n");
+			ret = dynamic_get_index(lttng_probe_ctx, bytecode, index->index, estack_ax(stack, top));
+			if (ret)
+				goto end;
+			estack_ax_v = estack_ax(stack, top)->u.v;
+			next_pc += sizeof(struct load_op) + sizeof(struct get_index_u16);
+			PO;
+		}
+
+		OP(FILTER_OP_GET_INDEX_U64):
+		{
+			struct load_op *insn = (struct load_op *) pc;
+			struct get_index_u64 *index = (struct get_index_u64 *) insn->data;
+
+			dbg_printk("op get index u64\n");
+			ret = dynamic_get_index(lttng_probe_ctx, bytecode, index->index, estack_ax(stack, top));
+			if (ret)
+				goto end;
+			estack_ax_v = estack_ax(stack, top)->u.v;
+			next_pc += sizeof(struct load_op) + sizeof(struct get_index_u64);
+			PO;
+		}
+
+		OP(FILTER_OP_LOAD_FIELD):
+		{
+			dbg_printk("op load field\n");
+			ret = dynamic_load_field(estack_ax(stack, top));
+			if (ret)
+				goto end;
+			estack_ax_v = estack_ax(stack, top)->u.v;
+			next_pc += sizeof(struct load_op);
+			PO;
+		}
+
+		OP(FILTER_OP_LOAD_FIELD_S8):
+		{
+			dbg_printk("op load field s8\n");
+
+			estack_ax_v = *(int8_t *) estack_ax(stack, top)->u.ptr.ptr;
+			next_pc += sizeof(struct load_op);
+			PO;
+		}
+		OP(FILTER_OP_LOAD_FIELD_S16):
+		{
+			dbg_printk("op load field s16\n");
+
+			estack_ax_v = *(int16_t *) estack_ax(stack, top)->u.ptr.ptr;
+			next_pc += sizeof(struct load_op);
+			PO;
+		}
+		OP(FILTER_OP_LOAD_FIELD_S32):
+		{
+			dbg_printk("op load field s32\n");
+
+			estack_ax_v = *(int32_t *) estack_ax(stack, top)->u.ptr.ptr;
+			next_pc += sizeof(struct load_op);
+			PO;
+		}
+		OP(FILTER_OP_LOAD_FIELD_S64):
+		{
+			dbg_printk("op load field s64\n");
+
+			estack_ax_v = *(int64_t *) estack_ax(stack, top)->u.ptr.ptr;
+			next_pc += sizeof(struct load_op);
+			PO;
+		}
+		OP(FILTER_OP_LOAD_FIELD_U8):
+		{
+			dbg_printk("op load field u8\n");
+
+			estack_ax_v = *(uint8_t *) estack_ax(stack, top)->u.ptr.ptr;
+			next_pc += sizeof(struct load_op);
+			PO;
+		}
+		OP(FILTER_OP_LOAD_FIELD_U16):
+		{
+			dbg_printk("op load field u16\n");
+
+			estack_ax_v = *(uint16_t *) estack_ax(stack, top)->u.ptr.ptr;
+			next_pc += sizeof(struct load_op);
+			PO;
+		}
+		OP(FILTER_OP_LOAD_FIELD_U32):
+		{
+			dbg_printk("op load field u32\n");
+
+			estack_ax_v = *(uint32_t *) estack_ax(stack, top)->u.ptr.ptr;
+			next_pc += sizeof(struct load_op);
+			PO;
+		}
+		OP(FILTER_OP_LOAD_FIELD_U64):
+		{
+			dbg_printk("op load field u64\n");
+
+			estack_ax_v = *(uint64_t *) estack_ax(stack, top)->u.ptr.ptr;
+			next_pc += sizeof(struct load_op);
+			PO;
+		}
+		OP(FILTER_OP_LOAD_FIELD_DOUBLE):
+		{
+			ret = -EINVAL;
+			goto end;
+		}
+
+		OP(FILTER_OP_LOAD_FIELD_STRING):
+		{
+			const char *str;
+
+			dbg_printk("op load field string\n");
+			str = (const char *) estack_ax(stack, top)->u.ptr.ptr;
+			estack_ax(stack, top)->u.s.str = str;
+			if (unlikely(!estack_ax(stack, top)->u.s.str)) {
+				dbg_printk("Filter warning: loading a NULL string.\n");
+				ret = -EINVAL;
+				goto end;
+			}
+			estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
+			estack_ax(stack, top)->u.s.literal_type =
+				ESTACK_STRING_LITERAL_TYPE_NONE;
+			next_pc += sizeof(struct load_op);
+			PO;
+		}
+
+		OP(FILTER_OP_LOAD_FIELD_SEQUENCE):
+		{
+			const char *ptr;
+
+			dbg_printk("op load field string sequence\n");
+			ptr = estack_ax(stack, top)->u.ptr.ptr;
+			estack_ax(stack, top)->u.s.seq_len = *(unsigned long *) ptr;
+			estack_ax(stack, top)->u.s.str = *(const char **) (ptr + sizeof(unsigned long));
+			if (unlikely(!estack_ax(stack, top)->u.s.str)) {
+				dbg_printk("Filter warning: loading a NULL sequence.\n");
+				ret = -EINVAL;
+				goto end;
+			}
+			estack_ax(stack, top)->u.s.literal_type =
+				ESTACK_STRING_LITERAL_TYPE_NONE;
+			next_pc += sizeof(struct load_op);
+			PO;
+		}
+
 	END_OP
 end:
 	/* return 0 (discard) on error */