Merge pull request #33 from OrderLab/dev

Refactor headers

Author: linsyking

core/CMakeLists.txt

@@ -8,7 +8,6 @@ add_library(
   epass STATIC
   bpf_ir.c
   array.c
-  hashtbl.c
   ptrset.c
   ir_helper.c
   ir_value.c
@@ -28,17 +27,13 @@ add_library(
   aux/kern_utils.c
   aux/cg_prog_check.c
   ir_cg.c
-  ir_cg_v2.c
   ir_cg_norm.c
-  ir_cg_norm_v2.c
   lli.c
   include/linux/bpf_ir.h)
 
 add_executable(test_list tests/test_list.c)
-add_executable(test_hashtable tests/test_hashtable.c)
 add_executable(test_ptrset tests/test_ptrset.c)
 
-target_link_libraries(test_hashtable epass)
 target_link_libraries(test_ptrset epass)
 
 include_directories(include)

core/array.c

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-#include <linux/bpf_ir.h>
+#include "ir.h"
 
 void bpf_ir_array_init(struct array *res, size_t size)
 {

core/aux/cg_prog_check.c

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-#include <linux/bpf_ir.h>
+#include "ir.h"
 #include "ir_cg.h"
 
 static void check_userdata(struct bpf_ir_env *env, struct ir_function *fun)
@@ -10,7 +10,7 @@ static void check_userdata(struct bpf_ir_env *env, struct ir_function *fun)
 		struct ir_basic_block *bb = *pos;
 		struct ir_insn *insn;
 		list_for_each_entry(insn, &bb->ir_insn_head, list_ptr) {
-			if (!insn_cg_v2(insn)) {
+			if (!insn_cg(insn)) {
 				print_ir_insn_err(env, insn, "No userdata");
 				RAISE_ERROR("No userdata");
 			}

core/aux/disasm.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // Modified from kernel/bpf/disasm.c
-#include <linux/bpf_ir.h>
+#include "ir.h"
 
 static const char *const bpf_class_string[8] = {
 	[BPF_LD] = "ld",       [BPF_LDX] = "ldx",     [BPF_ST] = "st",

core/aux/ir_utils.c

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-#include <linux/bpf_ir.h>
+#include "ir.h"
 
 // Insert some instructions to print a message
 void bpf_ir_printk_insns(struct bpf_ir_env *env, struct ir_insn *insn,

core/aux/kern_utils.c

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-#include <linux/bpf_ir.h>
+#include "ir.h"
 
 static int apply_pass_opt(struct bpf_ir_env *env, const char *opt)
 {
@@ -93,8 +93,6 @@ static int apply_global_opt(struct bpf_ir_env *env, const char *opt)
 {
 	if (strcmp(opt, "force") == 0) {
 		env->opts.force = true;
-	} else if (strcmp(opt, "disable_coalesce") == 0) {
-		env->opts.disable_coalesce = true;
 	} else if (strcmp(opt, "print_bpf") == 0) {
 		env->opts.print_mode = BPF_IR_PRINT_BPF;
 	} else if (strcmp(opt, "print_dump") == 0) {
@@ -113,8 +111,6 @@ static int apply_global_opt(struct bpf_ir_env *env, const char *opt)
 		env->opts.print_only = true;
 	} else if (strcmp(opt, "fakerun") == 0) {
 		env->opts.fake_run = true;
-	} else if (strcmp(opt, "cgv1") == 0) {
-		env->opts.cg_v2 = false;
 	} else if (strcmp(opt, "dotgraph") == 0) {
 		env->opts.dotgraph = true;
 	} else if (strncmp(opt, "verbose=", 8) == 0) {

core/aux/prog_check.c

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-#include <linux/bpf_ir.h>
+#include "ir.h"
 
 static void check_insn_users_use_insn(struct bpf_ir_env *env,
 				      struct ir_insn *insn)

core/bpf_ir.c

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-#include <linux/bpf_ir.h>
+#include "ir.h"
 
 static const s8 helper_func_arg_num[] = {
 	[1] = 2, // map_lookup_elem
@@ -1503,18 +1503,9 @@ void bpf_ir_free_function(struct ir_function *fun)
 		bpf_ir_array_free(&fun->sp->users);
 		free_proto(fun->sp);
 	}
-	for (u8 i = 0; i < BPF_REG_10; ++i) {
-		struct ir_insn *insn = fun->cg_info.regs[i];
-		bpf_ir_array_free(&insn->users);
-		free_proto(insn);
-	}
 	bpf_ir_array_free(&fun->all_bbs);
 	bpf_ir_array_free(&fun->reachable_bbs);
 	bpf_ir_array_free(&fun->end_bbs);
-	bpf_ir_array_free(&fun->cg_info.seo);
-
-	bpf_ir_array_free(&fun->cg_info.all_var);
-	bpf_ir_ptrset_free(&fun->cg_info.all_var_v2);
 }
 
 static void init_function(struct bpf_ir_env *env, struct ir_function *fun,
@@ -1529,10 +1520,6 @@ static void init_function(struct bpf_ir_env *env, struct ir_function *fun,
 	INIT_ARRAY(&fun->all_bbs, struct ir_basic_block *);
 	INIT_ARRAY(&fun->reachable_bbs, struct ir_basic_block *);
 	INIT_ARRAY(&fun->end_bbs, struct ir_basic_block *);
-	INIT_ARRAY(&fun->cg_info.all_var, struct ir_insn *);
-	INIT_ARRAY(&fun->cg_info.seo, struct ir_insn *);
-	INIT_PTRSET_DEF(&fun->cg_info.all_var_v2);
-	fun->cg_info.stack_offset = 0;
 	for (size_t i = 0; i < MAX_BPF_REG; ++i) {
 		struct array *currentDef = &tenv->currentDef[i];
 		bpf_ir_array_free(currentDef);
@@ -1548,17 +1535,6 @@ static void init_function(struct bpf_ir_env *env, struct ir_function *fun,
 		bpf_ir_array_push(env, &fun->all_bbs, &bb->ir_bb);
 		free_proto(bb);
 	}
-	for (u8 i = 0; i < BPF_REG_10; ++i) {
-		struct ir_insn *insn;
-		SAFE_MALLOC(fun->cg_info.regs[i], sizeof(struct ir_insn));
-		// Those should be read-only
-		insn = fun->cg_info.regs[i];
-		insn->op = IR_INSN_REG;
-		insn->parent_bb = NULL;
-		INIT_ARRAY(&insn->users, struct ir_insn *);
-		insn->value_num = 0;
-		insn->reg_id = i;
-	}
 }
 
 static void gen_bb_succ(struct bpf_ir_env *env, struct ir_function *fun)
@@ -1974,10 +1950,8 @@ struct bpf_ir_opts bpf_ir_default_opts(void)
 	opts.print_mode = BPF_IR_PRINT_BPF;
 	opts.builtin_pass_cfg_num = 0;
 	opts.custom_pass_num = 0;
-	opts.disable_coalesce = false;
 	opts.force = false;
 	opts.verbose = 1;
-	opts.cg_v2 = true;
 	opts.dotgraph = false;
 	opts.fake_run = false;
 	opts.max_iteration = 10;

core/epasstool/epasstool.h

@@ -2,7 +2,7 @@
 #ifndef _EPASS_TOOL_H_
 #define _EPASS_TOOL_H_
 
-#include <linux/bpf_ir.h>
+#include "ir.h"
 
 struct user_opts {
 	char gopt[64];

core/epasstool/read.c

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include "bpf/libbpf.h"
 #include "epasstool.h"
-#include <unistd.h>
-#include <sys/wait.h>
 
 static void print_bpf_prog_dump(FILE *fp, const struct bpf_insn *insns,
 				size_t len)
@@ -91,7 +89,7 @@ int epass_read(struct user_opts uopts)
 	struct bpf_program *prog = NULL;
 	if (uopts.auto_sec) {
 		prog = bpf_object__next_program(obj, NULL);
-		strcpy(uopts.sec, bpf_program__section_name(prog));
+		strcpy(uopts.sec, bpf_program__name(prog));
 	} else {
 		prog = bpf_object__find_program_by_name(obj, uopts.sec);
 	}
@@ -101,10 +99,26 @@ int epass_read(struct user_opts uopts)
 		err = 1;
 		goto end;
 	}
-	size_t sz = bpf_program__insn_cnt(prog);
-	const struct bpf_insn *insn = bpf_program__insns(prog);
 
-	err = epass_run(uopts, insn, sz);
+	u64 tot_prog_cnt = 0;
+
+	while (prog) {
+		size_t sz = bpf_program__insn_cnt(prog);
+		tot_prog_cnt += sz;
+		const struct bpf_insn *insn = bpf_program__insns(prog);
+		err = epass_run(uopts, insn, sz);
+
+		if (uopts.auto_sec) {
+			prog = bpf_object__next_program(obj, prog);
+			if (prog) {
+				strcpy(uopts.sec, bpf_program__name(prog));
+			}
+		} else {
+			prog = NULL;
+		}
+	}
+
+	printf("processed %llu instructions\n", tot_prog_cnt);
 
 end:
 	bpf_object__close(obj);