diff mbox series

[bpf] libbpf: forward-declare bpf_stats_type for systems with outdated UAPI headers

Message ID 20200621031159.2279101-1-andriin@fb.com
State Accepted
Delegated to: BPF Maintainers
Headers show
Series [bpf] libbpf: forward-declare bpf_stats_type for systems with outdated UAPI headers | expand

Commit Message

Andrii Nakryiko June 21, 2020, 3:11 a.m. UTC
Systems that doesn't yet have the very latest linux/bpf.h header, enum
bpf_stats_type will be undefined, causing compilation warnings. Prevents this
by forward-declaring enum.

Fixes: 0bee106716cf ("libbpf: Add support for command BPF_ENABLE_STATS")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
---
 tools/lib/bpf/bpf.h | 2 ++
 1 file changed, 2 insertions(+)

Comments

Song Liu June 21, 2020, 3:36 a.m. UTC | #1
On Sat, Jun 20, 2020 at 8:12 PM Andrii Nakryiko <andriin@fb.com> wrote:
>
> Systems that doesn't yet have the very latest linux/bpf.h header, enum
> bpf_stats_type will be undefined, causing compilation warnings. Prevents this
> by forward-declaring enum.
>
> Fixes: 0bee106716cf ("libbpf: Add support for command BPF_ENABLE_STATS")
> Signed-off-by: Andrii Nakryiko <andriin@fb.com>

Acked-by: Song Liu <songliubraving@fb.com>

Thanks for the fix!
Daniel Borkmann June 22, 2020, 9:27 p.m. UTC | #2
On 6/21/20 5:11 AM, Andrii Nakryiko wrote:
> Systems that doesn't yet have the very latest linux/bpf.h header, enum
> bpf_stats_type will be undefined, causing compilation warnings. Prevents this
> by forward-declaring enum.
> 
> Fixes: 0bee106716cf ("libbpf: Add support for command BPF_ENABLE_STATS")
> Signed-off-by: Andrii Nakryiko <andriin@fb.com>

Applied, thanks!
diff mbox series

Patch

diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h
index 1b6015b21ba8..dbef24ebcfcb 100644
--- a/tools/lib/bpf/bpf.h
+++ b/tools/lib/bpf/bpf.h
@@ -233,6 +233,8 @@  LIBBPF_API int bpf_load_btf(void *btf, __u32 btf_size, char *log_buf,
 LIBBPF_API int bpf_task_fd_query(int pid, int fd, __u32 flags, char *buf,
 				 __u32 *buf_len, __u32 *prog_id, __u32 *fd_type,
 				 __u64 *probe_offset, __u64 *probe_addr);
+
+enum bpf_stats_type; /* defined in up-to-date linux/bpf.h */
 LIBBPF_API int bpf_enable_stats(enum bpf_stats_type type);
 
 #ifdef __cplusplus