filter: define arg_cmp and arg_type

4 files changed, 40 insertions, 36 deletions

diff --git a/tests/unit/test_filter.c b/tests/unit/test_filter.c
index 4d7c9d8..90ffa2b 100644
--- a/tests/unit/test_filter.c
+++ b/tests/unit/test_filter.c
@@ -32,10 +32,10 @@ static int generate_install_filter(struct args_target *at)
 
 	for (i = 0; i < 6; i++) {
 		if (at->args[i] == NULL) {
-			calls[0].args[i].type = NO_CHECK;
+			calls[0].args[i].cmp = NO_CHECK;
 			continue;
 		}
-		switch (at->arg_type[i]) {
+		switch (at->type[i]) {
 		case U32:
 			calls[0].args[i].value.v32 = (uint32_t)at->args[i];
 			calls[0].args[i].type = U32;
@@ -44,13 +44,9 @@ static int generate_install_filter(struct args_target *at)
 			calls[0].args[i].value.v64 = (uint64_t)at->args[i];
 			calls[0].args[i].type = U64;
 			break;
-		case NO_CHECK:
-			calls[0].args[i].type = NO_CHECK;
-			break;
 		}
 	}
 	size = create_bfp_program(table, filter, 1);
-	bpf_disasm_all(filter, size);
 	return install_filter(filter, size);
 }
 
@@ -76,7 +72,7 @@ START_TEST(with_getsid)
 	at->nr = __NR_getsid;
 	set_args_no_check(at);
 	at->args[0] = &id;
-	at->arg_type[0] = U32;
+	at->type[0] = U32;
 	at->install_filter = generate_install_filter;
 	setup();
 	mock_syscall_target();
@@ -93,9 +89,9 @@ START_TEST(with_getpriority)
 	at->nr = __NR_getpriority;
 	set_args_no_check(at);
 	at->args[0] = &which;
-	at->arg_type[0] = U32;
+	at->type[0] = U32;
 	at->args[1] = &who;
-	at->arg_type[0] = U32;
+	at->type[0] = U32;
 	at->install_filter = generate_install_filter;
 	setup();
 	mock_syscall_target();
@@ -121,7 +117,7 @@ static void test_lseek(off_t offset)
 	at->target = target_lseek;
 	set_args_no_check(at);
 	at->args[1] = offset;
-	at->arg_type[1] = U64;
+	at->type[1] = U64;
 	at->install_filter = generate_install_filter;
 	setup();
 	mock_syscall_target();
diff --git a/tests/unit/test_filter_build.c b/tests/unit/test_filter_build.c
index 4727e51..343d020 100644
--- a/tests/unit/test_filter_build.c
+++ b/tests/unit/test_filter_build.c
@@ -68,12 +68,13 @@ START_TEST(test_single_instr_two_args)
 	unsigned int size;
 	long nr = 42;
 	struct bpf_call calls[] = {
-		{
-			.name = "test1",
-			.args = { 0, 123, 321, 0, 0, 0 },
-			.check_arg = { NO_CHECK, U32, U32, NO_CHECK, NO_CHECK,
-				       NO_CHECK },
-		},
+		{ .name = "test1",
+		  .args = { [1] = { .cmp = EQ,
+				    .value = { .v32 = 123 },
+				    .type = U32 },
+			    [2] = { .cmp = EQ,
+				    .value = { .v32 = 321 },
+				    .type = U32 } } },
 	};
 	struct syscall_entry table[] = {
 		{ .count = 1, .nr = nr, .entry = &calls[0] },
@@ -198,15 +199,21 @@ START_TEST(test_multiple_instr_with_args)
 	unsigned int size;
 	struct bpf_call calls[] = {
 		{ .name = "test1",
-		  .args = { 0, 123, 321, 0, 0, 0 },
-		  .check_arg = { NO_CHECK, U32, U32, NO_CHECK, NO_CHECK,
-				 NO_CHECK } },
+		  .args = { [1] = { .cmp = EQ,
+				    .value = { .v32 = 123 },
+				    .type = U32 },
+			    [2] = { .cmp = EQ,
+				    .value = { .v32 = 321 },
+				    .type = U32 } } },
 		{ .name = "test2" },
 		{ .name = "test3" },
 		{ .name = "test4",
-		  .args = { 0, 123, 321, 0, 0, 0 },
-		  .check_arg = { NO_CHECK, U32, U32, NO_CHECK, NO_CHECK,
-				 NO_CHECK } },
+		  .args = { [1] = { .cmp = EQ,
+				    .value = { .v32 = 123 },
+				    .type = U32 },
+			    [2] = { .cmp = EQ,
+				    .value = { .v32 = 321 },
+				    .type = U32 } } },
 		{ .name = "test5" },
 	};
 	struct syscall_entry table[] = {
@@ -274,23 +281,23 @@ START_TEST(test_multiple_instance_same_instr)
 	unsigned int size;
 	struct bpf_call calls[] = {
 		{ .name = "test1",
-		  .args = { 0, 123, 0, 0, 0, 0 },
-		  .check_arg = { NO_CHECK, U32, NO_CHECK, NO_CHECK, NO_CHECK,
-				 NO_CHECK } },
+		  .args = { [1] = { .cmp = EQ,
+				    .value = { .v32 = 123 },
+				    .type = U32 } } },
 		{ .name = "test1",
-		  .args = { 0, 0, 321, 0, 0, 0 },
-		  .check_arg = { NO_CHECK, NO_CHECK, U32, NO_CHECK, NO_CHECK,
-				 NO_CHECK } },
+		  .args = { [2] = { .cmp = EQ,
+				    .value = { .v32 = 321 },
+				    .type = U32 } } },
 		{ .name = "test2" },
 		{ .name = "test3" },
 		{ .name = "test4",
-		  .args = { 0, 123, 0, 0, 0, 0 },
-		  .check_arg = { NO_CHECK, U32, NO_CHECK, NO_CHECK, NO_CHECK,
-				 NO_CHECK } },
+		  .args = { [1] = { .cmp = EQ,
+				    .value = { .v32 = 123 },
+				    .type = U32 } } },
 		{ .name = "test4",
-		  .args = { 0, 0, 321, 0, 0, 0 },
-		  .check_arg = { NO_CHECK, NO_CHECK, U32, NO_CHECK, NO_CHECK,
-				 NO_CHECK } },
+		  .args = { [2] = { .cmp = EQ,
+				    .value = { .v32 = 321 },
+				    .type = U32 } } },
 		{ .name = "test5" },
 	};
 	struct syscall_entry table[] = {
diff --git a/tests/unit/testutil.h b/tests/unit/testutil.h
index 7bb971a..4bd5550 100644
--- a/tests/unit/testutil.h
+++ b/tests/unit/testutil.h
@@ -19,7 +19,8 @@ struct args_target {
         bool open_path;
         int fd;
         int nr;
-	enum arg_type arg_type[6];
+	enum arg_cmp cmp[6];
+	enum arg_type type[6];
 	void *args[6];
 	int (*install_filter)(struct args_target *at);
 	int (*target)(void *);
diff --git a/tests/unit/util.c b/tests/unit/util.c
index 7e5ec83..89d5d73 100644
--- a/tests/unit/util.c
+++ b/tests/unit/util.c
@@ -188,7 +188,7 @@ void mock_syscall_target()
 void set_args_no_check(struct args_target *at)
 {
 	for (unsigned int i = 0; i < 6; i++)
-		at->arg_type[i] = NO_CHECK;
+		at->cmp[i] = NO_CHECK;
 }
 
 void setup()