* [PATCH bpf-next v2 0/3] bpf: Small nf_conn cleanups
@ 2022-09-19 19:44 Daniel Xu
2022-09-19 19:44 ` [PATCH bpf-next v2 1/3] bpf: Remove unused btf_struct_access stub Daniel Xu
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Daniel Xu @ 2022-09-19 19:44 UTC (permalink / raw)
To: bpf, ast, daniel, andrii, memxor, martin.lau
Cc: Daniel Xu, pablo, fw, toke, netfilter-devel, netdev, linux-kernel
This patchset cleans up a few small things:
* Delete unused stub
* Rename variable to be more descriptive
* Fix some `extern` declaration warnings
Daniel Xu (3):
bpf: Remove unused btf_struct_access stub
bpf: Rename nfct_bsa to nfct_btf_struct_access
bpf: Move nf_conn extern declarations to filter.h
include/linux/filter.h | 6 ++++++
include/net/netfilter/nf_conntrack_bpf.h | 17 +----------------
net/core/filter.c | 18 +++++++++---------
net/netfilter/nf_conntrack_bpf.c | 4 ++--
4 files changed, 18 insertions(+), 27 deletions(-)
--
2.37.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH bpf-next v2 1/3] bpf: Remove unused btf_struct_access stub
2022-09-19 19:44 [PATCH bpf-next v2 0/3] bpf: Small nf_conn cleanups Daniel Xu
@ 2022-09-19 19:44 ` Daniel Xu
2022-09-19 19:44 ` [PATCH bpf-next v2 2/3] bpf: Rename nfct_bsa to nfct_btf_struct_access Daniel Xu
2022-09-19 19:44 ` [PATCH bpf-next v2 3/3] bpf: Move nf_conn extern declarations to filter.h Daniel Xu
2 siblings, 0 replies; 6+ messages in thread
From: Daniel Xu @ 2022-09-19 19:44 UTC (permalink / raw)
To: bpf, ast, daniel, andrii, memxor, martin.lau
Cc: Daniel Xu, pablo, fw, toke, netfilter-devel, netdev, linux-kernel
This stub was not being used anywhere.
Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
---
include/net/netfilter/nf_conntrack_bpf.h | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/include/net/netfilter/nf_conntrack_bpf.h b/include/net/netfilter/nf_conntrack_bpf.h
index a61a93d1c6dc..73f2b78232e5 100644
--- a/include/net/netfilter/nf_conntrack_bpf.h
+++ b/include/net/netfilter/nf_conntrack_bpf.h
@@ -31,16 +31,6 @@ static inline void cleanup_nf_conntrack_bpf(void)
{
}
-static inline int nf_conntrack_btf_struct_access(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)
-{
- return -EACCES;
-}
-
#endif
#endif /* _NF_CONNTRACK_BPF_H */
--
2.37.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH bpf-next v2 2/3] bpf: Rename nfct_bsa to nfct_btf_struct_access
2022-09-19 19:44 [PATCH bpf-next v2 0/3] bpf: Small nf_conn cleanups Daniel Xu
2022-09-19 19:44 ` [PATCH bpf-next v2 1/3] bpf: Remove unused btf_struct_access stub Daniel Xu
@ 2022-09-19 19:44 ` Daniel Xu
2022-09-19 19:44 ` [PATCH bpf-next v2 3/3] bpf: Move nf_conn extern declarations to filter.h Daniel Xu
2 siblings, 0 replies; 6+ messages in thread
From: Daniel Xu @ 2022-09-19 19:44 UTC (permalink / raw)
To: bpf, ast, daniel, andrii, memxor, martin.lau
Cc: Daniel Xu, pablo, fw, toke, netfilter-devel, netdev, linux-kernel
The former name was a little hard to guess.
Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
---
include/net/netfilter/nf_conntrack_bpf.h | 8 ++++----
net/core/filter.c | 18 +++++++++---------
net/netfilter/nf_conntrack_bpf.c | 4 ++--
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/include/net/netfilter/nf_conntrack_bpf.h b/include/net/netfilter/nf_conntrack_bpf.h
index 73f2b78232e5..d1087e4da440 100644
--- a/include/net/netfilter/nf_conntrack_bpf.h
+++ b/include/net/netfilter/nf_conntrack_bpf.h
@@ -15,10 +15,10 @@ 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);
+extern int (*nfct_btf_struct_access)(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
diff --git a/net/core/filter.c b/net/core/filter.c
index 4b2be211bcbe..2fd9449026aa 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -8608,11 +8608,11 @@ static bool tc_cls_act_is_valid_access(int off, int size,
DEFINE_MUTEX(nf_conn_btf_access_lock);
EXPORT_SYMBOL_GPL(nf_conn_btf_access_lock);
-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);
-EXPORT_SYMBOL_GPL(nfct_bsa);
+int (*nfct_btf_struct_access)(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);
+EXPORT_SYMBOL_GPL(nfct_btf_struct_access);
static int tc_cls_act_btf_struct_access(struct bpf_verifier_log *log,
const struct btf *btf,
@@ -8628,8 +8628,8 @@ static int tc_cls_act_btf_struct_access(struct bpf_verifier_log *log,
flag);
mutex_lock(&nf_conn_btf_access_lock);
- if (nfct_bsa)
- ret = nfct_bsa(log, btf, t, off, size, atype, next_btf_id, flag);
+ if (nfct_btf_struct_access)
+ ret = nfct_btf_struct_access(log, btf, t, off, size, atype, next_btf_id, flag);
mutex_unlock(&nf_conn_btf_access_lock);
return ret;
@@ -8708,8 +8708,8 @@ static int xdp_btf_struct_access(struct bpf_verifier_log *log,
flag);
mutex_lock(&nf_conn_btf_access_lock);
- if (nfct_bsa)
- ret = nfct_bsa(log, btf, t, off, size, atype, next_btf_id, flag);
+ if (nfct_btf_struct_access)
+ ret = nfct_btf_struct_access(log, btf, t, off, size, atype, next_btf_id, flag);
mutex_unlock(&nf_conn_btf_access_lock);
return ret;
diff --git a/net/netfilter/nf_conntrack_bpf.c b/net/netfilter/nf_conntrack_bpf.c
index 77eb8e959f61..29c4efb3da5e 100644
--- a/net/netfilter/nf_conntrack_bpf.c
+++ b/net/netfilter/nf_conntrack_bpf.c
@@ -502,7 +502,7 @@ int register_nf_conntrack_bpf(void)
ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SCHED_CLS, &nf_conntrack_kfunc_set);
if (!ret) {
mutex_lock(&nf_conn_btf_access_lock);
- nfct_bsa = _nf_conntrack_btf_struct_access;
+ nfct_btf_struct_access = _nf_conntrack_btf_struct_access;
mutex_unlock(&nf_conn_btf_access_lock);
}
@@ -512,6 +512,6 @@ int register_nf_conntrack_bpf(void)
void cleanup_nf_conntrack_bpf(void)
{
mutex_lock(&nf_conn_btf_access_lock);
- nfct_bsa = NULL;
+ nfct_btf_struct_access = NULL;
mutex_unlock(&nf_conn_btf_access_lock);
}
--
2.37.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH bpf-next v2 3/3] bpf: Move nf_conn extern declarations to filter.h
2022-09-19 19:44 [PATCH bpf-next v2 0/3] bpf: Small nf_conn cleanups Daniel Xu
2022-09-19 19:44 ` [PATCH bpf-next v2 1/3] bpf: Remove unused btf_struct_access stub Daniel Xu
2022-09-19 19:44 ` [PATCH bpf-next v2 2/3] bpf: Rename nfct_bsa to nfct_btf_struct_access Daniel Xu
@ 2022-09-19 19:44 ` Daniel Xu
2022-09-20 5:20 ` Martin KaFai Lau
2 siblings, 1 reply; 6+ messages in thread
From: Daniel Xu @ 2022-09-19 19:44 UTC (permalink / raw)
To: bpf, ast, daniel, andrii, memxor, martin.lau
Cc: Daniel Xu, pablo, fw, toke, netfilter-devel, netdev, linux-kernel
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.
Fixes: 864b656f82cc ("bpf: Add support for writing to nf_conn:mark")
Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
---
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 75335432fcbc..98e28126c24b 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_btf_struct_access)(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 d1087e4da440..24d1ccc1f8df 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_btf_struct_access)(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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH bpf-next v2 3/3] bpf: Move nf_conn extern declarations to filter.h
2022-09-19 19:44 ` [PATCH bpf-next v2 3/3] bpf: Move nf_conn extern declarations to filter.h Daniel Xu
@ 2022-09-20 5:20 ` Martin KaFai Lau
2022-09-20 14:20 ` Daniel Xu
0 siblings, 1 reply; 6+ messages in thread
From: Martin KaFai Lau @ 2022-09-20 5:20 UTC (permalink / raw)
To: Daniel Xu
Cc: pablo, fw, toke, netfilter-devel, netdev, linux-kernel, bpf, ast,
daniel, andrii, memxor
On 9/19/22 12:44 PM, Daniel Xu 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.
>
> Fixes: 864b656f82cc ("bpf: Add support for writing to nf_conn:mark")
> Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
> ---
> 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 75335432fcbc..98e28126c24b 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_btf_struct_access)(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 d1087e4da440..24d1ccc1f8df 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>
The filter.h is only needed by nf_conntrack_bpf.c? How about moving
this include to nf_conntrack_bpf.c. nf_conntrack_bpf.h is included by
other conntrack core codes. I would prefer not to spill over
unnecessary bpf headers to them. The same goes for the above bpf.h and
btf.h which are only needed in nf_conntrack_bpf.c also?
> #include <linux/kconfig.h>
> #include <linux/mutex.h>
Also, is mutex.h still needed?
>
> @@ -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_btf_struct_access)(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)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH bpf-next v2 3/3] bpf: Move nf_conn extern declarations to filter.h
2022-09-20 5:20 ` Martin KaFai Lau
@ 2022-09-20 14:20 ` Daniel Xu
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Xu @ 2022-09-20 14:20 UTC (permalink / raw)
To: Martin KaFai Lau
Cc: pablo, fw, toke, netfilter-devel, netdev, linux-kernel, bpf, ast,
daniel, andrii, memxor
On Mon, Sep 19, 2022 at 10:20:47PM -0700, Martin KaFai Lau wrote:
> On 9/19/22 12:44 PM, Daniel Xu 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.
> >
> > Fixes: 864b656f82cc ("bpf: Add support for writing to nf_conn:mark")
> > Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
> > ---
> > 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 75335432fcbc..98e28126c24b 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_btf_struct_access)(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 d1087e4da440..24d1ccc1f8df 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>
>
> The filter.h is only needed by nf_conntrack_bpf.c? How about moving this
> include to nf_conntrack_bpf.c. nf_conntrack_bpf.h is included by other
> conntrack core codes. I would prefer not to spill over unnecessary bpf
> headers to them. The same goes for the above bpf.h and btf.h which are only
> needed in nf_conntrack_bpf.c also?
Ah yeah. Thanks for catching. Will send out a v3.
Now I'm wondering if https://include-what-you-use.org/ would work with
kernel source. Might give it a try later.
>
> > #include <linux/kconfig.h>
> > #include <linux/mutex.h>
>
> Also, is mutex.h still needed?
Nope. But forgot to send that out in v3. I'll roll it into v4 if we need
another respin or otherwise I'll send out a separate patch after.
>
> > @@ -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_btf_struct_access)(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)
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-09-20 14:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-19 19:44 [PATCH bpf-next v2 0/3] bpf: Small nf_conn cleanups Daniel Xu
2022-09-19 19:44 ` [PATCH bpf-next v2 1/3] bpf: Remove unused btf_struct_access stub Daniel Xu
2022-09-19 19:44 ` [PATCH bpf-next v2 2/3] bpf: Rename nfct_bsa to nfct_btf_struct_access Daniel Xu
2022-09-19 19:44 ` [PATCH bpf-next v2 3/3] bpf: Move nf_conn extern declarations to filter.h Daniel Xu
2022-09-20 5:20 ` Martin KaFai Lau
2022-09-20 14:20 ` Daniel Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).