filter: Add bytecode validation pass
[lttng-ust.git] / liblttng-ust / lttng-filter.c
index 69f8cba5aa0cf7daac44c489a8b9bf2325df60cb..999a82f9b8b08a2ea49f0a7a1a45802b8ffc1b53 100644 (file)
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include <limits.h>
+#include <usterr-signal-safe.h>
 #include "filter-bytecode.h"
 
 #define NR_REG         2
@@ -63,13 +64,23 @@ struct bytecode_runtime {
        char data[0];
 };
 
+enum reg_type {
+       REG_S64,
+       REG_DOUBLE,
+       REG_STRING,
+};
+
+/* Validation registers */
+struct vreg {
+       enum reg_type type;
+       int literal;            /* is string literal ? */
+};
+
+/* Execution registers */
 struct reg {
-       enum {
-               REG_S64,
-               REG_STRING,     /* NULL-terminated string */
-               REG_SEQUENCE,   /* non-null terminated */
-       } type;
+       enum reg_type type;
        int64_t v;
+       double d;
 
        const char *str;
        size_t seq_len;
@@ -112,6 +123,7 @@ static const char *opnames[] = {
        [ FILTER_OP_LOAD_FIELD_REF ] = "LOAD_FIELD_REF",
        [ FILTER_OP_LOAD_STRING ] = "LOAD_STRING",
        [ FILTER_OP_LOAD_S64 ] = "LOAD_S64",
+       [ FILTER_OP_LOAD_DOUBLE ] = "LOAD_DOUBLE",
 };
 
 static
@@ -227,6 +239,7 @@ int lttng_filter_interpret_bytecode(void *filter_data,
        for (i = 0; i < NR_REG; i++) {
                reg[i].type = REG_S64;
                reg[i].v = 0;
+               reg[i].d = 0.0;
                reg[i].str = NULL;
                reg[i].seq_len = 0;
                reg[i].literal = 0;
@@ -236,7 +249,7 @@ int lttng_filter_interpret_bytecode(void *filter_data,
        for (pc = next_pc = start_pc; pc - start_pc < bytecode->len;
                        pc = next_pc) {
                if (unlikely(pc >= start_pc + bytecode->len)) {
-                       fprintf(stderr, "[error] filter bytecode overflow\n");
+                       ERR("filter bytecode overflow\n");
                        ret = -EINVAL;
                        goto end;
                }
@@ -246,7 +259,7 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                switch (*(filter_opcode_t *) pc) {
                case FILTER_OP_UNKNOWN:
                default:
-                       fprintf(stderr, "[error] unknown bytecode op %u\n",
+                       ERR("unknown bytecode op %u\n",
                                (unsigned int) *(filter_opcode_t *) pc);
                        ret = -EINVAL;
                        goto end;
@@ -267,31 +280,57 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                case FILTER_OP_BIN_AND:
                case FILTER_OP_BIN_OR:
                case FILTER_OP_BIN_XOR:
-                       fprintf(stderr, "[error] unsupported bytecode op %u\n",
+                       ERR("unsupported bytecode op %u\n",
                                (unsigned int) *(filter_opcode_t *) pc);
                        ret = -EINVAL;
                        goto end;
 
                case FILTER_OP_EQ:
                {
-                       if (unlikely((reg[REG_R0].type == REG_S64 && reg[REG_R1].type != REG_S64)
-                                       || (reg[REG_R0].type != REG_S64 && reg[REG_R1].type == REG_S64))) {
-                               fprintf(stderr, "[error] type mismatch for '==' binary operator\n");
+                       if (unlikely((reg[REG_R0].type == REG_STRING && reg[REG_R1].type != REG_STRING)
+                                       || (reg[REG_R0].type != REG_STRING && reg[REG_R1].type == REG_STRING))) {
+                               ERR("type mismatch for '==' binary operator\n");
                                ret = -EINVAL;
                                goto end;
                        }
                        switch (reg[REG_R0].type) {
                        default:
-                               fprintf(stderr, "[error] unknown register type\n");
+                               ERR("unknown register type\n");
                                ret = -EINVAL;
                                goto end;
 
                        case REG_STRING:
-                       case REG_SEQUENCE:
                                reg[REG_R0].v = (reg_strcmp(reg, "==") == 0);
                                break;
                        case REG_S64:
-                               reg[REG_R0].v = (reg[REG_R0].v == reg[REG_R1].v);
+                               switch (reg[REG_R1].type) {
+                               default:
+                                       ERR("unknown register type\n");
+                                       ret = -EINVAL;
+                                       goto end;
+
+                               case REG_S64:
+                                       reg[REG_R0].v = (reg[REG_R0].v == reg[REG_R1].v);
+                                       break;
+                               case REG_DOUBLE:
+                                       reg[REG_R0].v = (reg[REG_R0].v == reg[REG_R1].d);
+                                       break;
+                               }
+                               break;
+                       case REG_DOUBLE:
+                               switch (reg[REG_R1].type) {
+                               default:
+                                       ERR("unknown register type\n");
+                                       ret = -EINVAL;
+                                       goto end;
+
+                               case REG_S64:
+                                       reg[REG_R0].v = (reg[REG_R0].d == reg[REG_R1].v);
+                                       break;
+                               case REG_DOUBLE:
+                                       reg[REG_R0].v = (reg[REG_R0].d == reg[REG_R1].d);
+                                       break;
+                               }
                                break;
                        }
                        reg[REG_R0].type = REG_S64;
@@ -300,24 +339,50 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                }
                case FILTER_OP_NE:
                {
-                       if (unlikely((reg[REG_R0].type == REG_S64 && reg[REG_R1].type != REG_S64)
-                                       || (reg[REG_R0].type != REG_S64 && reg[REG_R1].type == REG_S64))) {
-                               fprintf(stderr, "[error] type mismatch for '!=' binary operator\n");
+                       if (unlikely((reg[REG_R0].type == REG_STRING && reg[REG_R1].type != REG_STRING)
+                                       || (reg[REG_R0].type != REG_STRING && reg[REG_R1].type == REG_STRING))) {
+                               ERR("type mismatch for '!=' binary operator\n");
                                ret = -EINVAL;
                                goto end;
                        }
                        switch (reg[REG_R0].type) {
                        default:
-                               fprintf(stderr, "[error] unknown register type\n");
+                               ERR("unknown register type\n");
                                ret = -EINVAL;
                                goto end;
 
                        case REG_STRING:
-                       case REG_SEQUENCE:
                                reg[REG_R0].v = (reg_strcmp(reg, "!=") != 0);
                                break;
                        case REG_S64:
-                               reg[REG_R0].v = (reg[REG_R0].v != reg[REG_R1].v);
+                               switch (reg[REG_R1].type) {
+                               default:
+                                       ERR("unknown register type\n");
+                                       ret = -EINVAL;
+                                       goto end;
+
+                               case REG_S64:
+                                       reg[REG_R0].v = (reg[REG_R0].v != reg[REG_R1].v);
+                                       break;
+                               case REG_DOUBLE:
+                                       reg[REG_R0].v = (reg[REG_R0].v != reg[REG_R1].d);
+                                       break;
+                               }
+                               break;
+                       case REG_DOUBLE:
+                               switch (reg[REG_R1].type) {
+                               default:
+                                       ERR("unknown register type\n");
+                                       ret = -EINVAL;
+                                       goto end;
+
+                               case REG_S64:
+                                       reg[REG_R0].v = (reg[REG_R0].d != reg[REG_R1].v);
+                                       break;
+                               case REG_DOUBLE:
+                                       reg[REG_R0].v = (reg[REG_R0].d != reg[REG_R1].d);
+                                       break;
+                               }
                                break;
                        }
                        reg[REG_R0].type = REG_S64;
@@ -326,24 +391,50 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                }
                case FILTER_OP_GT:
                {
-                       if (unlikely((reg[REG_R0].type == REG_S64 && reg[REG_R1].type != REG_S64)
-                                       || (reg[REG_R0].type != REG_S64 && reg[REG_R1].type == REG_S64))) {
-                               fprintf(stderr, "[error] type mismatch for '>' binary operator\n");
+                       if (unlikely((reg[REG_R0].type == REG_STRING && reg[REG_R1].type != REG_STRING)
+                                       || (reg[REG_R0].type != REG_STRING && reg[REG_R1].type == REG_STRING))) {
+                               ERR("type mismatch for '>' binary operator\n");
                                ret = -EINVAL;
                                goto end;
                        }
                        switch (reg[REG_R0].type) {
                        default:
-                               fprintf(stderr, "[error] unknown register type\n");
+                               ERR("unknown register type\n");
                                ret = -EINVAL;
                                goto end;
 
                        case REG_STRING:
-                       case REG_SEQUENCE:
                                reg[REG_R0].v = (reg_strcmp(reg, ">") > 0);
                                break;
                        case REG_S64:
-                               reg[REG_R0].v = (reg[REG_R0].v > reg[REG_R1].v);
+                               switch (reg[REG_R1].type) {
+                               default:
+                                       ERR("unknown register type\n");
+                                       ret = -EINVAL;
+                                       goto end;
+
+                               case REG_S64:
+                                       reg[REG_R0].v = (reg[REG_R0].v > reg[REG_R1].v);
+                                       break;
+                               case REG_DOUBLE:
+                                       reg[REG_R0].v = (reg[REG_R0].v > reg[REG_R1].d);
+                                       break;
+                               }
+                               break;
+                       case REG_DOUBLE:
+                               switch (reg[REG_R1].type) {
+                               default:
+                                       ERR("unknown register type\n");
+                                       ret = -EINVAL;
+                                       goto end;
+
+                               case REG_S64:
+                                       reg[REG_R0].v = (reg[REG_R0].d > reg[REG_R1].v);
+                                       break;
+                               case REG_DOUBLE:
+                                       reg[REG_R0].v = (reg[REG_R0].d > reg[REG_R1].d);
+                                       break;
+                               }
                                break;
                        }
                        reg[REG_R0].type = REG_S64;
@@ -352,24 +443,50 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                }
                case FILTER_OP_LT:
                {
-                       if (unlikely((reg[REG_R0].type == REG_S64 && reg[REG_R1].type != REG_S64)
-                                       || (reg[REG_R0].type != REG_S64 && reg[REG_R1].type == REG_S64))) {
-                               fprintf(stderr, "[error] type mismatch for '<' binary operator\n");
+                       if (unlikely((reg[REG_R0].type == REG_STRING && reg[REG_R1].type != REG_STRING)
+                                       || (reg[REG_R0].type != REG_STRING && reg[REG_R1].type == REG_STRING))) {
+                               ERR("type mismatch for '<' binary operator\n");
                                ret = -EINVAL;
                                goto end;
                        }
                        switch (reg[REG_R0].type) {
                        default:
-                               fprintf(stderr, "[error] unknown register type\n");
+                               ERR("unknown register type\n");
                                ret = -EINVAL;
                                goto end;
 
                        case REG_STRING:
-                       case REG_SEQUENCE:
                                reg[REG_R0].v = (reg_strcmp(reg, "<") < 0);
                                break;
                        case REG_S64:
-                               reg[REG_R0].v = (reg[REG_R0].v < reg[REG_R1].v);
+                               switch (reg[REG_R1].type) {
+                               default:
+                                       ERR("unknown register type\n");
+                                       ret = -EINVAL;
+                                       goto end;
+
+                               case REG_S64:
+                                       reg[REG_R0].v = (reg[REG_R0].v < reg[REG_R1].v);
+                                       break;
+                               case REG_DOUBLE:
+                                       reg[REG_R0].v = (reg[REG_R0].v < reg[REG_R1].d);
+                                       break;
+                               }
+                               break;
+                       case REG_DOUBLE:
+                               switch (reg[REG_R1].type) {
+                               default:
+                                       ERR("unknown register type\n");
+                                       ret = -EINVAL;
+                                       goto end;
+
+                               case REG_S64:
+                                       reg[REG_R0].v = (reg[REG_R0].d < reg[REG_R1].v);
+                                       break;
+                               case REG_DOUBLE:
+                                       reg[REG_R0].v = (reg[REG_R0].d < reg[REG_R1].d);
+                                       break;
+                               }
                                break;
                        }
                        reg[REG_R0].type = REG_S64;
@@ -378,24 +495,50 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                }
                case FILTER_OP_GE:
                {
-                       if (unlikely((reg[REG_R0].type == REG_S64 && reg[REG_R1].type != REG_S64)
-                                       || (reg[REG_R0].type != REG_S64 && reg[REG_R1].type == REG_S64))) {
-                               fprintf(stderr, "[error] type mismatch for '>=' binary operator\n");
+                       if (unlikely((reg[REG_R0].type == REG_STRING && reg[REG_R1].type != REG_STRING)
+                                       || (reg[REG_R0].type != REG_STRING && reg[REG_R1].type == REG_STRING))) {
+                               ERR("type mismatch for '>=' binary operator\n");
                                ret = -EINVAL;
                                goto end;
                        }
                        switch (reg[REG_R0].type) {
                        default:
-                               fprintf(stderr, "[error] unknown register type\n");
+                               ERR("unknown register type\n");
                                ret = -EINVAL;
                                goto end;
 
                        case REG_STRING:
-                       case REG_SEQUENCE:
                                reg[REG_R0].v = (reg_strcmp(reg, ">=") >= 0);
                                break;
                        case REG_S64:
-                               reg[REG_R0].v = (reg[REG_R0].v >= reg[REG_R1].v);
+                               switch (reg[REG_R1].type) {
+                               default:
+                                       ERR("unknown register type\n");
+                                       ret = -EINVAL;
+                                       goto end;
+
+                               case REG_S64:
+                                       reg[REG_R0].v = (reg[REG_R0].v >= reg[REG_R1].v);
+                                       break;
+                               case REG_DOUBLE:
+                                       reg[REG_R0].v = (reg[REG_R0].v >= reg[REG_R1].d);
+                                       break;
+                               }
+                               break;
+                       case REG_DOUBLE:
+                               switch (reg[REG_R1].type) {
+                               default:
+                                       ERR("unknown register type\n");
+                                       ret = -EINVAL;
+                                       goto end;
+
+                               case REG_S64:
+                                       reg[REG_R0].v = (reg[REG_R0].d >= reg[REG_R1].v);
+                                       break;
+                               case REG_DOUBLE:
+                                       reg[REG_R0].v = (reg[REG_R0].d >= reg[REG_R1].d);
+                                       break;
+                               }
                                break;
                        }
                        reg[REG_R0].type = REG_S64;
@@ -404,24 +547,50 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                }
                case FILTER_OP_LE:
                {
-                       if (unlikely((reg[REG_R0].type == REG_S64 && reg[REG_R1].type != REG_S64)
-                                       || (reg[REG_R0].type != REG_S64 && reg[REG_R1].type == REG_S64))) {
-                               fprintf(stderr, "[error] type mismatch for '<=' binary operator\n");
+                       if (unlikely((reg[REG_R0].type == REG_STRING && reg[REG_R1].type != REG_STRING)
+                                       || (reg[REG_R0].type != REG_STRING && reg[REG_R1].type == REG_STRING))) {
+                               ERR("type mismatch for '<=' binary operator\n");
                                ret = -EINVAL;
                                goto end;
                        }
                        switch (reg[REG_R0].type) {
                        default:
-                               fprintf(stderr, "[error] unknown register type\n");
+                               ERR("unknown register type\n");
                                ret = -EINVAL;
                                goto end;
 
                        case REG_STRING:
-                       case REG_SEQUENCE:
                                reg[REG_R0].v = (reg_strcmp(reg, "<=") <= 0);
                                break;
                        case REG_S64:
-                               reg[REG_R0].v = (reg[REG_R0].v <= reg[REG_R1].v);
+                               switch (reg[REG_R1].type) {
+                               default:
+                                       ERR("unknown register type\n");
+                                       ret = -EINVAL;
+                                       goto end;
+
+                               case REG_S64:
+                                       reg[REG_R0].v = (reg[REG_R0].v <= reg[REG_R1].v);
+                                       break;
+                               case REG_DOUBLE:
+                                       reg[REG_R0].v = (reg[REG_R0].v <= reg[REG_R1].d);
+                                       break;
+                               }
+                               break;
+                       case REG_DOUBLE:
+                               switch (reg[REG_R1].type) {
+                               default:
+                                       ERR("unknown register type\n");
+                                       ret = -EINVAL;
+                                       goto end;
+
+                               case REG_S64:
+                                       reg[REG_R0].v = (reg[REG_R0].d <= reg[REG_R1].v);
+                                       break;
+                               case REG_DOUBLE:
+                                       reg[REG_R0].v = (reg[REG_R0].d <= reg[REG_R1].d);
+                                       break;
+                               }
                                break;
                        }
                        reg[REG_R0].type = REG_S64;
@@ -435,15 +604,25 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                        struct unary_op *insn = (struct unary_op *) pc;
 
                        if (unlikely(insn->reg >= REG_ERROR)) {
-                               fprintf(stderr, "[error] invalid register %u\n",
+                               ERR("invalid register %u\n",
                                        (unsigned int) insn->reg);
                                ret = -EINVAL;
                                goto end;
                        }
-                       if (unlikely(reg[insn->reg].type != REG_S64)) {
-                               fprintf(stderr, "[error] Unary plus can only be applied to numeric register\n");
+                       switch (reg[insn->reg].type) {
+                       default:
+                               ERR("unknown register type\n");
                                ret = -EINVAL;
                                goto end;
+
+                       case REG_STRING:
+                               ERR("Unary plus can only be applied to numeric or floating point registers\n");
+                               ret = -EINVAL;
+                               goto end;
+                       case REG_S64:
+                               break;
+                       case REG_DOUBLE:
+                               break;
                        }
                        next_pc += sizeof(struct unary_op);
                        break;
@@ -453,17 +632,28 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                        struct unary_op *insn = (struct unary_op *) pc;
 
                        if (unlikely(insn->reg >= REG_ERROR)) {
-                               fprintf(stderr, "[error] invalid register %u\n",
+                               ERR("invalid register %u\n",
                                        (unsigned int) insn->reg);
                                ret = -EINVAL;
                                goto end;
                        }
-                       if (unlikely(reg[insn->reg].type != REG_S64)) {
-                               fprintf(stderr, "[error] Unary minus can only be applied to numeric register\n");
+                       switch (reg[insn->reg].type) {
+                       default:
+                               ERR("unknown register type\n");
                                ret = -EINVAL;
                                goto end;
+
+                       case REG_STRING:
+                               ERR("Unary minus can only be applied to numeric or floating point registers\n");
+                               ret = -EINVAL;
+                               goto end;
+                       case REG_S64:
+                               reg[insn->reg].v = -reg[insn->reg].v;
+                               break;
+                       case REG_DOUBLE:
+                               reg[insn->reg].d = -reg[insn->reg].d;
+                               break;
                        }
-                       reg[insn->reg].v = -reg[insn->reg].v;
                        next_pc += sizeof(struct unary_op);
                        break;
                }
@@ -472,13 +662,30 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                        struct unary_op *insn = (struct unary_op *) pc;
 
                        if (unlikely(insn->reg >= REG_ERROR)) {
-                               fprintf(stderr, "[error] invalid register %u\n",
+                               ERR("invalid register %u\n",
                                        (unsigned int) insn->reg);
                                ret = -EINVAL;
                                goto end;
                        }
+                       switch (reg[insn->reg].type) {
+                       default:
+                               ERR("unknown register type\n");
+                               ret = -EINVAL;
+                               goto end;
+
+                       case REG_STRING:
+                               ERR("Unary not can only be applied to numeric or floating point registers\n");
+                               ret = -EINVAL;
+                               goto end;
+                       case REG_S64:
+                               reg[insn->reg].v = !reg[insn->reg].v;
+                               break;
+                       case REG_DOUBLE:
+                               reg[insn->reg].d = !reg[insn->reg].d;
+                               break;
+                       }
                        if (unlikely(reg[insn->reg].type != REG_S64)) {
-                               fprintf(stderr, "[error] Unary not can only be applied to numeric register\n");
+                               ERR("Unary not can only be applied to numeric register\n");
                                ret = -EINVAL;
                                goto end;
                        }
@@ -491,19 +698,20 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                {
                        struct logical_op *insn = (struct logical_op *) pc;
 
-                       if (unlikely(reg[REG_R0].type != REG_S64)) {
-                               fprintf(stderr, "[error] Logical operator 'and' can only be applied to numeric register\n");
+                       if (unlikely(reg[REG_R0].type == REG_STRING)) {
+                               ERR("Logical operator 'and' can only be applied to numeric and floating point registers\n");
                                ret = -EINVAL;
                                goto end;
                        }
 
                        /* If REG_R0 is 0, skip and evaluate to 0 */
-                       if (reg[REG_R0].v == 0) {
+                       if ((reg[REG_R0].type == REG_S64 && reg[REG_R0].v == 0)
+                                       || (reg[REG_R0].type == REG_DOUBLE && reg[REG_R0].d == 0.0)) {
                                dbg_printf("Jumping to bytecode offset %u\n",
                                        (unsigned int) insn->skip_offset);
                                next_pc = start_pc + insn->skip_offset;
                                if (unlikely(next_pc <= pc)) {
-                                       fprintf(stderr, "[error] Loops are not allowed in bytecode\n");
+                                       ERR("Loops are not allowed in bytecode\n");
                                        ret = -EINVAL;
                                        goto end;
                                }
@@ -516,20 +724,22 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                {
                        struct logical_op *insn = (struct logical_op *) pc;
 
-                       if (unlikely(reg[REG_R0].type != REG_S64)) {
-                               fprintf(stderr, "[error] Logical operator 'and' can only be applied to numeric register\n");
+                       if (unlikely(reg[REG_R0].type == REG_STRING)) {
+                               ERR("Logical operator 'or' can only be applied to numeric and floating point registers\n");
                                ret = -EINVAL;
                                goto end;
                        }
 
                        /* If REG_R0 is nonzero, skip and evaluate to 1 */
-                       if (reg[REG_R0].v != 0) {
+
+                       if ((reg[REG_R0].type == REG_S64 && reg[REG_R0].v != 0)
+                                       || (reg[REG_R0].type == REG_DOUBLE && reg[REG_R0].d != 0.0)) {
                                reg[REG_R0].v = 1;
                                dbg_printf("Jumping to bytecode offset %u\n",
                                        (unsigned int) insn->skip_offset);
                                next_pc = start_pc + insn->skip_offset;
                                if (unlikely(next_pc <= pc)) {
-                                       fprintf(stderr, "[error] Loops are not allowed in bytecode\n");
+                                       ERR("Loops are not allowed in bytecode\n");
                                        ret = -EINVAL;
                                        goto end;
                                }
@@ -546,7 +756,7 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                        struct field_ref *ref = (struct field_ref *) insn->data;
 
                        if (unlikely(insn->reg >= REG_ERROR)) {
-                               fprintf(stderr, "[error] invalid register %u\n",
+                               ERR("invalid register %u\n",
                                        (unsigned int) insn->reg);
                                ret = -EINVAL;
                                goto end;
@@ -556,7 +766,7 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                        switch (ref->type) {
                        case FIELD_REF_UNKNOWN:
                        default:
-                               fprintf(stderr, "[error] unknown field ref type\n");
+                               ERR("unknown field ref type\n");
                                ret = -EINVAL;
                                goto end;
 
@@ -574,7 +784,7 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                                reg[insn->reg].str =
                                        *(const char **) (&filter_stack_data[ref->offset
                                                                        + sizeof(unsigned long)]);
-                               reg[insn->reg].type = REG_SEQUENCE;
+                               reg[insn->reg].type = REG_STRING;
                                reg[insn->reg].literal = 0;
                                break;
                        case FIELD_REF_S64:
@@ -584,6 +794,13 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                                reg[insn->reg].literal = 0;
                                dbg_printf("ref load s64 %" PRIi64 "\n", reg[insn->reg].v);
                                break;
+                       case FIELD_REF_DOUBLE:
+                               memcpy(&reg[insn->reg].d, &filter_stack_data[ref->offset],
+                                       sizeof(struct literal_double));
+                               reg[insn->reg].type = REG_DOUBLE;
+                               reg[insn->reg].literal = 0;
+                               dbg_printf("ref load double %g\n", reg[insn->reg].d);
+                               break;
                        }
 
                        next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
@@ -595,7 +812,7 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                        struct load_op *insn = (struct load_op *) pc;
 
                        if (unlikely(insn->reg >= REG_ERROR)) {
-                               fprintf(stderr, "[error] invalid register %u\n",
+                               ERR("invalid register %u\n",
                                        (unsigned int) insn->reg);
                                ret = -EINVAL;
                                goto end;
@@ -614,7 +831,7 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                        struct load_op *insn = (struct load_op *) pc;
 
                        if (unlikely(insn->reg >= REG_ERROR)) {
-                               fprintf(stderr, "[error] invalid register %u\n",
+                               ERR("invalid register %u\n",
                                        (unsigned int) insn->reg);
                                ret = -EINVAL;
                                goto end;
@@ -627,6 +844,25 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                                        + sizeof(struct literal_numeric);
                        break;
                }
+
+               case FILTER_OP_LOAD_DOUBLE:
+               {
+                       struct load_op *insn = (struct load_op *) pc;
+
+                       if (unlikely(insn->reg >= REG_ERROR)) {
+                               ERR("invalid register %u\n",
+                                       (unsigned int) insn->reg);
+                               ret = -EINVAL;
+                               goto end;
+                       }
+                       memcpy(&reg[insn->reg].d, insn->data,
+                               sizeof(struct literal_double));
+                       dbg_printf("load s64 %g\n", reg[insn->reg].d);
+                       reg[insn->reg].type = REG_DOUBLE;
+                       next_pc += sizeof(struct load_op)
+                                       + sizeof(struct literal_double);
+                       break;
+               }
                }
        }
 end:
@@ -636,6 +872,307 @@ end:
        return retval;
 }
 
+static
+int bin_op_compare_check(struct vreg reg[NR_REG], const char *str)
+{
+       switch (reg[REG_R0].type) {
+       default:
+               goto error_unknown;
+
+       case REG_STRING:
+               switch (reg[REG_R1].type) {
+               default:
+                       goto error_unknown;
+
+               case REG_STRING:
+                       break;
+               case REG_S64:
+               case REG_DOUBLE:
+                       goto error_mismatch;
+               }
+               break;
+       case REG_S64:
+       case REG_DOUBLE:
+               switch (reg[REG_R1].type) {
+               default:
+                       goto error_unknown;
+
+               case REG_STRING:
+                       goto error_mismatch;
+
+               case REG_S64:
+               case REG_DOUBLE:
+                       break;
+               }
+               break;
+       }
+       return 0;
+
+error_unknown:
+
+       return -EINVAL;
+error_mismatch:
+       ERR("type mismatch for '%s' binary operator\n", str);
+       return -EINVAL;
+}
+
+static
+int lttng_filter_validate_bytecode(struct bytecode_runtime *bytecode)
+{
+       void *pc, *next_pc, *start_pc;
+       int ret = -EINVAL;
+       struct vreg reg[NR_REG];
+       int i;
+
+       for (i = 0; i < NR_REG; i++) {
+               reg[i].type = REG_S64;
+               reg[i].literal = 0;
+       }
+
+       start_pc = &bytecode->data[0];
+       for (pc = next_pc = start_pc; pc - start_pc < bytecode->len;
+                       pc = next_pc) {
+               if (unlikely(pc >= start_pc + bytecode->len)) {
+                       ERR("filter bytecode overflow\n");
+                       ret = -EINVAL;
+                       goto end;
+               }
+               dbg_printf("Validating op %s (%u)\n",
+                       print_op((unsigned int) *(filter_opcode_t *) pc),
+                       (unsigned int) *(filter_opcode_t *) pc);
+               switch (*(filter_opcode_t *) pc) {
+               case FILTER_OP_UNKNOWN:
+               default:
+                       ERR("unknown bytecode op %u\n",
+                               (unsigned int) *(filter_opcode_t *) pc);
+                       ret = -EINVAL;
+                       goto end;
+
+               case FILTER_OP_RETURN:
+                       ret = 0;
+                       goto end;
+
+               /* binary */
+               case FILTER_OP_MUL:
+               case FILTER_OP_DIV:
+               case FILTER_OP_MOD:
+               case FILTER_OP_PLUS:
+               case FILTER_OP_MINUS:
+               case FILTER_OP_RSHIFT:
+               case FILTER_OP_LSHIFT:
+               case FILTER_OP_BIN_AND:
+               case FILTER_OP_BIN_OR:
+               case FILTER_OP_BIN_XOR:
+                       ERR("unsupported bytecode op %u\n",
+                               (unsigned int) *(filter_opcode_t *) pc);
+                       ret = -EINVAL;
+                       goto end;
+
+               case FILTER_OP_EQ:
+               {
+                       ret = bin_op_compare_check(reg, "==");
+                       if (ret)
+                               goto end;
+                       reg[REG_R0].type = REG_S64;
+                       next_pc += sizeof(struct binary_op);
+                       break;
+               }
+               case FILTER_OP_NE:
+               {
+                       ret = bin_op_compare_check(reg, "!=");
+                       if (ret)
+                               goto end;
+                       reg[REG_R0].type = REG_S64;
+                       next_pc += sizeof(struct binary_op);
+                       break;
+               }
+               case FILTER_OP_GT:
+               {
+                       ret = bin_op_compare_check(reg, ">");
+                       if (ret)
+                               goto end;
+                       reg[REG_R0].type = REG_S64;
+                       next_pc += sizeof(struct binary_op);
+                       break;
+               }
+               case FILTER_OP_LT:
+               {
+                       ret = bin_op_compare_check(reg, "<");
+                       if (ret)
+                               goto end;
+                       reg[REG_R0].type = REG_S64;
+                       next_pc += sizeof(struct binary_op);
+                       break;
+               }
+               case FILTER_OP_GE:
+               {
+                       ret = bin_op_compare_check(reg, ">=");
+                       if (ret)
+                               goto end;
+                       reg[REG_R0].type = REG_S64;
+                       next_pc += sizeof(struct binary_op);
+                       break;
+               }
+               case FILTER_OP_LE:
+               {
+                       ret = bin_op_compare_check(reg, "<=");
+                       if (ret)
+                               goto end;
+                       reg[REG_R0].type = REG_S64;
+                       next_pc += sizeof(struct binary_op);
+                       break;
+               }
+
+               /* unary */
+               case FILTER_OP_UNARY_PLUS:
+               case FILTER_OP_UNARY_MINUS:
+               case FILTER_OP_UNARY_NOT:
+               {
+                       struct unary_op *insn = (struct unary_op *) pc;
+
+                       if (unlikely(insn->reg >= REG_ERROR)) {
+                               ERR("invalid register %u\n",
+                                       (unsigned int) insn->reg);
+                               ret = -EINVAL;
+                               goto end;
+                       }
+                       switch (reg[insn->reg].type) {
+                       default:
+                               ERR("unknown register type\n");
+                               ret = -EINVAL;
+                               goto end;
+
+                       case REG_STRING:
+                               ERR("Unary op can only be applied to numeric or floating point registers\n");
+                               ret = -EINVAL;
+                               goto end;
+                       case REG_S64:
+                               break;
+                       case REG_DOUBLE:
+                               break;
+                       }
+                       next_pc += sizeof(struct unary_op);
+                       break;
+               }
+               /* logical */
+               case FILTER_OP_AND:
+               case FILTER_OP_OR:
+               {
+                       struct logical_op *insn = (struct logical_op *) pc;
+
+                       if (unlikely(reg[REG_R0].type == REG_STRING)) {
+                               ERR("Logical operator 'and' can only be applied to numeric and floating point registers\n");
+                               ret = -EINVAL;
+                               goto end;
+                       }
+
+                       dbg_printf("Validate jumping to bytecode offset %u\n",
+                               (unsigned int) insn->skip_offset);
+                       if (unlikely(start_pc + insn->skip_offset <= pc)) {
+                               ERR("Loops are not allowed in bytecode\n");
+                               ret = -EINVAL;
+                               goto end;
+                       }
+                       next_pc += sizeof(struct logical_op);
+                       break;
+               }
+
+               /* load */
+               case FILTER_OP_LOAD_FIELD_REF:
+               {
+                       struct load_op *insn = (struct load_op *) pc;
+                       struct field_ref *ref = (struct field_ref *) insn->data;
+
+                       if (unlikely(insn->reg >= REG_ERROR)) {
+                               ERR("invalid register %u\n",
+                                       (unsigned int) insn->reg);
+                               ret = -EINVAL;
+                               goto end;
+                       }
+                       dbg_printf("Validate load field ref offset %u type %u\n",
+                               ref->offset, ref->type);
+                       switch (ref->type) {
+                       case FIELD_REF_UNKNOWN:
+                       default:
+                               ERR("unknown field ref type\n");
+                               ret = -EINVAL;
+                               goto end;
+
+                       case FIELD_REF_STRING:
+                               reg[insn->reg].type = REG_STRING;
+                               reg[insn->reg].literal = 0;
+                               break;
+                       case FIELD_REF_SEQUENCE:
+                               reg[insn->reg].type = REG_STRING;
+                               reg[insn->reg].literal = 0;
+                               break;
+                       case FIELD_REF_S64:
+                               reg[insn->reg].type = REG_S64;
+                               reg[insn->reg].literal = 0;
+                               break;
+                       case FIELD_REF_DOUBLE:
+                               reg[insn->reg].type = REG_DOUBLE;
+                               reg[insn->reg].literal = 0;
+                               break;
+                       }
+
+                       next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
+                       break;
+               }
+
+               case FILTER_OP_LOAD_STRING:
+               {
+                       struct load_op *insn = (struct load_op *) pc;
+
+                       if (unlikely(insn->reg >= REG_ERROR)) {
+                               ERR("invalid register %u\n",
+                                       (unsigned int) insn->reg);
+                               ret = -EINVAL;
+                               goto end;
+                       }
+                       reg[insn->reg].type = REG_STRING;
+                       reg[insn->reg].literal = 1;
+                       next_pc += sizeof(struct load_op) + strlen(insn->data) + 1;
+                       break;
+               }
+
+               case FILTER_OP_LOAD_S64:
+               {
+                       struct load_op *insn = (struct load_op *) pc;
+
+                       if (unlikely(insn->reg >= REG_ERROR)) {
+                               ERR("invalid register %u\n",
+                                       (unsigned int) insn->reg);
+                               ret = -EINVAL;
+                               goto end;
+                       }
+                       reg[insn->reg].type = REG_S64;
+                       next_pc += sizeof(struct load_op)
+                                       + sizeof(struct literal_numeric);
+                       break;
+               }
+
+               case FILTER_OP_LOAD_DOUBLE:
+               {
+                       struct load_op *insn = (struct load_op *) pc;
+
+                       if (unlikely(insn->reg >= REG_ERROR)) {
+                               ERR("invalid register %u\n",
+                                       (unsigned int) insn->reg);
+                               ret = -EINVAL;
+                               goto end;
+                       }
+                       reg[insn->reg].type = REG_DOUBLE;
+                       next_pc += sizeof(struct load_op)
+                                       + sizeof(struct literal_double);
+                       break;
+               }
+               }
+       }
+end:
+       return ret;
+}
+
 static
 int apply_field_reloc(struct ltt_event *event,
                struct bytecode_runtime *runtime,
@@ -684,6 +1221,7 @@ int apply_field_reloc(struct ltt_event *event,
                        break;
                case atype_float:
                        field_offset += sizeof(double);
+                       break;
                default:
                        return -EINVAL;
                }
@@ -711,7 +1249,8 @@ int apply_field_reloc(struct ltt_event *event,
                field_ref->type = FIELD_REF_STRING;
                break;
        case atype_float:
-               return -EINVAL;
+               field_ref->type = FIELD_REF_DOUBLE;
+               break;
        default:
                return -EINVAL;
        }
@@ -771,6 +1310,11 @@ int _lttng_filter_event_link_bytecode(struct ltt_event *event,
                }
                next_offset = offset + sizeof(uint16_t) + strlen(field_name) + 1;
        }
+       /* Validate bytecode */
+       ret = lttng_filter_validate_bytecode(runtime);
+       if (ret) {
+               goto link_error;
+       }
        event->filter_data = runtime;
        event->filter = lttng_filter_interpret_bytecode;
        return 0;
This page took 0.037796 seconds and 4 git commands to generate.