Commit 612d05be authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

libbpf: Move non-public APIs from libbpf.h to libbpf_internal.h 



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: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20191214014341.3442258-4-andriin@fb.com
parent d7a18ea7

tools/bpf/bpftool/net.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <bpf.h>

#include <nlattr.h>

#include "libbpf_internal.h"

#include "main.h"

#include "netlink_dumper.h"

tools/lib/bpf/libbpf.h

+0 −17
Original line number Diff line number Diff line
@@ -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;

tools/lib/bpf/libbpf_internal.h

+17 −0
Original line number Diff line number Diff line
@@ -100,6 +100,23 @@ int parse_cpu_mask_file(const char *fcpu, bool **mask, int *mask_sz); 
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

CRA Git | Maintained and supported by SUSTech CRA and CCSE