X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-specialize.c;h=09b5e45e73658a8a8a29445be1f149d6d92b50de;hb=c7667bfebfa1d054ad8d54fd98ada3c86184e327;hp=fc350fd61b2e7b73e7288a00326f1a80249afb34;hpb=97b58163ffe6cced54c3d37ae79d4113a9d26455;p=lttng-ust.git diff --git a/liblttng-ust/lttng-filter-specialize.c b/liblttng-ust/lttng-filter-specialize.c index fc350fd6..09b5e45e 100644 --- a/liblttng-ust/lttng-filter-specialize.c +++ b/liblttng-ust/lttng-filter-specialize.c @@ -3,36 +3,38 @@ * * LTTng UST filter code specializer. * - * Copyright (C) 2010-2012 Mathieu Desnoyers + * Copyright (C) 2010-2016 Mathieu Desnoyers * - * 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. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * 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. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * 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 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ +#define _LGPL_SOURCE #include "lttng-filter.h" int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) { void *pc, *next_pc, *start_pc; int ret = -EINVAL; - struct vreg reg[NR_REG]; - int i; + struct vstack _stack; + struct vstack *stack = &_stack; - for (i = 0; i < NR_REG; i++) { - reg[i].type = REG_TYPE_UNKNOWN; - reg[i].literal = 0; - } + vstack_init(stack); start_pc = &bytecode->data[0]; for (pc = next_pc = start_pc; pc - start_pc < bytecode->len; @@ -69,26 +71,50 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) { struct binary_op *insn = (struct binary_op *) pc; - switch(reg[REG_R0].type) { + switch(vstack_ax(stack)->type) { default: ERR("unknown register type\n"); ret = -EINVAL; goto end; case REG_STRING: - insn->op = FILTER_OP_EQ_STRING; + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + if (vstack_bx(stack)->type == REG_STAR_GLOB_STRING) + insn->op = FILTER_OP_EQ_STAR_GLOB_STRING; + else + insn->op = FILTER_OP_EQ_STRING; + break; + case REG_STAR_GLOB_STRING: + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + insn->op = FILTER_OP_EQ_STAR_GLOB_STRING; break; case REG_S64: - if (reg[REG_R1].type == REG_S64) + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + if (vstack_bx(stack)->type == REG_S64) insn->op = FILTER_OP_EQ_S64; else - insn->op = FILTER_OP_EQ_DOUBLE; + insn->op = FILTER_OP_EQ_DOUBLE_S64; break; case REG_DOUBLE: - insn->op = FILTER_OP_EQ_DOUBLE; + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + if (vstack_bx(stack)->type == REG_S64) + insn->op = FILTER_OP_EQ_S64_DOUBLE; + else + insn->op = FILTER_OP_EQ_DOUBLE; break; + case REG_UNKNOWN: + break; /* Dynamic typing. */ } - reg[REG_R0].type = REG_S64; + /* Pop 2, push 1 */ + if (vstack_pop(stack)) { + ret = -EINVAL; + goto end; + } + vstack_ax(stack)->type = REG_S64; next_pc += sizeof(struct binary_op); break; } @@ -97,26 +123,50 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) { struct binary_op *insn = (struct binary_op *) pc; - switch(reg[REG_R0].type) { + switch(vstack_ax(stack)->type) { default: ERR("unknown register type\n"); ret = -EINVAL; goto end; case REG_STRING: - insn->op = FILTER_OP_NE_STRING; + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + if (vstack_bx(stack)->type == REG_STAR_GLOB_STRING) + insn->op = FILTER_OP_NE_STAR_GLOB_STRING; + else + insn->op = FILTER_OP_NE_STRING; + break; + case REG_STAR_GLOB_STRING: + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + insn->op = FILTER_OP_NE_STAR_GLOB_STRING; break; case REG_S64: - if (reg[REG_R1].type == REG_S64) + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + if (vstack_bx(stack)->type == REG_S64) insn->op = FILTER_OP_NE_S64; else - insn->op = FILTER_OP_NE_DOUBLE; + insn->op = FILTER_OP_NE_DOUBLE_S64; break; case REG_DOUBLE: - insn->op = FILTER_OP_NE_DOUBLE; + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + if (vstack_bx(stack)->type == REG_S64) + insn->op = FILTER_OP_NE_S64_DOUBLE; + else + insn->op = FILTER_OP_NE_DOUBLE; break; + case REG_UNKNOWN: + break; /* Dynamic typing. */ + } + /* Pop 2, push 1 */ + if (vstack_pop(stack)) { + ret = -EINVAL; + goto end; } - reg[REG_R0].type = REG_S64; + vstack_ax(stack)->type = REG_S64; next_pc += sizeof(struct binary_op); break; } @@ -125,26 +175,46 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) { struct binary_op *insn = (struct binary_op *) pc; - switch(reg[REG_R0].type) { + switch(vstack_ax(stack)->type) { default: ERR("unknown register type\n"); ret = -EINVAL; goto end; + case REG_STAR_GLOB_STRING: + ERR("invalid register type for > binary operator\n"); + ret = -EINVAL; + goto end; case REG_STRING: + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; insn->op = FILTER_OP_GT_STRING; break; case REG_S64: - if (reg[REG_R1].type == REG_S64) + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + if (vstack_bx(stack)->type == REG_S64) insn->op = FILTER_OP_GT_S64; else - insn->op = FILTER_OP_GT_DOUBLE; + insn->op = FILTER_OP_GT_DOUBLE_S64; break; case REG_DOUBLE: - insn->op = FILTER_OP_GT_DOUBLE; + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + if (vstack_bx(stack)->type == REG_S64) + insn->op = FILTER_OP_GT_S64_DOUBLE; + else + insn->op = FILTER_OP_GT_DOUBLE; break; + case REG_UNKNOWN: + break; /* Dynamic typing. */ + } + /* Pop 2, push 1 */ + if (vstack_pop(stack)) { + ret = -EINVAL; + goto end; } - reg[REG_R0].type = REG_S64; + vstack_ax(stack)->type = REG_S64; next_pc += sizeof(struct binary_op); break; } @@ -153,26 +223,46 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) { struct binary_op *insn = (struct binary_op *) pc; - switch(reg[REG_R0].type) { + switch(vstack_ax(stack)->type) { default: ERR("unknown register type\n"); ret = -EINVAL; goto end; + case REG_STAR_GLOB_STRING: + ERR("invalid register type for < binary operator\n"); + ret = -EINVAL; + goto end; case REG_STRING: + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; insn->op = FILTER_OP_LT_STRING; break; case REG_S64: - if (reg[REG_R1].type == REG_S64) + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + if (vstack_bx(stack)->type == REG_S64) insn->op = FILTER_OP_LT_S64; else - insn->op = FILTER_OP_LT_DOUBLE; + insn->op = FILTER_OP_LT_DOUBLE_S64; break; case REG_DOUBLE: - insn->op = FILTER_OP_LT_DOUBLE; + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + if (vstack_bx(stack)->type == REG_S64) + insn->op = FILTER_OP_LT_S64_DOUBLE; + else + insn->op = FILTER_OP_LT_DOUBLE; break; + case REG_UNKNOWN: + break; /* Dynamic typing. */ + } + /* Pop 2, push 1 */ + if (vstack_pop(stack)) { + ret = -EINVAL; + goto end; } - reg[REG_R0].type = REG_S64; + vstack_ax(stack)->type = REG_S64; next_pc += sizeof(struct binary_op); break; } @@ -181,26 +271,46 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) { struct binary_op *insn = (struct binary_op *) pc; - switch(reg[REG_R0].type) { + switch(vstack_ax(stack)->type) { default: ERR("unknown register type\n"); ret = -EINVAL; goto end; + case REG_STAR_GLOB_STRING: + ERR("invalid register type for >= binary operator\n"); + ret = -EINVAL; + goto end; case REG_STRING: + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; insn->op = FILTER_OP_GE_STRING; break; case REG_S64: - if (reg[REG_R1].type == REG_S64) + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + if (vstack_bx(stack)->type == REG_S64) insn->op = FILTER_OP_GE_S64; else - insn->op = FILTER_OP_GE_DOUBLE; + insn->op = FILTER_OP_GE_DOUBLE_S64; break; case REG_DOUBLE: - insn->op = FILTER_OP_GE_DOUBLE; + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + if (vstack_bx(stack)->type == REG_S64) + insn->op = FILTER_OP_GE_S64_DOUBLE; + else + insn->op = FILTER_OP_GE_DOUBLE; break; + case REG_UNKNOWN: + break; /* Dynamic typing. */ } - reg[REG_R0].type = REG_S64; + /* Pop 2, push 1 */ + if (vstack_pop(stack)) { + ret = -EINVAL; + goto end; + } + vstack_ax(stack)->type = REG_S64; next_pc += sizeof(struct binary_op); break; } @@ -208,26 +318,41 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) { struct binary_op *insn = (struct binary_op *) pc; - switch(reg[REG_R0].type) { + switch(vstack_ax(stack)->type) { default: ERR("unknown register type\n"); ret = -EINVAL; goto end; + case REG_STAR_GLOB_STRING: + ERR("invalid register type for <= binary operator\n"); + ret = -EINVAL; + goto end; case REG_STRING: + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; insn->op = FILTER_OP_LE_STRING; break; case REG_S64: - if (reg[REG_R1].type == REG_S64) + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + if (vstack_bx(stack)->type == REG_S64) insn->op = FILTER_OP_LE_S64; else - insn->op = FILTER_OP_LE_DOUBLE; + insn->op = FILTER_OP_LE_DOUBLE_S64; break; case REG_DOUBLE: - insn->op = FILTER_OP_LE_DOUBLE; + if (vstack_bx(stack)->type == REG_UNKNOWN) + break; + if (vstack_bx(stack)->type == REG_S64) + insn->op = FILTER_OP_LE_S64_DOUBLE; + else + insn->op = FILTER_OP_LE_DOUBLE; break; + case REG_UNKNOWN: + break; /* Dynamic typing. */ } - reg[REG_R0].type = REG_S64; + vstack_ax(stack)->type = REG_S64; next_pc += sizeof(struct binary_op); break; } @@ -238,6 +363,8 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) case FILTER_OP_LT_STRING: case FILTER_OP_GE_STRING: case FILTER_OP_LE_STRING: + case FILTER_OP_EQ_STAR_GLOB_STRING: + case FILTER_OP_NE_STAR_GLOB_STRING: case FILTER_OP_EQ_S64: case FILTER_OP_NE_S64: case FILTER_OP_GT_S64: @@ -250,8 +377,25 @@ int lttng_filter_specialize_bytecode(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: { - reg[REG_R0].type = REG_S64; + /* Pop 2, push 1 */ + if (vstack_pop(stack)) { + ret = -EINVAL; + goto end; + } + vstack_ax(stack)->type = REG_S64; next_pc += sizeof(struct binary_op); break; } @@ -261,7 +405,7 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) { struct unary_op *insn = (struct unary_op *) pc; - switch(reg[insn->reg].type) { + switch(vstack_ax(stack)->type) { default: ERR("unknown register type\n"); ret = -EINVAL; @@ -273,7 +417,10 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) case REG_DOUBLE: insn->op = FILTER_OP_UNARY_PLUS_DOUBLE; break; + case REG_UNKNOWN: /* Dynamic typing. */ + break; } + /* Pop 1, push 1 */ next_pc += sizeof(struct unary_op); break; } @@ -282,7 +429,7 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) { struct unary_op *insn = (struct unary_op *) pc; - switch(reg[insn->reg].type) { + switch(vstack_ax(stack)->type) { default: ERR("unknown register type\n"); ret = -EINVAL; @@ -294,7 +441,10 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) case REG_DOUBLE: insn->op = FILTER_OP_UNARY_MINUS_DOUBLE; break; + case REG_UNKNOWN: /* Dynamic typing. */ + break; } + /* Pop 1, push 1 */ next_pc += sizeof(struct unary_op); break; } @@ -303,7 +453,7 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) { struct unary_op *insn = (struct unary_op *) pc; - switch(reg[insn->reg].type) { + switch(vstack_ax(stack)->type) { default: ERR("unknown register type\n"); ret = -EINVAL; @@ -315,7 +465,10 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) case REG_DOUBLE: insn->op = FILTER_OP_UNARY_NOT_DOUBLE; break; + case REG_UNKNOWN: /* Dynamic typing. */ + break; } + /* Pop 1, push 1 */ next_pc += sizeof(struct unary_op); break; } @@ -327,6 +480,7 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) case FILTER_OP_UNARY_MINUS_DOUBLE: case FILTER_OP_UNARY_NOT_DOUBLE: { + /* Pop 1, push 1 */ next_pc += sizeof(struct unary_op); break; } @@ -335,62 +489,103 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) case FILTER_OP_AND: case FILTER_OP_OR: { + /* Continue to next instruction */ + /* Pop 1 when jump not taken */ + if (vstack_pop(stack)) { + ret = -EINVAL; + goto end; + } next_pc += sizeof(struct logical_op); 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: { - struct load_op *insn = (struct load_op *) pc; - - reg[insn->reg].type = REG_STRING; - reg[insn->reg].literal = 0; + if (vstack_push(stack)) { + ret = -EINVAL; + goto end; + } + vstack_ax(stack)->type = REG_STRING; next_pc += sizeof(struct load_op) + sizeof(struct field_ref); break; } case FILTER_OP_LOAD_FIELD_REF_S64: + case FILTER_OP_GET_CONTEXT_REF_S64: { - struct load_op *insn = (struct load_op *) pc; - - reg[insn->reg].type = REG_S64; - reg[insn->reg].literal = 0; + if (vstack_push(stack)) { + ret = -EINVAL; + goto end; + } + vstack_ax(stack)->type = REG_S64; next_pc += sizeof(struct load_op) + sizeof(struct field_ref); break; } case FILTER_OP_LOAD_FIELD_REF_DOUBLE: + case FILTER_OP_GET_CONTEXT_REF_DOUBLE: { - struct load_op *insn = (struct load_op *) pc; - - reg[insn->reg].type = REG_DOUBLE; - reg[insn->reg].literal = 0; + if (vstack_push(stack)) { + ret = -EINVAL; + goto end; + } + vstack_ax(stack)->type = REG_DOUBLE; next_pc += sizeof(struct load_op) + sizeof(struct field_ref); break; } + /* load from immediate operand */ case FILTER_OP_LOAD_STRING: { struct load_op *insn = (struct load_op *) pc; - reg[insn->reg].type = REG_STRING; - reg[insn->reg].literal = 1; + if (vstack_push(stack)) { + ret = -EINVAL; + goto end; + } + vstack_ax(stack)->type = REG_STRING; next_pc += sizeof(struct load_op) + strlen(insn->data) + 1; break; } - case FILTER_OP_LOAD_S64: + case FILTER_OP_LOAD_STAR_GLOB_STRING: { struct load_op *insn = (struct load_op *) pc; - reg[insn->reg].type = REG_S64; - reg[insn->reg].literal = 1; + if (vstack_push(stack)) { + ret = -EINVAL; + goto end; + } + vstack_ax(stack)->type = REG_STAR_GLOB_STRING; + next_pc += sizeof(struct load_op) + strlen(insn->data) + 1; + break; + } + + case FILTER_OP_LOAD_S64: + { + if (vstack_push(stack)) { + ret = -EINVAL; + goto end; + } + vstack_ax(stack)->type = REG_S64; next_pc += sizeof(struct load_op) + sizeof(struct literal_numeric); break; @@ -398,10 +593,11 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) case FILTER_OP_LOAD_DOUBLE: { - struct load_op *insn = (struct load_op *) pc; - - reg[insn->reg].type = REG_DOUBLE; - reg[insn->reg].literal = 1; + if (vstack_push(stack)) { + ret = -EINVAL; + goto end; + } + vstack_ax(stack)->type = REG_DOUBLE; next_pc += sizeof(struct load_op) + sizeof(struct literal_double); break; @@ -412,13 +608,14 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) { struct cast_op *insn = (struct cast_op *) pc; - switch (reg[insn->reg].type) { + switch (vstack_ax(stack)->type) { default: ERR("unknown register type\n"); ret = -EINVAL; goto end; case REG_STRING: + case REG_STAR_GLOB_STRING: ERR("Cast op can only be applied to numeric or floating point registers\n"); ret = -EINVAL; goto end; @@ -428,16 +625,18 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) case REG_DOUBLE: insn->op = FILTER_OP_CAST_DOUBLE_TO_S64; break; + case REG_UNKNOWN: + break; } - reg[insn->reg].type = REG_S64; + /* Pop 1, push 1 */ + vstack_ax(stack)->type = REG_S64; next_pc += sizeof(struct cast_op); break; } case FILTER_OP_CAST_DOUBLE_TO_S64: { - struct cast_op *insn = (struct cast_op *) pc; - - reg[insn->reg].type = REG_S64; + /* Pop 1, push 1 */ + vstack_ax(stack)->type = REG_S64; next_pc += sizeof(struct cast_op); break; } @@ -447,7 +646,6 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) break; } - } } end: