From: Yonghong Song <yhs@fb.com>
To: <bpf@vger.kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>,
Cong Wang <xiyou.wangcong@gmail.com>,
Daniel Borkmann <daniel@iogearbox.net>, <kernel-team@fb.com>,
Andrii Nakryiko <andrii@kernel.org>
Subject: [PATCH bpf-next v5 04/12] bpf: change return value of verifier function add_subprog()
Date: Fri, 26 Feb 2021 12:49:24 -0800 [thread overview]
Message-ID: <20210226204924.3884848-1-yhs@fb.com> (raw)
In-Reply-To: <20210226204920.3884074-1-yhs@fb.com>
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 <yhs@fb.com>
---
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
next prev parent reply other threads:[~2021-02-26 20:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-26 20:49 [PATCH bpf-next v5 00/12] bpf: add bpf_for_each_map_elem() helper Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 01/12] bpf: factor out visit_func_call_insn() in check_cfg() Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 02/12] bpf: factor out verbose_invalid_scalar() Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 03/12] bpf: refactor check_func_call() to allow callback function Yonghong Song
2021-02-26 20:49 ` Yonghong Song [this message]
2021-02-26 20:49 ` [PATCH bpf-next v5 05/12] bpf: add bpf_for_each_map_elem() helper Yonghong Song
2021-02-26 21:29 ` Alexei Starovoitov
2021-02-26 20:49 ` [PATCH bpf-next v5 06/12] bpf: add hashtab support for " Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 07/12] bpf: add arraymap " Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 08/12] libbpf: move function is_ldimm64() earlier in libbpf.c Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 09/12] libbpf: support subprog address relocation Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 10/12] bpftool: print subprog address properly Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 11/12] selftests/bpf: add hashmap test for bpf_for_each_map_elem() helper Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 12/12] selftests/bpf: add arraymap " Yonghong Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210226204924.3884848-1-yhs@fb.com \
--to=yhs@fb.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.