[PATCH bpf-next v5 04/12] bpf: change return value of verifier function add_subprog()

[PATCH bpf-next v5 00/12] bpf: add bpf_for_each_map_elem() helper · Yonghong Song <hidden> · 2021-02-26
[PATCH bpf-next v5 07/12] bpf: add arraymap support for bpf_for_each_map_elem() helper · Yonghong Song <hidden> · 2021-02-26
[PATCH bpf-next v5 03/12] bpf: refactor check_func_call() to allow callback function · Yonghong Song <hidden> · 2021-02-26
[PATCH bpf-next v5 10/12] bpftool: print subprog address properly · Yonghong Song <hidden> · 2021-02-26
[PATCH bpf-next v5 02/12] bpf: factor out verbose_invalid_scalar() · Yonghong Song <hidden> · 2021-02-26
[PATCH bpf-next v5 11/12] selftests/bpf: add hashmap test for bpf_for_each_map_elem() helper · Yonghong Song <hidden> · 2021-02-26
[PATCH bpf-next v5 08/12] libbpf: move function is_ldimm64() earlier in libbpf.c · Yonghong Song <hidden> · 2021-02-26
[PATCH bpf-next v5 04/12] bpf: change return value of verifier function add_subprog() · Yonghong Song <hidden> · 2021-02-26
[PATCH bpf-next v5 09/12] libbpf: support subprog address relocation · Yonghong Song <hidden> · 2021-02-26
[PATCH bpf-next v5 12/12] selftests/bpf: add arraymap test for bpf_for_each_map_elem() helper · Yonghong Song <hidden> · 2021-02-26
[PATCH bpf-next v5 05/12] bpf: add bpf_for_each_map_elem() helper · Yonghong Song <hidden> · 2021-02-26
Re: [PATCH bpf-next v5 05/12] bpf: add bpf_for_each_map_elem() helper · Alexei Starovoitov <hidden> · 2021-02-26
[PATCH bpf-next v5 01/12] bpf: factor out visit_func_call_insn() in check_cfg() · Yonghong Song <hidden> · 2021-02-26
[PATCH bpf-next v5 06/12] bpf: add hashtab support for bpf_for_each_map_elem() helper · Yonghong Song <hidden> · 2021-02-26

STALE1964d LANDED: 4 (4M)

Revisions (5)

2021-02-04 v1 [diff vs current]
2021-02-17 v2 [diff vs current]
2021-02-25 v3 [diff vs current]
2021-02-26 v4 [diff vs current]
2021-02-26 v5 current

From: Yonghong Song <hidden>
Date: 2021-02-26 20:50:25
Subsystem: bpf [core], bpf [general] (safe dynamic programs and tools), the rest · Maintainers: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi, Linus Torvalds

Currently, verifier function add_subprog() returns 0 for success
and negative value for failure. Change the return value
to be the subprog number for success. This functionality will be
used in the next patch to save a call to find_subprog().

Acked-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Yonghong Song <redacted>
---
 kernel/bpf/verifier.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 97e772f44cd7..dbdca49ac6cc 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c

@@ -1530,7 +1530,7 @@ static int add_subprog(struct bpf_verifier_env *env, int off)
 	}
 	ret = find_subprog(env, off);
 	if (ret >= 0)
-		return 0;
+		return ret;
 	if (env->subprog_cnt >= BPF_MAX_SUBPROGS) {
 		verbose(env, "too many subprograms\n");
 		return -E2BIG;

@@ -1538,7 +1538,7 @@ static int add_subprog(struct bpf_verifier_env *env, int off)
 	env->subprog_info[env->subprog_cnt++].start = off;
 	sort(env->subprog_info, env->subprog_cnt,
 	     sizeof(env->subprog_info[0]), cmp_subprogs, NULL);
-	return 0;
+	return env->subprog_cnt - 1;
 }
 
 static int check_subprogs(struct bpf_verifier_env *env)

-- 
2.24.1

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help