Re: [PATCH bpf-next] bpf: Move nf_conn extern declarations to filter.h

Kumar Kartikeya Dwivedi
2022-09-11T20:48:31Z

On Sun, 11 Sept 2022 at 20:20, Daniel Xu <dxu@dxuuu.xyz> wrote:
>
> We're seeing the following new warnings on netdev/build_32bit and
> netdev/build_allmodconfig_warn CI jobs:
>
> ../net/core/filter.c:8608:1: warning: symbol
> 'nf_conn_btf_access_lock' was not declared. Should it be static?
> ../net/core/filter.c:8611:5: warning: symbol 'nfct_bsa' was not
> declared. Should it be static?
>
> Fix by ensuring extern declaration is present while compiling filter.o.
>
> Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
> ---

Acked-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>

> include/linux/filter.h | 6 ++++++
> include/net/netfilter/nf_conntrack_bpf.h | 7 +------
> 2 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/include/linux/filter.h b/include/linux/filter.h
> index 527ae1d64e27..96de256b2c8d 100644
> --- a/include/linux/filter.h
> +++ b/include/linux/filter.h
> @@ -567,6 +567,12 @@ struct sk_filter {
>
> DECLARE_STATIC_KEY_FALSE(bpf_stats_enabled_key);
>
> +extern struct mutex nf_conn_btf_access_lock;
> +extern int (*nfct_bsa)(struct bpf_verifier_log *log, const struct btf *btf,
> + const struct btf_type *t, int off, int size,
> + enum bpf_access_type atype, u32 *next_btf_id,
> + enum bpf_type_flag *flag);
> +
> typedef unsigned int (*bpf_dispatcher_fn)(const void *ctx,
> const struct bpf_insn *insnsi,
> unsigned int (*bpf_func)(const void *,
> diff --git a/include/net/netfilter/nf_conntrack_bpf.h b/include/net/netfilter/nf_conntrack_bpf.h
> index a61a93d1c6dc..cf2c0423d174 100644
> --- a/include/net/netfilter/nf_conntrack_bpf.h
> +++ b/include/net/netfilter/nf_conntrack_bpf.h
> @@ -5,6 +5,7 @@
>
> #include <linux/bpf.h>
> #include <linux/btf.h>
> +#include <linux/filter.h>
> #include <linux/kconfig.h>
> #include <linux/mutex.h>
>
> @@ -14,12 +15,6 @@
> extern int register_nf_conntrack_bpf(void);
> extern void cleanup_nf_conntrack_bpf(void);
>
> -extern struct mutex nf_conn_btf_access_lock;
> -extern int (*nfct_bsa)(struct bpf_verifier_log *log, const struct btf *btf,
> - const struct btf_type *t, int off, int size,
> - enum bpf_access_type atype, u32 *next_btf_id,
> - enum bpf_type_flag *flag);
> -
> #else
>
> static inline int register_nf_conntrack_bpf(void)
> --
> 2.37.1
>