feat: add_counter ignored

linsyking · linsyking · commit 06be843789b7 · 2024-10-23T20:58:28.000-04:00
diff --git a/include/linux/bpf_ir.h b/include/linux/bpf_ir.h
@@ -1237,6 +1237,8 @@ void bpr_ir_cg_to_cssa(struct bpf_ir_env *env, struct ir_function *fun,
 int bpf_ir_init_opts(struct bpf_ir_env *env, const char *pass_opt,
 		     const char *global_opt);
 
+bool bpf_ir_builtin_pass_enabled(struct bpf_ir_env *env, const char *pass_name);
+
 void bpf_ir_free_opts(struct bpf_ir_env *env);
 
 /* Kern Utils End */
diff --git a/kernel/bpf/ir/kern_utils.c b/kernel/bpf/ir/kern_utils.c
@@ -87,7 +87,6 @@ static int apply_pass_opt(struct bpf_ir_env *env, const char *opt)
 
 static int apply_global_opt(struct bpf_ir_env *env, const char *opt)
 {
-	PRINT_DBG("global opt: %s\n", opt);
 	if (strcmp(opt, "force") == 0) {
 		env->opts.force = true;
 	} else if (strcmp(opt, "enable_coalesce") == 0) {
@@ -128,6 +127,18 @@ static int apply_global_opt(struct bpf_ir_env *env, const char *opt)
 	return 0;
 }
 
+// Check if a builtin pass is enabled (by cfg)
+bool bpf_ir_builtin_pass_enabled(struct bpf_ir_env *env, const char *pass_name)
+{
+	for (size_t i = 0; i < env->opts.builtin_pass_cfg_num; ++i) {
+		if (strcmp(env->opts.builtin_pass_cfg[i].name, pass_name) ==
+		    0) {
+			return env->opts.builtin_pass_cfg[i].enable_cfg;
+		}
+	}
+	return false;
+}
+
 /* Initialize pass configuration for kernel component
  *
  * @param env: bpf_ir_env, must be already initialized
diff --git a/kernel/bpf/ir_kern.c b/kernel/bpf/ir_kern.c
@@ -28,13 +28,24 @@ bool bpf_ir_canfix(struct bpf_ir_env *env)
 	int err = env->verifier_err;
 
 	for (size_t i = 0; i < env->opts.custom_pass_num; ++i) {
-		if (env->opts.custom_passes[i].check_apply && env->opts.custom_passes[i].check_apply(err)) {
+		if (env->opts.custom_passes[i].check_apply &&
+		    env->opts.custom_passes[i].check_apply(err)) {
 			return true;
 		}
 	}
 	return false;
 }
 
+// Enable all builtin passes specified by enable_cfg
+static void enable_builtin(struct bpf_ir_env *env)
+{
+	for (size_t i = 0; i < env->opts.builtin_pass_cfg_num; ++i) {
+		if (env->opts.builtin_pass_cfg[i].enable_cfg) {
+			env->opts.builtin_pass_cfg[i].enable = true;
+		}
+	}
+}
+
 int bpf_ir_kern_run(struct bpf_prog **prog_ptr, union bpf_attr *attr,
 		    bpfptr_t uattr, u32 uattr_size, const char *pass_opt,
 		    const char *global_opt)
@@ -81,7 +92,29 @@ int bpf_ir_kern_run(struct bpf_prog **prog_ptr, union bpf_attr *attr,
 		goto clean_op;
 	}
 
-	// Call the verifier
+	// Remove line info, otherwise the verifier will complain about that they cannot find those lines
+	// (Also you could remove debug flag when compile ebpf programs)
+	// printk("LINEINFO %u, %u", attr->line_info_cnt,
+	//        attr->line_info_rec_size);
+	attr->line_info_cnt = 0;
+
+	// Iteration
+
+	u32 iter = 0;
+
+	while (true) {
+		iter++;
+		if (iter >= env->opts.max_iteration) {
+			err = -ELOOP;
+			break;
+		}
+	}
+
+	if (err) {
+		goto clean_op;
+	}
+
+	// Run built-in passes
 
 	/*
 		err = bpf_check(prog_ptr, attr, uattr, uattr_size, env);
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
@@ -17961,8 +17961,10 @@ static int do_check(struct bpf_verifier_env *env)
 
 		insn = &insns[env->insn_idx];
 		class = BPF_CLASS(insn->code);
+		++env->insn_processed;
 
-		if (++env->insn_processed > BPF_COMPLEXITY_LIMIT_INSNS) {
+		if (env->insn_processed > BPF_COMPLEXITY_LIMIT_INSNS &&
+		    !bpf_ir_builtin_pass_enabled(env->ir_env, "add_counter")) {
 			verbose_err(
 				363, env,
 				"BPF program is too large. Processed %d insn\n",
