p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bpf: Replace __diag_ignore with unified __diag_ignore_all 

Currently, -Wmissing-prototypes warning is ignored for GCC, but not
clang. This leads to clang build warning in W=1 mode. Since the flag
used by both compilers is same, we can use the unified __diag_ignore_all
macro that works for all supported versions and compilers which have
__diag macro support (currently GCC >= 8.0, and Clang >= 11.0).

Also add nf_conntrack_bpf.h include to prevent missing prototype warning
for register_nf_conntrack_bpf.

Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20220304224645.3677453-8-memxor@gmail.com
This commit is contained in:
Kumar Kartikeya Dwivedi 2022-03-05 04:16:44 +05:30 committed by Alexei Starovoitov
parent 4d1ea705d7
commit 0b206c6d10
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/bpf/test_run.c
View File

@ -201,8 +201,8 @@ static int bpf_test_finish(const union bpf_attr *kattr,
* future. * future.
*/ */
__diag_push(); __diag_push();
__diag_ignore(GCC, 8, "-Wmissing-prototypes", __diag_ignore_all("-Wmissing-prototypes",
"Global functions as their definitions will be in vmlinux BTF"); "Global functions as their definitions will be in vmlinux BTF");
int noinline bpf_fentry_test1(int a) int noinline bpf_fentry_test1(int a)
{ {
return a + 1; return a + 1;

5
net/netfilter/nf_conntrack_bpf.c
View File

@ -12,6 +12,7 @@
#include <linux/btf_ids.h> #include <linux/btf_ids.h>
#include <linux/net_namespace.h> #include <linux/net_namespace.h>
#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_conntrack_bpf.h>
#include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_core.h>
/* bpf_ct_opts - Options for CT lookup helpers /* bpf_ct_opts - Options for CT lookup helpers
@ -102,8 +103,8 @@ static struct nf_conn *__bpf_nf_ct_lookup(struct net *net,
} }
__diag_push(); __diag_push();
__diag_ignore(GCC, 8, "-Wmissing-prototypes", __diag_ignore_all("-Wmissing-prototypes",
"Global functions as their definitions will be in nf_conntrack BTF"); "Global functions as their definitions will be in nf_conntrack BTF");
/* bpf_xdp_ct_lookup - Lookup CT entry for the given tuple, and acquire a /* bpf_xdp_ct_lookup - Lookup CT entry for the given tuple, and acquire a
* reference to it * reference to it