2022-09-20 15:08:14

by Daniel Xu

Subject: [PATCH bpf-next v3 0/3] bpf: Small nf_conn cleanups

This patchset cleans up a few small things:

* Delete unused stub
* Rename variable to be more descriptive
* Fix some `extern` declaration warnings

Past discussion:
- v2: https://lore.kernel.org/bpf/[email protected]/

Changes since v2:
- Remove unused #include's
- Move #include <linux/filter.h> to .c

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 | 18 ------------------
net/core/filter.c | 18 +++++++++---------
net/netfilter/nf_conntrack_bpf.c | 5 +++--
4 files changed, 18 insertions(+), 29 deletions(-)

--
2.37.1

2022-09-20 15:08:46

by Daniel Xu

Subject: [PATCH bpf-next v3 1/3] bpf: Remove unused btf_struct_access stub

This stub was not being used anywhere.

Signed-off-by: Daniel Xu <[email protected]>
---
include/net/netfilter/nf_conntrack_bpf.h | 12 ------------
1 file changed, 12 deletions(-)

diff --git a/include/net/netfilter/nf_conntrack_bpf.h b/include/net/netfilter/nf_conntrack_bpf.h
index a61a93d1c6dc..9c07d2d59da5 100644
--- a/include/net/netfilter/nf_conntrack_bpf.h
+++ b/include/net/netfilter/nf_conntrack_bpf.h
@@ -3,8 +3,6 @@
#ifndef _NF_CONNTRACK_BPF_H
#define _NF_CONNTRACK_BPF_H

-#include <linux/bpf.h>
-#include <linux/btf.h>
#include <linux/kconfig.h>
#include <linux/mutex.h>

@@ -31,16 +29,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

2022-09-20 22:07:52

by patchwork-bot+netdevbpf

Subject: Re: [PATCH bpf-next v3 0/3] bpf: Small nf_conn cleanups

Hello:

This series was applied to bpf/bpf-next.git (master)
by Martin KaFai Lau <[email protected]>:

On Tue, 20 Sep 2022 08:15:21 -0600 you wrote:
> This patchset cleans up a few small things:
>
> * Delete unused stub
> * Rename variable to be more descriptive
> * Fix some `extern` declaration warnings
>
> Past discussion:
> - v2: https://lore.kernel.org/bpf/[email protected]/
>
> [...]

Here is the summary with links:
- [bpf-next,v3,1/3] bpf: Remove unused btf_struct_access stub
https://git.kernel.org/bpf/bpf-next/c/52bdae37c92a
- [bpf-next,v3,2/3] bpf: Rename nfct_bsa to nfct_btf_struct_access
https://git.kernel.org/bpf/bpf-next/c/5a090aa35038
- [bpf-next,v3,3/3] bpf: Move nf_conn extern declarations to filter.h
https://git.kernel.org/bpf/bpf-next/c/fdf214978a71

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html