Version 2.9.15

[lttng-modules.git] / lttng-filter-validator.c

diff --git a/lttng-filter-validator.c b/lttng-filter-validator.c
index 71e9a7409167d87684bb11049040f7f0a459d14c..b15dfaf97cc1283d549c0624819d03505aebebd8 100644 (file)
--- a/lttng-filter-validator.c
+++ b/lttng-filter-validator.c
@@ -20,11 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <linux/list.h>
+#include <linux/types.h>
 #include <linux/jhash.h>
 #include <linux/slab.h>
 
-#include "lttng-filter.h"
+#include <wrapper/list.h>
+#include <lttng-filter.h>
 
 #define MERGE_POINT_TABLE_BITS         7
 #define MERGE_POINT_TABLE_SIZE         (1U << MERGE_POINT_TABLE_BITS)
@@ -87,7 +88,7 @@ int merge_point_add_check(struct mp_table *mp_table, unsigned long target_pc,
        memcpy(&mp_node->stack, stack, sizeof(mp_node->stack));
 
        head = &mp_table->mp_head[hash & (MERGE_POINT_TABLE_SIZE - 1)];
-       hlist_for_each_entry(lookup_node, head, node) {
+       lttng_hlist_for_each_entry(lookup_node, head, node) {
                if (lttng_hash_match(lookup_node, target_pc)) {
                        found = 1;
                        break;
@@ -103,8 +104,9 @@ int merge_point_add_check(struct mp_table *mp_table, unsigned long target_pc,
                                target_pc);
                        return -EINVAL;
                }
+       } else {
+               hlist_add_head(&mp_node->node, head);
        }
-       hlist_add_head(&mp_node->node, head);
        return 0;
 }
 
@@ -164,7 +166,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;
 
@@ -299,6 +301,8 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
        }
        case FILTER_OP_LOAD_FIELD_REF_STRING:
        case FILTER_OP_LOAD_FIELD_REF_SEQUENCE:
+       case FILTER_OP_LOAD_FIELD_REF_USER_STRING:
+       case FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE:
        case FILTER_OP_LOAD_FIELD_REF_S64:
        case FILTER_OP_GET_CONTEXT_REF_STRING:
        case FILTER_OP_GET_CONTEXT_REF_S64:
@@ -367,7 +371,7 @@ unsigned long delete_all_nodes(struct mp_table *mp_table)
                struct hlist_head *head;
 
                head = &mp_table->mp_head[i];
-               hlist_for_each_entry_safe(mp_node, tmp, head, node) {
+               lttng_hlist_for_each_entry_safe(mp_node, tmp, head, node) {
                        kfree(mp_node);
                        nr_nodes++;
                }
@@ -383,8 +387,8 @@ unsigned long delete_all_nodes(struct mp_table *mp_table)
 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;
 
@@ -612,6 +616,8 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
        }
        case FILTER_OP_LOAD_FIELD_REF_STRING:
        case FILTER_OP_LOAD_FIELD_REF_SEQUENCE:
+       case FILTER_OP_LOAD_FIELD_REF_USER_STRING:
+       case FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE:
        {
                struct load_op *insn = (struct load_op *) pc;
                struct field_ref *ref = (struct field_ref *) insn->data;
@@ -718,8 +724,8 @@ static
 int validate_instruction_all_contexts(struct bytecode_runtime *bytecode,
                struct mp_table *mp_table,
                struct vstack *stack,
-               void *start_pc,
-               void *pc)
+               char *start_pc,
+               char *pc)
 {
        int ret, found = 0;
        unsigned long target_pc = pc - start_pc;
@@ -735,7 +741,7 @@ int validate_instruction_all_contexts(struct bytecode_runtime *bytecode,
        /* Validate merge points */
        hash = jhash_1word(target_pc, 0);
        head = &mp_table->mp_head[hash & (MERGE_POINT_TABLE_SIZE - 1)];
-       hlist_for_each_entry(mp_node, head, node) {
+       lttng_hlist_for_each_entry(mp_node, head, node) {
                if (lttng_hash_match(mp_node, target_pc)) {
                        found = 1;
                        break;
@@ -767,11 +773,11 @@ static
 int exec_insn(struct bytecode_runtime *bytecode,
                struct mp_table *mp_table,
                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:
@@ -932,6 +938,8 @@ int exec_insn(struct bytecode_runtime *bytecode,
        case FILTER_OP_LOAD_FIELD_REF_STRING:
        case FILTER_OP_LOAD_FIELD_REF_SEQUENCE:
        case FILTER_OP_GET_CONTEXT_REF_STRING:
+       case FILTER_OP_LOAD_FIELD_REF_USER_STRING:
+       case FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE:
        {
                if (vstack_push(stack)) {
                        ret = -EINVAL;
@@ -1009,7 +1017,7 @@ end:
 int lttng_filter_validate_bytecode(struct bytecode_runtime *bytecode)
 {
        struct mp_table *mp_table;
-       void *pc, *next_pc, *start_pc;
+       char *pc, *next_pc, *start_pc;
        int ret = -EINVAL;
        struct vstack stack;