#include <string.h>
#include <inttypes.h>
#include <limits.h>
+#include <usterr-signal-safe.h>
#include "filter-bytecode.h"
#define NR_REG 2
struct reg {
enum {
REG_S64,
- REG_STRING, /* NULL-terminated string */
- REG_SEQUENCE, /* non-null terminated */
+ REG_DOUBLE,
+ REG_STRING,
} type;
int64_t v;
+ double d;
const char *str;
size_t seq_len;
[ 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
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;
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;
}
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;
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;
}
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;
}
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;
}
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;
}
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;
}
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;
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;
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;
}
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;
}
{
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;
}
{
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;
}
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;
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;
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:
reg[insn->reg].literal = 0;
dbg_printf("ref load s64 %" PRIi64 "\n", reg[insn->reg].v);
break;
+ case FIELD_REF_DOUBLE:
+ memcpy(®[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);
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;
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;
+ 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(®[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:
struct field_ref *field_ref;
uint32_t field_offset = 0;
- fprintf(stderr, "Apply reloc: %u %s\n", reloc_offset, field_name);
+ dbg_printf("Apply reloc: %u %s\n", reloc_offset, field_name);
/* Ensure that the reloc is within the code */
if (runtime_len - reloc_offset < sizeof(uint16_t))
break;
case atype_float:
field_offset += sizeof(double);
+ break;
default:
return -EINVAL;
}
field_ref->type = FIELD_REF_STRING;
break;
case atype_float:
- return -EINVAL;
+ field_ref->type = FIELD_REF_DOUBLE;
+ break;
default:
return -EINVAL;
}
if (event->filter || event->filter_data)
return 0;
- fprintf(stderr, "Linking\n");
+ dbg_printf("Linking\n");
/* We don't need the reloc table in the runtime */
runtime_alloc_len = sizeof(*runtime) + filter_bytecode->reloc_offset;
* apply relocs. Those are a uint16_t (offset in bytecode)
* followed by a string (field name).
*/
- fprintf(stderr, "iter for %d %d\n", filter_bytecode->reloc_offset, filter_bytecode->len);
for (offset = filter_bytecode->reloc_offset;
offset < filter_bytecode->len;
offset = next_offset) {