Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

libbpf: move logging helpers into libbpf_internal.h 



libbpf_util.h header was recently exposed as public as a dependency of
xsk.h. In addition to memory barriers, it contained logging helpers,
which are not supposed to be exposed. This patch moves those into
libbpf_internal.h, which is kept as an internal header.

Cc: Stanislav Fomichev <sdf@google.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Fixes: 7080da89 ("libbpf: add libbpf_util.h to header install.")
Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent ac4e0e05

tools/lib/bpf/btf.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include "btf.h"

#include "bpf.h"

#include "libbpf.h"

#include "libbpf_util.h"

#include "libbpf_internal.h"



#define max(a, b) ((a) > (b) ? (a) : (b))

#define min(a, b) ((a) < (b) ? (a) : (b))

tools/lib/bpf/libbpf.c

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include "bpf.h"

#include "btf.h"

#include "str_error.h"

#include "libbpf_util.h"

#include "libbpf_internal.h"



#ifndef EM_BPF

tools/lib/bpf/libbpf_internal.h

+13 −0
Original line number Diff line number Diff line
@@ -21,6 +21,19 @@ 
#define BTF_PARAM_ENC(name, type) (name), (type)

#define BTF_VAR_SECINFO_ENC(type, offset, size) (type), (offset), (size)



extern void libbpf_print(enum libbpf_print_level level,

			 const char *format, ...)

	__attribute__((format(printf, 2, 3)));



#define __pr(level, fmt, ...)	\

do {				\

	libbpf_print(level, "libbpf: " fmt, ##__VA_ARGS__);	\

} while (0)



#define pr_warning(fmt, ...)	__pr(LIBBPF_WARN, fmt, ##__VA_ARGS__)

#define pr_info(fmt, ...)	__pr(LIBBPF_INFO, fmt, ##__VA_ARGS__)

#define pr_debug(fmt, ...)	__pr(LIBBPF_DEBUG, fmt, ##__VA_ARGS__)



int libbpf__probe_raw_btf(const char *raw_types, size_t types_len,

			  const char *str_sec, size_t str_len);

tools/lib/bpf/libbpf_util.h

+0 −13
Original line number Diff line number Diff line
@@ -10,19 +10,6 @@ 
extern "C" {

#endif



extern void libbpf_print(enum libbpf_print_level level,

			 const char *format, ...)

	__attribute__((format(printf, 2, 3)));



#define __pr(level, fmt, ...)	\

do {				\

	libbpf_print(level, "libbpf: " fmt, ##__VA_ARGS__);	\

} while (0)



#define pr_warning(fmt, ...)	__pr(LIBBPF_WARN, fmt, ##__VA_ARGS__)

#define pr_info(fmt, ...)	__pr(LIBBPF_INFO, fmt, ##__VA_ARGS__)

#define pr_debug(fmt, ...)	__pr(LIBBPF_DEBUG, fmt, ##__VA_ARGS__)



/* Use these barrier functions instead of smp_[rw]mb() when they are

 * used in a libbpf header file. That way they can be built into the

 * application that uses libbpf.

tools/lib/bpf/xsk.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


#include "bpf.h"

#include "libbpf.h"

#include "libbpf_util.h"

#include "libbpf_internal.h"

#include "xsk.h"



#ifndef SOL_XDP