X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-filter.c;h=ed4bc5bb3b936c317eb36d25f2311f419d50993e;hb=7299e758b109db074589f7879ae631b27c25dc05;hp=6cd750cd6934c2a7a75d3e519950f99e995a5851;hpb=07dfc1d0e4b093ad02682499a702dc11e54e8302;p=lttng-modules.git

diff --git a/lttng-filter.c b/lttng-filter.c
index 6cd750cd..ed4bc5bb 100644
--- a/lttng-filter.c
+++ b/lttng-filter.c
@@ -3,27 +3,31 @@
  *
  * LTTng modules filter code.
  *
- * Copyright (C) 2010-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2010-2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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.
  */
 
 #include <linux/list.h>
 #include <linux/slab.h>
 
-#include "lttng-filter.h"
+#include <lttng-filter.h>
 
 static const char *opnames[] = {
 	[ FILTER_OP_UNKNOWN ] = "UNKNOWN",
@@ -126,6 +130,20 @@ static const char *opnames[] = {
 	[ FILTER_OP_GET_CONTEXT_REF_STRING ] = "GET_CONTEXT_REF_STRING",
 	[ FILTER_OP_GET_CONTEXT_REF_S64 ] = "GET_CONTEXT_REF_S64",
 	[ FILTER_OP_GET_CONTEXT_REF_DOUBLE ] = "GET_CONTEXT_REF_DOUBLE",
+
+	/* load userspace field ref */
+	[ FILTER_OP_LOAD_FIELD_REF_USER_STRING ] = "LOAD_FIELD_REF_USER_STRING",
+	[ FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE ] = "LOAD_FIELD_REF_USER_SEQUENCE",
+
+	/*
+	 * load immediate star globbing pattern (literal string)
+	 * from immediate.
+	 */
+	[ FILTER_OP_LOAD_STAR_GLOB_STRING ] = "LOAD_STAR_GLOB_STRING",
+
+	/* globbing pattern binary operator: apply to */
+	[ FILTER_OP_EQ_STAR_GLOB_STRING ] = "EQ_STAR_GLOB_STRING",
+	[ FILTER_OP_NE_STAR_GLOB_STRING ] = "NE_STAR_GLOB_STRING",
 };
 
 const char *lttng_filter_print_op(enum filter_op op)
@@ -179,6 +197,10 @@ int apply_field_reloc(struct lttng_event *event,
 		case atype_string:
 			field_offset += sizeof(void *);
 			break;
+		case atype_struct:		/* Unsupported. */
+		case atype_array_compound:	/* Unsupported. */
+		case atype_sequence_compound:	/* Unsupported. */
+		case atype_variant:		/* Unsupported. */
 		default:
 			return -EINVAL;
 		}
@@ -187,7 +209,7 @@ int apply_field_reloc(struct lttng_event *event,
 		return -EINVAL;
 
 	/* Check if field offset is too large for 16-bit offset */
-	if (field_offset > FILTER_BYTECODE_MAX_LEN - 1)
+	if (field_offset > LTTNG_KERNEL_FILTER_BYTECODE_MAX_LEN - 1)
 		return -EINVAL;
 
 	/* set type */
@@ -200,11 +222,21 @@ int apply_field_reloc(struct lttng_event *event,
 		break;
 	case atype_array:
 	case atype_sequence:
-		op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
+		if (field->user)
+			op->op = FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE;
+		else
+			op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
 		break;
 	case atype_string:
-		op->op = FILTER_OP_LOAD_FIELD_REF_STRING;
+		if (field->user)
+			op->op = FILTER_OP_LOAD_FIELD_REF_USER_STRING;
+		else
+			op->op = FILTER_OP_LOAD_FIELD_REF_STRING;
 		break;
+	case atype_struct:		/* Unsupported. */
+	case atype_array_compound:	/* Unsupported. */
+	case atype_sequence_compound:	/* Unsupported. */
+	case atype_variant:		/* Unsupported. */
 	default:
 		return -EINVAL;
 	}
@@ -233,7 +265,7 @@ int apply_context_reloc(struct lttng_event *event,
 		return -ENOENT;
 
 	/* Check if idx is too large for 16-bit offset */
-	if (idx > FILTER_BYTECODE_MAX_LEN - 1)
+	if (idx > LTTNG_KERNEL_FILTER_BYTECODE_MAX_LEN - 1)
 		return -EINVAL;
 
 	/* Get context return type */
@@ -249,8 +281,13 @@ int apply_context_reloc(struct lttng_event *event,
 	case atype_string:
 	case atype_array:
 	case atype_sequence:
+		BUG_ON(ctx_field->event_field.user);
 		op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
 		break;
+	case atype_struct:	/* Unsupported. */
+	case atype_array_compound:	/* Unsupported. */
+	case atype_sequence_compound:	/* Unsupported. */
+	case atype_variant:		/* Unsupported. */
 	default:
 		return -EINVAL;
 	}