2018-09-02 23:50:36

by Taeung Song

Subject: [PATCH bpf-next v2] libbpf: Remove the duplicate checking of function storage

After the commit eac7d84519a3 ("tools: libbpf: don't return '.text'
as a program for multi-function programs"), bpf_program__next()
in bpf_object__for_each_program skips the function storage such as .text,
so eliminate the duplicate checking.

Cc: Jakub Kicinski <[email protected]>
Signed-off-by: Taeung Song <[email protected]>
---
tools/lib/bpf/libbpf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 2abd0f112627..8476da7f2720 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -2336,7 +2336,7 @@ int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr,
bpf_program__set_expected_attach_type(prog,
expected_attach_type);

- if (!bpf_program__is_function_storage(prog, obj) && !first_prog)
+ if (!first_prog)
first_prog = prog;
}

--
2.17.1

2018-09-04 09:09:21

by Jakub Kicinski

Subject: Re: [PATCH bpf-next v2] libbpf: Remove the duplicate checking of function storage

On Mon, 3 Sep 2018 08:30:07 +0900, Taeung Song wrote:
> After the commit eac7d84519a3 ("tools: libbpf: don't return '.text'
> as a program for multi-function programs"), bpf_program__next()
> in bpf_object__for_each_program skips the function storage such as .text,
> so eliminate the duplicate checking.
>
> Cc: Jakub Kicinski <[email protected]>
> Signed-off-by: Taeung Song <[email protected]>

Acked-by: Jakub Kicinski <[email protected]>

2018-09-05 06:13:18

by Alexei Starovoitov

Subject: Re: [PATCH bpf-next v2] libbpf: Remove the duplicate checking of function storage

On Tue, Sep 04, 2018 at 11:07:45AM +0200, Jakub Kicinski wrote:
> On Mon, 3 Sep 2018 08:30:07 +0900, Taeung Song wrote:
> > After the commit eac7d84519a3 ("tools: libbpf: don't return '.text'
> > as a program for multi-function programs"), bpf_program__next()
> > in bpf_object__for_each_program skips the function storage such as .text,
> > so eliminate the duplicate checking.
> >
> > Cc: Jakub Kicinski <[email protected]>
> > Signed-off-by: Taeung Song <[email protected]>
>
> Acked-by: Jakub Kicinski <[email protected]>

Applied, Thanks