| Message ID | 20180821161258.19718-1-treeze.taeung@gmail.com |
|---|---|
| State | Deferred, archived |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | libbpf: Remove the duplicate checking of function storage | expand |
On Tue, Aug 21, 2018 at 6:12 PM, Taeung Song <treeze.taeung@gmail.com> 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 <jakub.kicinski@netronome.com> > Signed-off-by: Taeung Song <treeze.taeung@gmail.com> Looks reasonable, but you may need to repost once bpf-next is open: https://www.kernel.org/doc/Documentation/networking/netdev-FAQ.txt Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com> > 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 >
On 08/21/2018 06:46 PM, Jakub Kicinski wrote: > On Tue, Aug 21, 2018 at 6:12 PM, Taeung Song <treeze.taeung@gmail.com> 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 <jakub.kicinski@netronome.com> >> Signed-off-by: Taeung Song <treeze.taeung@gmail.com> > > Looks reasonable, but you may need to repost once bpf-next is open: > > https://www.kernel.org/doc/Documentation/networking/netdev-FAQ.txt > > Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com> Agree, please resubmit once bpf-next opens up again. Thanks!
On 08/22/2018 05:11 AM, Daniel Borkmann wrote: > On 08/21/2018 06:46 PM, Jakub Kicinski wrote: >> On Tue, Aug 21, 2018 at 6:12 PM, Taeung Song <treeze.taeung@gmail.com> 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 <jakub.kicinski@netronome.com> >>> Signed-off-by: Taeung Song <treeze.taeung@gmail.com> >> >> Looks reasonable, but you may need to repost once bpf-next is open: >> >> https://www.kernel.org/doc/Documentation/networking/netdev-FAQ.txt >> >> Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com> > > Agree, please resubmit once bpf-next opens up again. Thanks! > OK ! I will. Thanks, Taeung
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; }
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 <jakub.kicinski@netronome.com> Signed-off-by: Taeung Song <treeze.taeung@gmail.com> --- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)