* [PATCH bpf-next 1/2] samples: bpf: Replace bpf_program__title() with bpf_program__section_name()
@ 2020-09-04 6:34 Daniel T. Lee
2020-09-04 6:34 ` [PATCH bpf-next 2/2] samples: bpf: add xsk_fwd test file to .gitignore Daniel T. Lee
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Daniel T. Lee @ 2020-09-04 6:34 UTC (permalink / raw)
To: Daniel Borkmann, Alexei Starovoitov; +Cc: Andrii Nakryiko, netdev, bpf
From commit 521095842027 ("libbpf: Deprecate notion of BPF program
"title" in favor of "section name""), the term title has been replaced
with section name in libbpf.
Since the bpf_program__title() has been deprecated, this commit
switches this function to bpf_program__section_name(). Due to
this commit, the compilation warning issue has also been resolved.
Fixes: 521095842027 ("libbpf: Deprecate notion of BPF program "title" in favor of "section name"")
Signed-off-by: Daniel T. Lee <danieltimlee@gmail.com>
---
samples/bpf/sockex3_user.c | 6 +++---
samples/bpf/spintest_user.c | 6 +++---
samples/bpf/tracex5_user.c | 6 +++---
samples/bpf/xdp_redirect_cpu_user.c | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/samples/bpf/sockex3_user.c b/samples/bpf/sockex3_user.c
index 4dbee7427d47..7793f6a6ae7e 100644
--- a/samples/bpf/sockex3_user.c
+++ b/samples/bpf/sockex3_user.c
@@ -29,8 +29,8 @@ int main(int argc, char **argv)
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
struct bpf_program *prog;
struct bpf_object *obj;
+ const char *section;
char filename[256];
- const char *title;
FILE *f;
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
@@ -58,8 +58,8 @@ int main(int argc, char **argv)
bpf_object__for_each_program(prog, obj) {
fd = bpf_program__fd(prog);
- title = bpf_program__title(prog, false);
- if (sscanf(title, "socket/%d", &key) != 1) {
+ section = bpf_program__section_name(prog);
+ if (sscanf(section, "socket/%d", &key) != 1) {
fprintf(stderr, "ERROR: finding prog failed\n");
goto cleanup;
}
diff --git a/samples/bpf/spintest_user.c b/samples/bpf/spintest_user.c
index 847da9284fa8..f090d0dc60d6 100644
--- a/samples/bpf/spintest_user.c
+++ b/samples/bpf/spintest_user.c
@@ -17,7 +17,7 @@ int main(int ac, char **argv)
long key, next_key, value;
struct bpf_program *prog;
int map_fd, i, j = 0;
- const char *title;
+ const char *section;
struct ksym *sym;
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
@@ -51,8 +51,8 @@ int main(int ac, char **argv)
}
bpf_object__for_each_program(prog, obj) {
- title = bpf_program__title(prog, false);
- if (sscanf(title, "kprobe/%s", symbol) != 1)
+ section = bpf_program__section_name(prog);
+ if (sscanf(section, "kprobe/%s", symbol) != 1)
continue;
/* Attach prog only when symbol exists */
diff --git a/samples/bpf/tracex5_user.c b/samples/bpf/tracex5_user.c
index 98dad57a96c4..c17d3fb5fd64 100644
--- a/samples/bpf/tracex5_user.c
+++ b/samples/bpf/tracex5_user.c
@@ -39,8 +39,8 @@ int main(int ac, char **argv)
struct bpf_program *prog;
struct bpf_object *obj;
int key, fd, progs_fd;
+ const char *section;
char filename[256];
- const char *title;
FILE *f;
setrlimit(RLIMIT_MEMLOCK, &r);
@@ -78,9 +78,9 @@ int main(int ac, char **argv)
}
bpf_object__for_each_program(prog, obj) {
- title = bpf_program__title(prog, false);
+ section = bpf_program__section_name(prog);
/* register only syscalls to PROG_ARRAY */
- if (sscanf(title, "kprobe/%d", &key) != 1)
+ if (sscanf(section, "kprobe/%d", &key) != 1)
continue;
fd = bpf_program__fd(prog);
diff --git a/samples/bpf/xdp_redirect_cpu_user.c b/samples/bpf/xdp_redirect_cpu_user.c
index 004c0622c913..3dd366e9474d 100644
--- a/samples/bpf/xdp_redirect_cpu_user.c
+++ b/samples/bpf/xdp_redirect_cpu_user.c
@@ -111,7 +111,7 @@ static void print_avail_progs(struct bpf_object *obj)
bpf_object__for_each_program(pos, obj) {
if (bpf_program__is_xdp(pos))
- printf(" %s\n", bpf_program__title(pos, false));
+ printf(" %s\n", bpf_program__section_name(pos));
}
}
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH bpf-next 2/2] samples: bpf: add xsk_fwd test file to .gitignore
2020-09-04 6:34 [PATCH bpf-next 1/2] samples: bpf: Replace bpf_program__title() with bpf_program__section_name() Daniel T. Lee
@ 2020-09-04 6:34 ` Daniel T. Lee
2020-09-04 17:14 ` [PATCH bpf-next 1/2] samples: bpf: Replace bpf_program__title() with bpf_program__section_name() Andrii Nakryiko
2020-09-04 22:24 ` Daniel Borkmann
2 siblings, 0 replies; 4+ messages in thread
From: Daniel T. Lee @ 2020-09-04 6:34 UTC (permalink / raw)
To: Daniel Borkmann, Alexei Starovoitov; +Cc: Andrii Nakryiko, netdev, bpf
This commit adds xsk_fwd test file to .gitignore which is newly added
to samples/bpf.
Signed-off-by: Daniel T. Lee <danieltimlee@gmail.com>
---
samples/bpf/.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/samples/bpf/.gitignore b/samples/bpf/.gitignore
index 034800c4d1e6..b2f29bc8dc43 100644
--- a/samples/bpf/.gitignore
+++ b/samples/bpf/.gitignore
@@ -50,4 +50,5 @@ xdp_rxq_info
xdp_sample_pkts
xdp_tx_iptunnel
xdpsock
+xsk_fwd
testfile.img
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next 1/2] samples: bpf: Replace bpf_program__title() with bpf_program__section_name()
2020-09-04 6:34 [PATCH bpf-next 1/2] samples: bpf: Replace bpf_program__title() with bpf_program__section_name() Daniel T. Lee
2020-09-04 6:34 ` [PATCH bpf-next 2/2] samples: bpf: add xsk_fwd test file to .gitignore Daniel T. Lee
@ 2020-09-04 17:14 ` Andrii Nakryiko
2020-09-04 22:24 ` Daniel Borkmann
2 siblings, 0 replies; 4+ messages in thread
From: Andrii Nakryiko @ 2020-09-04 17:14 UTC (permalink / raw)
To: Daniel T. Lee; +Cc: Daniel Borkmann, Alexei Starovoitov, Networking, bpf
On Thu, Sep 3, 2020 at 11:34 PM Daniel T. Lee <danieltimlee@gmail.com> wrote:
>
> From commit 521095842027 ("libbpf: Deprecate notion of BPF program
> "title" in favor of "section name""), the term title has been replaced
> with section name in libbpf.
>
> Since the bpf_program__title() has been deprecated, this commit
> switches this function to bpf_program__section_name(). Due to
> this commit, the compilation warning issue has also been resolved.
>
> Fixes: 521095842027 ("libbpf: Deprecate notion of BPF program "title" in favor of "section name"")
> Signed-off-by: Daniel T. Lee <danieltimlee@gmail.com>
> ---
Acked-by: Andrii Nakryiko <andriin@fb.com>
> samples/bpf/sockex3_user.c | 6 +++---
> samples/bpf/spintest_user.c | 6 +++---
> samples/bpf/tracex5_user.c | 6 +++---
> samples/bpf/xdp_redirect_cpu_user.c | 2 +-
> 4 files changed, 10 insertions(+), 10 deletions(-)
>
[...]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next 1/2] samples: bpf: Replace bpf_program__title() with bpf_program__section_name()
2020-09-04 6:34 [PATCH bpf-next 1/2] samples: bpf: Replace bpf_program__title() with bpf_program__section_name() Daniel T. Lee
2020-09-04 6:34 ` [PATCH bpf-next 2/2] samples: bpf: add xsk_fwd test file to .gitignore Daniel T. Lee
2020-09-04 17:14 ` [PATCH bpf-next 1/2] samples: bpf: Replace bpf_program__title() with bpf_program__section_name() Andrii Nakryiko
@ 2020-09-04 22:24 ` Daniel Borkmann
2 siblings, 0 replies; 4+ messages in thread
From: Daniel Borkmann @ 2020-09-04 22:24 UTC (permalink / raw)
To: Daniel T. Lee, Alexei Starovoitov; +Cc: Andrii Nakryiko, netdev, bpf
On 9/4/20 8:34 AM, Daniel T. Lee wrote:
> From commit 521095842027 ("libbpf: Deprecate notion of BPF program
> "title" in favor of "section name""), the term title has been replaced
> with section name in libbpf.
>
> Since the bpf_program__title() has been deprecated, this commit
> switches this function to bpf_program__section_name(). Due to
> this commit, the compilation warning issue has also been resolved.
>
> Fixes: 521095842027 ("libbpf: Deprecate notion of BPF program "title" in favor of "section name"")
> Signed-off-by: Daniel T. Lee <danieltimlee@gmail.com>
Both applied, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-04 22:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-04 6:34 [PATCH bpf-next 1/2] samples: bpf: Replace bpf_program__title() with bpf_program__section_name() Daniel T. Lee
2020-09-04 6:34 ` [PATCH bpf-next 2/2] samples: bpf: add xsk_fwd test file to .gitignore Daniel T. Lee
2020-09-04 17:14 ` [PATCH bpf-next 1/2] samples: bpf: Replace bpf_program__title() with bpf_program__section_name() Andrii Nakryiko
2020-09-04 22:24 ` Daniel Borkmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox