From: Andrii Nakryiko <andriin@fb.com>
To: <bpf@vger.kernel.org>, <netdev@vger.kernel.org>, <ast@fb.com>,
<daniel@iogearbox.net>
Cc: <andrii.nakryiko@gmail.com>, <kernel-team@fb.com>,
Andrii Nakryiko <andriin@fb.com>
Subject: [RFC PATCH bpf-next 03/16] libbpf: move non-public APIs from libbpf.h to libbpf_internal.h
Date: Tue, 3 Dec 2019 23:00:02 -0800 [thread overview]
Message-ID: <20191204070015.3523523-4-andriin@fb.com> (raw)
In-Reply-To: <20191204070015.3523523-1-andriin@fb.com>
Few libbpf APIs are not public but currently exposed through libbpf.h to be
used by bpftool. Move them to libbpf_internal.h, where intent of being
non-stable and non-public is much more obvious.
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
---
tools/bpf/bpftool/net.c | 1 +
tools/lib/bpf/libbpf.h | 17 -----------------
tools/lib/bpf/libbpf.map | 1 -
tools/lib/bpf/libbpf_internal.h | 17 +++++++++++++++++
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/tools/bpf/bpftool/net.c b/tools/bpf/bpftool/net.c
index 4f52d3151616..d93bee298e54 100644
--- a/tools/bpf/bpftool/net.c
+++ b/tools/bpf/bpftool/net.c
@@ -18,6 +18,7 @@
#include <bpf.h>
#include <nlattr.h>
+#include "libbpf_internal.h"
#include "main.h"
#include "netlink_dumper.h"
diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
index 804f445c9957..2698fbcb0c79 100644
--- a/tools/lib/bpf/libbpf.h
+++ b/tools/lib/bpf/libbpf.h
@@ -126,11 +126,6 @@ bpf_object__open_buffer(const void *obj_buf, size_t obj_buf_sz,
LIBBPF_API struct bpf_object *
bpf_object__open_xattr(struct bpf_object_open_attr *attr);
-int bpf_object__section_size(const struct bpf_object *obj, const char *name,
- __u32 *size);
-int bpf_object__variable_offset(const struct bpf_object *obj, const char *name,
- __u32 *off);
-
enum libbpf_pin_type {
LIBBPF_PIN_NONE,
/* PIN_BY_NAME: pin maps by name (in /sys/fs/bpf by default) */
@@ -514,18 +509,6 @@ bpf_perf_event_read_simple(void *mmap_mem, size_t mmap_size, size_t page_size,
void **copy_mem, size_t *copy_size,
bpf_perf_event_print_t fn, void *private_data);
-struct nlattr;
-typedef int (*libbpf_dump_nlmsg_t)(void *cookie, void *msg, struct nlattr **tb);
-int libbpf_netlink_open(unsigned int *nl_pid);
-int libbpf_nl_get_link(int sock, unsigned int nl_pid,
- libbpf_dump_nlmsg_t dump_link_nlmsg, void *cookie);
-int libbpf_nl_get_class(int sock, unsigned int nl_pid, int ifindex,
- libbpf_dump_nlmsg_t dump_class_nlmsg, void *cookie);
-int libbpf_nl_get_qdisc(int sock, unsigned int nl_pid, int ifindex,
- libbpf_dump_nlmsg_t dump_qdisc_nlmsg, void *cookie);
-int libbpf_nl_get_filter(int sock, unsigned int nl_pid, int ifindex, int handle,
- libbpf_dump_nlmsg_t dump_filter_nlmsg, void *cookie);
-
struct bpf_prog_linfo;
struct bpf_prog_info;
diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map
index 88dded011a84..757a88f64b5a 100644
--- a/tools/lib/bpf/libbpf.map
+++ b/tools/lib/bpf/libbpf.map
@@ -203,7 +203,6 @@ LIBBPF_0.0.6 {
bpf_program__get_expected_attach_type;
bpf_program__get_type;
bpf_program__is_tracing;
- bpf_program__name;
bpf_program__set_tracing;
bpf_program__size;
btf__find_by_name_kind;
diff --git a/tools/lib/bpf/libbpf_internal.h b/tools/lib/bpf/libbpf_internal.h
index 97ac17a64a58..7ee0c8691835 100644
--- a/tools/lib/bpf/libbpf_internal.h
+++ b/tools/lib/bpf/libbpf_internal.h
@@ -98,6 +98,23 @@ static inline bool libbpf_validate_opts(const char *opts,
int libbpf__load_raw_btf(const char *raw_types, size_t types_len,
const char *str_sec, size_t str_len);
+int bpf_object__section_size(const struct bpf_object *obj, const char *name,
+ __u32 *size);
+int bpf_object__variable_offset(const struct bpf_object *obj, const char *name,
+ __u32 *off);
+
+struct nlattr;
+typedef int (*libbpf_dump_nlmsg_t)(void *cookie, void *msg, struct nlattr **tb);
+int libbpf_netlink_open(unsigned int *nl_pid);
+int libbpf_nl_get_link(int sock, unsigned int nl_pid,
+ libbpf_dump_nlmsg_t dump_link_nlmsg, void *cookie);
+int libbpf_nl_get_class(int sock, unsigned int nl_pid, int ifindex,
+ libbpf_dump_nlmsg_t dump_class_nlmsg, void *cookie);
+int libbpf_nl_get_qdisc(int sock, unsigned int nl_pid, int ifindex,
+ libbpf_dump_nlmsg_t dump_qdisc_nlmsg, void *cookie);
+int libbpf_nl_get_filter(int sock, unsigned int nl_pid, int ifindex, int handle,
+ libbpf_dump_nlmsg_t dump_filter_nlmsg, void *cookie);
+
struct btf_ext_info {
/*
* info points to the individual info section (e.g. func_info and
--
2.17.1
next prev parent reply other threads:[~2019-12-04 7:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-04 6:59 [RFC PATCH bpf-next 00/16] Add code-generated BPF object skeleton support Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 01/16] libbpf: don't require root for bpf_object__open() Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 02/16] libbpf: add generic bpf_program__attach() Andrii Nakryiko
2019-12-04 7:00 ` Andrii Nakryiko [this message]
2019-12-04 7:00 ` [RFC PATCH bpf-next 04/16] libbpf: add BPF_EMBED_OBJ macro for embedding BPF .o files Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 05/16] libbpf: expose field/var declaration emitting API internally Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 06/16] libbpf: expose BPF program's function name Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 07/16] libbpf: refactor global data map initialization Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 08/16] libbpf: postpone BTF ID finding for TRACING programs to load phase Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 09/16] libbpf: reduce log level of supported section names dump Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 10/16] libbpf: add experimental BPF object skeleton support Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 11/16] bpftool: add skeleton codegen command Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 12/16] libbpf/samples: add runqslower sample to libbpf samples Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 13/16] selftests/bpf: add BPF skeletons selftests and convert attach_probe.c Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 14/16] selftests/bpf: convert few more selftest to skeletons Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 15/16] selftests/bpf: add test validating data section to struct convertion layout Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 16/16] bpftool: add `gen skeleton` BASH completions Andrii Nakryiko
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=20191204070015.3523523-4-andriin@fb.com \
--to=andriin@fb.com \
--cc=andrii.nakryiko@gmail.com \
--cc=ast@fb.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
/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 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).