X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-validator.c;h=eb3d67d89e66ac70db54746e6d01e7ebaedbdb48;hb=649fb6b3dda80cf5e321e2e6f29cfc398701f78d;hp=a41deb5e7ac54bdd1df2b8a842f368d3a556fd76;hpb=71c1ceeb09675681606ac8c81cbc6fcb363da9e3;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter-validator.c b/liblttng-ust/lttng-filter-validator.c
index a41deb5e..eb3d67d8 100644
--- a/liblttng-ust/lttng-filter-validator.c
+++ b/liblttng-ust/lttng-filter-validator.c
@@ -74,7 +74,9 @@ int merge_points_compare(const struct vstack *stacka,
 	len = stacka->top + 1;
 	assert(len >= 0);
 	for (i = 0; i < len; i++) {
-		if (stacka->e[i].type != stackb->e[i].type)
+		if (stacka->e[i].type != REG_UNKNOWN
+				&& stackb->e[i].type != REG_UNKNOWN
+				&& stacka->e[i].type != stackb->e[i].type)
 			return 1;
 	}
 	return 0;
@@ -85,7 +87,7 @@ int merge_point_add_check(struct cds_lfht *ht, unsigned long target_pc,
 		const struct vstack *stack)
 {
 	struct lfht_mp_node *node;
-	unsigned long hash = lttng_hash_mix((const void *) target_pc,
+	unsigned long hash = lttng_hash_mix((const char *) target_pc,
 				sizeof(target_pc),
 				lttng_hash_seed);
 	struct cds_lfht_node *ret;
@@ -98,7 +100,7 @@ int merge_point_add_check(struct cds_lfht *ht, unsigned long target_pc,
 	node->target_pc = target_pc;
 	memcpy(&node->stack, stack, sizeof(node->stack));
 	ret = cds_lfht_add_unique(ht, hash, lttng_hash_match,
-		(const void *) target_pc, &node->node);
+		(const char *) target_pc, &node->node);
 	if (ret != &node->node) {
 		struct lfht_mp_node *ret_mp =
 			caa_container_of(ret, struct lfht_mp_node, node);
@@ -118,22 +120,28 @@ int merge_point_add_check(struct cds_lfht *ht, unsigned long target_pc,
 
 /*
  * Binary comparators use top of stack and top of stack -1.
+ * Return 0 if typing is known to match, 1 if typing is dynamic
+ * (unknown), negative error value on error.
  */
 static
 int bin_op_compare_check(struct vstack *stack, const char *str)
 {
 	if (unlikely(!vstack_ax(stack) || !vstack_bx(stack)))
-		goto error_unknown;
+		goto error_empty;
 
 	switch (vstack_ax(stack)->type) {
 	default:
-		goto error_unknown;
+		goto error_type;
 
+	case REG_UNKNOWN:
+		goto unknown;
 	case REG_STRING:
 		switch (vstack_bx(stack)->type) {
 		default:
-			goto error_unknown;
+			goto error_type;
 
+		case REG_UNKNOWN:
+			goto unknown;
 		case REG_STRING:
 			break;
 		case REG_S64:
@@ -145,11 +153,12 @@ int bin_op_compare_check(struct vstack *stack, const char *str)
 	case REG_DOUBLE:
 		switch (vstack_bx(stack)->type) {
 		default:
-			goto error_unknown;
+			goto error_type;
 
+		case REG_UNKNOWN:
+			goto unknown;
 		case REG_STRING:
 			goto error_mismatch;
-
 		case REG_S64:
 		case REG_DOUBLE:
 			break;
@@ -158,12 +167,20 @@ int bin_op_compare_check(struct vstack *stack, const char *str)
 	}
 	return 0;
 
-error_unknown:
-	return -EINVAL;
+unknown:
+	return 1;
 
 error_mismatch:
 	ERR("type mismatch for '%s' binary operator\n", str);
 	return -EINVAL;
+
+error_empty:
+	ERR("empty stack for '%s' binary operator\n", str);
+	return -EINVAL;
+
+error_type:
+	ERR("unknown type for '%s' binary operator\n", str);
+	return -EINVAL;
 }
 
 /*
@@ -172,7 +189,7 @@ error_mismatch:
  */
 static
 int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
-		void *start_pc, void *pc)
+		char *start_pc, char *pc)
 {
 	int ret = 0;
 
@@ -190,7 +207,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	{
 		if (unlikely(pc + sizeof(struct return_op)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
@@ -237,10 +254,22 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	case FILTER_OP_LT_DOUBLE:
 	case FILTER_OP_GE_DOUBLE:
 	case FILTER_OP_LE_DOUBLE:
+	case FILTER_OP_EQ_DOUBLE_S64:
+	case FILTER_OP_NE_DOUBLE_S64:
+	case FILTER_OP_GT_DOUBLE_S64:
+	case FILTER_OP_LT_DOUBLE_S64:
+	case FILTER_OP_GE_DOUBLE_S64:
+	case FILTER_OP_LE_DOUBLE_S64:
+	case FILTER_OP_EQ_S64_DOUBLE:
+	case FILTER_OP_NE_S64_DOUBLE:
+	case FILTER_OP_GT_S64_DOUBLE:
+	case FILTER_OP_LT_S64_DOUBLE:
+	case FILTER_OP_GE_S64_DOUBLE:
+	case FILTER_OP_LE_S64_DOUBLE:
 	{
 		if (unlikely(pc + sizeof(struct binary_op)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
@@ -258,7 +287,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	{
 		if (unlikely(pc + sizeof(struct unary_op)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
@@ -269,30 +298,36 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	{
 		if (unlikely(pc + sizeof(struct logical_op)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
 
-	/* load */
+	/* load field ref */
 	case FILTER_OP_LOAD_FIELD_REF:
 	{
 		ERR("Unknown field ref type\n");
 		ret = -EINVAL;
 		break;
 	}
+	/* get context ref */
+	case FILTER_OP_GET_CONTEXT_REF:
 	case FILTER_OP_LOAD_FIELD_REF_STRING:
 	case FILTER_OP_LOAD_FIELD_REF_SEQUENCE:
 	case FILTER_OP_LOAD_FIELD_REF_S64:
 	case FILTER_OP_LOAD_FIELD_REF_DOUBLE:
+	case FILTER_OP_GET_CONTEXT_REF_STRING:
+	case FILTER_OP_GET_CONTEXT_REF_S64:
+	case FILTER_OP_GET_CONTEXT_REF_DOUBLE:
 	{
 		if (unlikely(pc + sizeof(struct load_op) + sizeof(struct field_ref)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
 
+	/* load from immediate operand */
 	case FILTER_OP_LOAD_STRING:
 	{
 		struct load_op *insn = (struct load_op *) pc;
@@ -300,7 +335,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 
 		if (unlikely(pc + sizeof(struct load_op)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 			break;
 		}
 
@@ -308,7 +343,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 		str_len = strnlen(insn->data, maxlen);
 		if (unlikely(str_len >= maxlen)) {
 			/* Final '\0' not found within range */
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
@@ -317,7 +352,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	{
 		if (unlikely(pc + sizeof(struct load_op) + sizeof(struct literal_numeric)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
@@ -326,7 +361,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	{
 		if (unlikely(pc + sizeof(struct load_op) + sizeof(struct literal_double)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
@@ -337,10 +372,11 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	{
 		if (unlikely(pc + sizeof(struct cast_op)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
+
 	}
 
 	return ret;
@@ -367,14 +403,14 @@ unsigned long delete_all_nodes(struct cds_lfht *ht)
 
 /*
  * Return value:
- * 0: success
+ * >=0: success
  * <0: error
  */
 static
 int validate_instruction_context(struct bytecode_runtime *bytecode,
 		struct vstack *stack,
-		void *start_pc,
-		void *pc)
+		char *start_pc,
+		char *pc)
 {
 	int ret = 0;
 
@@ -414,42 +450,42 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 	case FILTER_OP_EQ:
 	{
 		ret = bin_op_compare_check(stack, "==");
-		if (ret)
+		if (ret < 0)
 			goto end;
 		break;
 	}
 	case FILTER_OP_NE:
 	{
 		ret = bin_op_compare_check(stack, "!=");
-		if (ret)
+		if (ret < 0)
 			goto end;
 		break;
 	}
 	case FILTER_OP_GT:
 	{
 		ret = bin_op_compare_check(stack, ">");
-		if (ret)
+		if (ret < 0)
 			goto end;
 		break;
 	}
 	case FILTER_OP_LT:
 	{
 		ret = bin_op_compare_check(stack, "<");
-		if (ret)
+		if (ret < 0)
 			goto end;
 		break;
 	}
 	case FILTER_OP_GE:
 	{
 		ret = bin_op_compare_check(stack, ">=");
-		if (ret)
+		if (ret < 0)
 			goto end;
 		break;
 	}
 	case FILTER_OP_LE:
 	{
 		ret = bin_op_compare_check(stack, "<=");
-		if (ret)
+		if (ret < 0)
 			goto end;
 		break;
 	}
@@ -508,14 +544,48 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 			ret = -EINVAL;
 			goto end;
 		}
-		if ((vstack_ax(stack)->type != REG_DOUBLE && vstack_ax(stack)->type != REG_S64)
-				|| (vstack_bx(stack)-> type != REG_DOUBLE && vstack_bx(stack)->type != REG_S64)) {
-			ERR("Unexpected register type for double comparator\n");
+		if (vstack_ax(stack)->type != REG_DOUBLE && vstack_bx(stack)->type != REG_DOUBLE) {
+			ERR("Double operator should have two double registers\n");
 			ret = -EINVAL;
 			goto end;
 		}
-		if (vstack_ax(stack)->type != REG_DOUBLE && vstack_bx(stack)->type != REG_DOUBLE) {
-			ERR("Double operator should have at least one double register\n");
+		break;
+	}
+
+	case FILTER_OP_EQ_DOUBLE_S64:
+	case FILTER_OP_NE_DOUBLE_S64:
+	case FILTER_OP_GT_DOUBLE_S64:
+	case FILTER_OP_LT_DOUBLE_S64:
+	case FILTER_OP_GE_DOUBLE_S64:
+	case FILTER_OP_LE_DOUBLE_S64:
+	{
+		if (!vstack_ax(stack) || !vstack_bx(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		if (vstack_ax(stack)->type != REG_S64 && vstack_bx(stack)->type != REG_DOUBLE) {
+			ERR("Double-S64 operator has unexpected register types\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		break;
+	}
+
+	case FILTER_OP_EQ_S64_DOUBLE:
+	case FILTER_OP_NE_S64_DOUBLE:
+	case FILTER_OP_GT_S64_DOUBLE:
+	case FILTER_OP_LT_S64_DOUBLE:
+	case FILTER_OP_GE_S64_DOUBLE:
+	case FILTER_OP_LE_S64_DOUBLE:
+	{
+		if (!vstack_ax(stack) || !vstack_bx(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		if (vstack_ax(stack)->type != REG_DOUBLE && vstack_bx(stack)->type != REG_S64) {
+			ERR("S64-Double operator has unexpected register types\n");
 			ret = -EINVAL;
 			goto end;
 		}
@@ -546,6 +616,8 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 			break;
 		case REG_DOUBLE:
 			break;
+		case REG_UNKNOWN:
+			break;
 		}
 		break;
 	}
@@ -595,8 +667,9 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 			ret = -EINVAL;
 			goto end;
 		}
-		if (vstack_ax(stack)->type != REG_S64) {
-			ERR("Logical comparator expects S64 register\n");
+		if (vstack_ax(stack)->type != REG_S64
+				&& vstack_ax(stack)->type != REG_UNKNOWN) {
+			ERR("Logical comparator expects S64 or dynamic register\n");
 			ret = -EINVAL;
 			goto end;
 		}
@@ -611,7 +684,7 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 		break;
 	}
 
-	/* load */
+	/* load field ref */
 	case FILTER_OP_LOAD_FIELD_REF:
 	{
 		ERR("Unknown field ref type\n");
@@ -647,6 +720,7 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 		break;
 	}
 
+	/* load from immediate operand */
 	case FILTER_OP_LOAD_STRING:
 	{
 		break;
@@ -686,6 +760,8 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 			break;
 		case REG_DOUBLE:
 			break;
+		case REG_UNKNOWN:
+			break;
 		}
 		if (insn->op == FILTER_OP_CAST_DOUBLE_TO_S64) {
 			if (vstack_ax(stack)->type != REG_DOUBLE) {
@@ -701,6 +777,44 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 		break;
 	}
 
+	/* get context ref */
+	case FILTER_OP_GET_CONTEXT_REF:
+	{
+		struct load_op *insn = (struct load_op *) pc;
+		struct field_ref *ref = (struct field_ref *) insn->data;
+
+		dbg_printf("Validate get context ref offset %u type dynamic\n",
+			ref->offset);
+		break;
+	}
+	case FILTER_OP_GET_CONTEXT_REF_STRING:
+	{
+		struct load_op *insn = (struct load_op *) pc;
+		struct field_ref *ref = (struct field_ref *) insn->data;
+
+		dbg_printf("Validate get context ref offset %u type string\n",
+			ref->offset);
+		break;
+	}
+	case FILTER_OP_GET_CONTEXT_REF_S64:
+	{
+		struct load_op *insn = (struct load_op *) pc;
+		struct field_ref *ref = (struct field_ref *) insn->data;
+
+		dbg_printf("Validate get context ref offset %u type s64\n",
+			ref->offset);
+		break;
+	}
+	case FILTER_OP_GET_CONTEXT_REF_DOUBLE:
+	{
+		struct load_op *insn = (struct load_op *) pc;
+		struct field_ref *ref = (struct field_ref *) insn->data;
+
+		dbg_printf("Validate get context ref offset %u type double\n",
+			ref->offset);
+		break;
+	}
+
 	}
 end:
 	return ret;
@@ -715,8 +829,8 @@ static
 int validate_instruction_all_contexts(struct bytecode_runtime *bytecode,
 		struct cds_lfht *merge_points,
 		struct vstack *stack,
-		void *start_pc,
-		void *pc)
+		char *start_pc,
+		char *pc)
 {
 	int ret;
 	unsigned long target_pc = pc - start_pc;
@@ -727,14 +841,14 @@ int validate_instruction_all_contexts(struct bytecode_runtime *bytecode,
 
 	/* Validate the context resulting from the previous instruction */
 	ret = validate_instruction_context(bytecode, stack, start_pc, pc);
-	if (ret)
+	if (ret < 0)
 		return ret;
 
 	/* Validate merge points */
-	hash = lttng_hash_mix((const void *) target_pc, sizeof(target_pc),
+	hash = lttng_hash_mix((const char *) target_pc, sizeof(target_pc),
 			lttng_hash_seed);
 	cds_lfht_lookup(merge_points, hash, lttng_hash_match,
-			(const void *) target_pc, &iter);
+			(const char *) target_pc, &iter);
 	node = cds_lfht_iter_get_node(&iter);
 	if (node) {
 		mp_node = caa_container_of(node, struct lfht_mp_node, node);
@@ -765,11 +879,11 @@ static
 int exec_insn(struct bytecode_runtime *bytecode,
 		struct cds_lfht *merge_points,
 		struct vstack *stack,
-		void **_next_pc,
-		void *pc)
+		char **_next_pc,
+		char *pc)
 {
 	int ret = 1;
-	void *next_pc = *_next_pc;
+	char *next_pc = *_next_pc;
 
 	switch (*(filter_opcode_t *) pc) {
 	case FILTER_OP_UNKNOWN:
@@ -834,6 +948,18 @@ int exec_insn(struct bytecode_runtime *bytecode,
 	case FILTER_OP_LT_DOUBLE:
 	case FILTER_OP_GE_DOUBLE:
 	case FILTER_OP_LE_DOUBLE:
+	case FILTER_OP_EQ_DOUBLE_S64:
+	case FILTER_OP_NE_DOUBLE_S64:
+	case FILTER_OP_GT_DOUBLE_S64:
+	case FILTER_OP_LT_DOUBLE_S64:
+	case FILTER_OP_GE_DOUBLE_S64:
+	case FILTER_OP_LE_DOUBLE_S64:
+	case FILTER_OP_EQ_S64_DOUBLE:
+	case FILTER_OP_NE_S64_DOUBLE:
+	case FILTER_OP_GT_S64_DOUBLE:
+	case FILTER_OP_LT_S64_DOUBLE:
+	case FILTER_OP_GE_S64_DOUBLE:
+	case FILTER_OP_LE_S64_DOUBLE:
 	{
 		/* Pop 2, push 1 */
 		if (vstack_pop(stack)) {
@@ -853,10 +979,23 @@ int exec_insn(struct bytecode_runtime *bytecode,
 	/* unary */
 	case FILTER_OP_UNARY_PLUS:
 	case FILTER_OP_UNARY_MINUS:
-	case FILTER_OP_UNARY_NOT:
+	{
+		/* Pop 1, push 1 */
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		vstack_ax(stack)->type = REG_UNKNOWN;
+		next_pc += sizeof(struct unary_op);
+		break;
+	}
+
 	case FILTER_OP_UNARY_PLUS_S64:
 	case FILTER_OP_UNARY_MINUS_S64:
+	case FILTER_OP_UNARY_NOT:
 	case FILTER_OP_UNARY_NOT_S64:
+	case FILTER_OP_UNARY_NOT_DOUBLE:
 	{
 		/* Pop 1, push 1 */
 		if (!vstack_ax(stack)) {
@@ -871,7 +1010,6 @@ int exec_insn(struct bytecode_runtime *bytecode,
 
 	case FILTER_OP_UNARY_PLUS_DOUBLE:
 	case FILTER_OP_UNARY_MINUS_DOUBLE:
-	case FILTER_OP_UNARY_NOT_DOUBLE:
 	{
 		/* Pop 1, push 1 */
 		if (!vstack_ax(stack)) {
@@ -908,15 +1046,27 @@ int exec_insn(struct bytecode_runtime *bytecode,
 		break;
 	}
 
-	/* load */
+	/* load field ref */
 	case FILTER_OP_LOAD_FIELD_REF:
 	{
 		ERR("Unknown field ref type\n");
 		ret = -EINVAL;
 		goto end;
 	}
+	/* get context ref */
+	case FILTER_OP_GET_CONTEXT_REF:
+	{
+		if (vstack_push(stack)) {
+			ret = -EINVAL;
+			goto end;
+		}
+		vstack_ax(stack)->type = REG_UNKNOWN;
+		next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
+		break;
+	}
 	case FILTER_OP_LOAD_FIELD_REF_STRING:
 	case FILTER_OP_LOAD_FIELD_REF_SEQUENCE:
+	case FILTER_OP_GET_CONTEXT_REF_STRING:
 	{
 		if (vstack_push(stack)) {
 			ret = -EINVAL;
@@ -927,6 +1077,7 @@ int exec_insn(struct bytecode_runtime *bytecode,
 		break;
 	}
 	case FILTER_OP_LOAD_FIELD_REF_S64:
+	case FILTER_OP_GET_CONTEXT_REF_S64:
 	{
 		if (vstack_push(stack)) {
 			ret = -EINVAL;
@@ -937,6 +1088,7 @@ int exec_insn(struct bytecode_runtime *bytecode,
 		break;
 	}
 	case FILTER_OP_LOAD_FIELD_REF_DOUBLE:
+	case FILTER_OP_GET_CONTEXT_REF_DOUBLE:
 	{
 		if (vstack_push(stack)) {
 			ret = -EINVAL;
@@ -947,6 +1099,7 @@ int exec_insn(struct bytecode_runtime *bytecode,
 		break;
 	}
 
+	/* load from immediate operand */
 	case FILTER_OP_LOAD_STRING:
 	{
 		struct load_op *insn = (struct load_op *) pc;
@@ -1015,7 +1168,7 @@ end:
 int lttng_filter_validate_bytecode(struct bytecode_runtime *bytecode)
 {
 	struct cds_lfht *merge_points;
-	void *pc, *next_pc, *start_pc;
+	char *pc, *next_pc, *start_pc;
 	int ret = -EINVAL;
 	struct vstack stack;
 
@@ -1041,9 +1194,10 @@ int lttng_filter_validate_bytecode(struct bytecode_runtime *bytecode)
 	start_pc = &bytecode->data[0];
 	for (pc = next_pc = start_pc; pc - start_pc < bytecode->len;
 			pc = next_pc) {
-		if (bytecode_validate_overflow(bytecode, start_pc, pc) != 0) {
-			ERR("filter bytecode overflow\n");
-			ret = -EINVAL;
+		ret = bytecode_validate_overflow(bytecode, start_pc, pc);
+		if (ret != 0) {
+			if (ret == -ERANGE)
+				ERR("filter bytecode overflow\n");
 			goto end;
 		}
 		dbg_printf("Validating op %s (%u)\n",
@@ -1053,7 +1207,7 @@ int lttng_filter_validate_bytecode(struct bytecode_runtime *bytecode)
 		/*
 		 * For each instruction, validate the current context
 		 * (traversal of entire execution flow), and validate
-		 * all 	merge points targeting this instruction.
+		 * all merge points targeting this instruction.
 		 */
 		ret = validate_instruction_all_contexts(bytecode, merge_points,
 					&stack, start_pc, pc);