* [PATCH v2 bpf-next] bpftool: fix bpftool build by switching to bpf_object__open_file()
@ 2019-10-07 22:56 Andrii Nakryiko
2019-10-08 1:45 ` Alexei Starovoitov
2019-10-08 1:59 ` Jakub Kicinski
0 siblings, 2 replies; 7+ messages in thread
From: Andrii Nakryiko @ 2019-10-07 22:56 UTC (permalink / raw)
To: bpf, netdev, ast, daniel, sdf
Cc: andrii.nakryiko, kernel-team, Andrii Nakryiko
As part of libbpf in 5e61f2707029 ("libbpf: stop enforcing kern_version,
populate it for users") non-LIBBPF_API __bpf_object__open_xattr() API
was removed from libbpf.h header. This broke bpftool, which relied on
that function. This patch fixes the build by switching to newly added
bpf_object__open_file() which provides the same capabilities, but is
official and future-proof API.
v1->v2:
- fix prog_type shadowing (Stanislav).
Fixes: 5e61f2707029 ("libbpf: stop enforcing kern_version, populate it for users")
Reported-by: Stanislav Fomichev <sdf@google.com>
Reviewed-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
---
tools/bpf/bpftool/main.c | 4 ++--
tools/bpf/bpftool/main.h | 2 +-
tools/bpf/bpftool/prog.c | 22 ++++++++++++----------
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c
index 93d008687020..4764581ff9ea 100644
--- a/tools/bpf/bpftool/main.c
+++ b/tools/bpf/bpftool/main.c
@@ -27,7 +27,7 @@ bool json_output;
bool show_pinned;
bool block_mount;
bool verifier_logs;
-int bpf_flags;
+bool relaxed_maps;
struct pinned_obj_table prog_table;
struct pinned_obj_table map_table;
@@ -396,7 +396,7 @@ int main(int argc, char **argv)
show_pinned = true;
break;
case 'm':
- bpf_flags = MAPS_RELAX_COMPAT;
+ relaxed_maps = true;
break;
case 'n':
block_mount = true;
diff --git a/tools/bpf/bpftool/main.h b/tools/bpf/bpftool/main.h
index af9ad56c303a..2899095f8254 100644
--- a/tools/bpf/bpftool/main.h
+++ b/tools/bpf/bpftool/main.h
@@ -94,7 +94,7 @@ extern bool json_output;
extern bool show_pinned;
extern bool block_mount;
extern bool verifier_logs;
-extern int bpf_flags;
+extern bool relaxed_maps;
extern struct pinned_obj_table prog_table;
extern struct pinned_obj_table map_table;
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 43fdbbfe41bb..27da96a797ab 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -1092,9 +1092,7 @@ static int do_run(int argc, char **argv)
static int load_with_options(int argc, char **argv, bool first_prog_only)
{
struct bpf_object_load_attr load_attr = { 0 };
- struct bpf_object_open_attr open_attr = {
- .prog_type = BPF_PROG_TYPE_UNSPEC,
- };
+ enum bpf_prog_type common_prog_type = BPF_PROG_TYPE_UNSPEC;
enum bpf_attach_type expected_attach_type;
struct map_replace *map_replace = NULL;
struct bpf_program *prog = NULL, *pos;
@@ -1105,11 +1103,16 @@ static int load_with_options(int argc, char **argv, bool first_prog_only)
const char *pinfile;
unsigned int i, j;
__u32 ifindex = 0;
+ const char *file;
int idx, err;
+ LIBBPF_OPTS(bpf_object_open_opts, open_opts,
+ .relaxed_maps = relaxed_maps,
+ );
+
if (!REQ_ARGS(2))
return -1;
- open_attr.file = GET_ARG();
+ file = GET_ARG();
pinfile = GET_ARG();
while (argc) {
@@ -1118,7 +1121,7 @@ static int load_with_options(int argc, char **argv, bool first_prog_only)
NEXT_ARG();
- if (open_attr.prog_type != BPF_PROG_TYPE_UNSPEC) {
+ if (common_prog_type != BPF_PROG_TYPE_UNSPEC) {
p_err("program type already specified");
goto err_free_reuse_maps;
}
@@ -1135,8 +1138,7 @@ static int load_with_options(int argc, char **argv, bool first_prog_only)
strcat(type, *argv);
strcat(type, "/");
- err = libbpf_prog_type_by_name(type,
- &open_attr.prog_type,
+ err = libbpf_prog_type_by_name(type, &common_prog_type,
&expected_attach_type);
free(type);
if (err < 0)
@@ -1224,16 +1226,16 @@ static int load_with_options(int argc, char **argv, bool first_prog_only)
set_max_rlimit();
- obj = __bpf_object__open_xattr(&open_attr, bpf_flags);
+ obj = bpf_object__open_file(file, &open_opts);
if (IS_ERR_OR_NULL(obj)) {
p_err("failed to open object file");
goto err_free_reuse_maps;
}
bpf_object__for_each_program(pos, obj) {
- enum bpf_prog_type prog_type = open_attr.prog_type;
+ enum bpf_prog_type prog_type = common_prog_type;
- if (open_attr.prog_type == BPF_PROG_TYPE_UNSPEC) {
+ if (prog_type == BPF_PROG_TYPE_UNSPEC) {
const char *sec_name = bpf_program__title(pos, false);
err = libbpf_prog_type_by_name(sec_name, &prog_type,
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 bpf-next] bpftool: fix bpftool build by switching to bpf_object__open_file()
2019-10-07 22:56 [PATCH v2 bpf-next] bpftool: fix bpftool build by switching to bpf_object__open_file() Andrii Nakryiko
@ 2019-10-08 1:45 ` Alexei Starovoitov
2019-10-08 1:59 ` Jakub Kicinski
1 sibling, 0 replies; 7+ messages in thread
From: Alexei Starovoitov @ 2019-10-08 1:45 UTC (permalink / raw)
To: Andrii Nakryiko
Cc: bpf, Network Development, Alexei Starovoitov, Daniel Borkmann,
Stanislav Fomichev, Andrii Nakryiko, Kernel Team
On Mon, Oct 7, 2019 at 3:58 PM Andrii Nakryiko <andriin@fb.com> wrote:
>
> As part of libbpf in 5e61f2707029 ("libbpf: stop enforcing kern_version,
> populate it for users") non-LIBBPF_API __bpf_object__open_xattr() API
> was removed from libbpf.h header. This broke bpftool, which relied on
> that function. This patch fixes the build by switching to newly added
> bpf_object__open_file() which provides the same capabilities, but is
> official and future-proof API.
>
> v1->v2:
> - fix prog_type shadowing (Stanislav).
>
> Fixes: 5e61f2707029 ("libbpf: stop enforcing kern_version, populate it for users")
> Reported-by: Stanislav Fomichev <sdf@google.com>
> Reviewed-by: Stanislav Fomichev <sdf@google.com>
> Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Applied. Thanks
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 bpf-next] bpftool: fix bpftool build by switching to bpf_object__open_file()
2019-10-07 22:56 [PATCH v2 bpf-next] bpftool: fix bpftool build by switching to bpf_object__open_file() Andrii Nakryiko
2019-10-08 1:45 ` Alexei Starovoitov
@ 2019-10-08 1:59 ` Jakub Kicinski
2019-10-08 2:16 ` Alexei Starovoitov
1 sibling, 1 reply; 7+ messages in thread
From: Jakub Kicinski @ 2019-10-08 1:59 UTC (permalink / raw)
To: Andrii Nakryiko
Cc: bpf, netdev, ast, daniel, sdf, andrii.nakryiko, kernel-team
On Mon, 7 Oct 2019 15:56:04 -0700, Andrii Nakryiko wrote:
> diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
> index 43fdbbfe41bb..27da96a797ab 100644
> --- a/tools/bpf/bpftool/prog.c
> +++ b/tools/bpf/bpftool/prog.c
> @@ -1092,9 +1092,7 @@ static int do_run(int argc, char **argv)
> static int load_with_options(int argc, char **argv, bool first_prog_only)
> {
> struct bpf_object_load_attr load_attr = { 0 };
> - struct bpf_object_open_attr open_attr = {
> - .prog_type = BPF_PROG_TYPE_UNSPEC,
> - };
> + enum bpf_prog_type common_prog_type = BPF_PROG_TYPE_UNSPEC;
> enum bpf_attach_type expected_attach_type;
> struct map_replace *map_replace = NULL;
> struct bpf_program *prog = NULL, *pos;
Please maintain reverse xmas tree..
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 bpf-next] bpftool: fix bpftool build by switching to bpf_object__open_file()
2019-10-08 1:59 ` Jakub Kicinski
@ 2019-10-08 2:16 ` Alexei Starovoitov
2019-10-08 2:23 ` Jakub Kicinski
0 siblings, 1 reply; 7+ messages in thread
From: Alexei Starovoitov @ 2019-10-08 2:16 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Andrii Nakryiko, bpf, Network Development, Alexei Starovoitov,
Daniel Borkmann, Stanislav Fomichev, Andrii Nakryiko,
Kernel Team
On Mon, Oct 7, 2019 at 7:00 PM Jakub Kicinski
<jakub.kicinski@netronome.com> wrote:
>
> On Mon, 7 Oct 2019 15:56:04 -0700, Andrii Nakryiko wrote:
> > diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
> > index 43fdbbfe41bb..27da96a797ab 100644
> > --- a/tools/bpf/bpftool/prog.c
> > +++ b/tools/bpf/bpftool/prog.c
> > @@ -1092,9 +1092,7 @@ static int do_run(int argc, char **argv)
> > static int load_with_options(int argc, char **argv, bool first_prog_only)
> > {
> > struct bpf_object_load_attr load_attr = { 0 };
> > - struct bpf_object_open_attr open_attr = {
> > - .prog_type = BPF_PROG_TYPE_UNSPEC,
> > - };
> > + enum bpf_prog_type common_prog_type = BPF_PROG_TYPE_UNSPEC;
> > enum bpf_attach_type expected_attach_type;
> > struct map_replace *map_replace = NULL;
> > struct bpf_program *prog = NULL, *pos;
>
> Please maintain reverse xmas tree..
There are exceptions. I don't think it's worth doing everywhere.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 bpf-next] bpftool: fix bpftool build by switching to bpf_object__open_file()
2019-10-08 2:16 ` Alexei Starovoitov
@ 2019-10-08 2:23 ` Jakub Kicinski
2019-10-08 2:38 ` Alexei Starovoitov
0 siblings, 1 reply; 7+ messages in thread
From: Jakub Kicinski @ 2019-10-08 2:23 UTC (permalink / raw)
To: Alexei Starovoitov
Cc: Andrii Nakryiko, bpf, Network Development, Alexei Starovoitov,
Daniel Borkmann, Stanislav Fomichev, Andrii Nakryiko,
Kernel Team
On Mon, 7 Oct 2019 19:16:45 -0700, Alexei Starovoitov wrote:
> On Mon, Oct 7, 2019 at 7:00 PM Jakub Kicinski wrote:
> > On Mon, 7 Oct 2019 15:56:04 -0700, Andrii Nakryiko wrote:
> > > diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
> > > index 43fdbbfe41bb..27da96a797ab 100644
> > > --- a/tools/bpf/bpftool/prog.c
> > > +++ b/tools/bpf/bpftool/prog.c
> > > @@ -1092,9 +1092,7 @@ static int do_run(int argc, char **argv)
> > > static int load_with_options(int argc, char **argv, bool first_prog_only)
> > > {
> > > struct bpf_object_load_attr load_attr = { 0 };
> > > - struct bpf_object_open_attr open_attr = {
> > > - .prog_type = BPF_PROG_TYPE_UNSPEC,
> > > - };
> > > + enum bpf_prog_type common_prog_type = BPF_PROG_TYPE_UNSPEC;
> > > enum bpf_attach_type expected_attach_type;
> > > struct map_replace *map_replace = NULL;
> > > struct bpf_program *prog = NULL, *pos;
> >
> > Please maintain reverse xmas tree..
>
> There are exceptions. I don't think it's worth doing everywhere.
Rule #0 stick to the existing code style.
"Previous line of code declaring this variable in a different way was
in this place" is a really weak argument and the only one which can be
made here...
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 bpf-next] bpftool: fix bpftool build by switching to bpf_object__open_file()
2019-10-08 2:23 ` Jakub Kicinski
@ 2019-10-08 2:38 ` Alexei Starovoitov
2019-10-08 2:50 ` Jakub Kicinski
0 siblings, 1 reply; 7+ messages in thread
From: Alexei Starovoitov @ 2019-10-08 2:38 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Andrii Nakryiko, bpf, Network Development, Alexei Starovoitov,
Daniel Borkmann, Stanislav Fomichev, Andrii Nakryiko,
Kernel Team
On Mon, Oct 7, 2019 at 7:23 PM Jakub Kicinski
<jakub.kicinski@netronome.com> wrote:
>
> On Mon, 7 Oct 2019 19:16:45 -0700, Alexei Starovoitov wrote:
> > On Mon, Oct 7, 2019 at 7:00 PM Jakub Kicinski wrote:
> > > On Mon, 7 Oct 2019 15:56:04 -0700, Andrii Nakryiko wrote:
> > > > diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
> > > > index 43fdbbfe41bb..27da96a797ab 100644
> > > > --- a/tools/bpf/bpftool/prog.c
> > > > +++ b/tools/bpf/bpftool/prog.c
> > > > @@ -1092,9 +1092,7 @@ static int do_run(int argc, char **argv)
> > > > static int load_with_options(int argc, char **argv, bool first_prog_only)
> > > > {
> > > > struct bpf_object_load_attr load_attr = { 0 };
> > > > - struct bpf_object_open_attr open_attr = {
> > > > - .prog_type = BPF_PROG_TYPE_UNSPEC,
> > > > - };
> > > > + enum bpf_prog_type common_prog_type = BPF_PROG_TYPE_UNSPEC;
> > > > enum bpf_attach_type expected_attach_type;
> > > > struct map_replace *map_replace = NULL;
> > > > struct bpf_program *prog = NULL, *pos;
> > >
> > > Please maintain reverse xmas tree..
> >
> > There are exceptions. I don't think it's worth doing everywhere.
>
> Rule #0 stick to the existing code style.
>
> "Previous line of code declaring this variable in a different way was
> in this place" is a really weak argument and the only one which can be
> made here...
do you seriously think that arguing about xmas tree is a good
spend of yours and my time?!
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 bpf-next] bpftool: fix bpftool build by switching to bpf_object__open_file()
2019-10-08 2:38 ` Alexei Starovoitov
@ 2019-10-08 2:50 ` Jakub Kicinski
0 siblings, 0 replies; 7+ messages in thread
From: Jakub Kicinski @ 2019-10-08 2:50 UTC (permalink / raw)
To: Alexei Starovoitov
Cc: Andrii Nakryiko, bpf, Network Development, Alexei Starovoitov,
Daniel Borkmann, Stanislav Fomichev, Andrii Nakryiko,
Kernel Team
On Mon, 7 Oct 2019 19:38:15 -0700, Alexei Starovoitov wrote:
> On Mon, Oct 7, 2019 at 7:23 PM Jakub Kicinski wrote:
> > On Mon, 7 Oct 2019 19:16:45 -0700, Alexei Starovoitov wrote:
> > > On Mon, Oct 7, 2019 at 7:00 PM Jakub Kicinski wrote:
> > > > On Mon, 7 Oct 2019 15:56:04 -0700, Andrii Nakryiko wrote:
> > > > > diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
> > > > > index 43fdbbfe41bb..27da96a797ab 100644
> > > > > --- a/tools/bpf/bpftool/prog.c
> > > > > +++ b/tools/bpf/bpftool/prog.c
> > > > > @@ -1092,9 +1092,7 @@ static int do_run(int argc, char **argv)
> > > > > static int load_with_options(int argc, char **argv, bool first_prog_only)
> > > > > {
> > > > > struct bpf_object_load_attr load_attr = { 0 };
> > > > > - struct bpf_object_open_attr open_attr = {
> > > > > - .prog_type = BPF_PROG_TYPE_UNSPEC,
> > > > > - };
> > > > > + enum bpf_prog_type common_prog_type = BPF_PROG_TYPE_UNSPEC;
> > > > > enum bpf_attach_type expected_attach_type;
> > > > > struct map_replace *map_replace = NULL;
> > > > > struct bpf_program *prog = NULL, *pos;
> > > >
> > > > Please maintain reverse xmas tree..
> > >
> > > There are exceptions. I don't think it's worth doing everywhere.
> >
> > Rule #0 stick to the existing code style.
> >
> > "Previous line of code declaring this variable in a different way was
> > in this place" is a really weak argument and the only one which can be
> > made here...
>
> do you seriously think that arguing about xmas tree is a good
> spend of yours and my time?!
Hahaha I really don't, I was about to say. I'm just registering my
disgruntlement :) I can't stay silent when I see hasty submissions
that make the code of which I'm the original author deteriorate.
I hope that's understandable.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-10-08 2:50 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-07 22:56 [PATCH v2 bpf-next] bpftool: fix bpftool build by switching to bpf_object__open_file() Andrii Nakryiko
2019-10-08 1:45 ` Alexei Starovoitov
2019-10-08 1:59 ` Jakub Kicinski
2019-10-08 2:16 ` Alexei Starovoitov
2019-10-08 2:23 ` Jakub Kicinski
2019-10-08 2:38 ` Alexei Starovoitov
2019-10-08 2:50 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).