net: netfilter: Remove ifdefs for code shared by BPF and ctnetlink
Subsystems (4)
Kumar Kartikeya Dwivedi
maintainerPATCH 1/1 net: netfilter: Remove ifdefs for code shared by BPF and ctnetlink
The current ifdefry for code shared by the BPF and ctnetlink side looks ugly. As per Pablo's request, simplify this by unconditionally compiling in the code. This can be revisited when the shared code between the two grows further.
--- include/net/netfilter/nf_conntrack_core.h | 6 ------ net/netfilter/nf_conntrack_core.c | 6 ------ 2 files changed, 12 deletions(-)
include/net/netfilter/nf_conntrack_core.h +0 -6
@@ -86,10 +86,6 @@ extern spinlock_t nf_conntrack_expect_lock;/* ctnetlink code shared by both ctnetlink and nf_conntrack_bpf */ -#if (IS_BUILTIN (CONFIG_NF_CONNTRACK ) &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF )) || \ - (IS_MODULE (CONFIG_NF_CONNTRACK ) &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES ) || \ -IS_ENABLED (CONFIG_NF_CT_NETLINK )) -static inline void __nf_ct_set_timeout (struct nf_conn *ct,u64 timeout) {if (timeout >INT_MAX )
@@ -101,6 +97,4 @@ int __nf_ct_change_timeout(struct nf_conn *ct, u64 cta_timeout);void __nf_ct_change_status (struct nf_conn *ct,unsigned long on,unsigned long off);int nf_ct_change_status_common (struct nf_conn *ct,unsigned int status); -#endif -#endif /* _NF_CONNTRACK_CORE_H */
net/netfilter/nf_conntrack_core.c +0 -6
@@ -2787,10 +2787,6 @@ int nf_conntrack_init_net(struct net *net)return ret; } -#if (IS_BUILTIN (CONFIG_NF_CONNTRACK ) &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF )) || \ - (IS_MODULE (CONFIG_NF_CONNTRACK ) &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES ) || \ -IS_ENABLED (CONFIG_NF_CT_NETLINK )) -/* ctnetlink code shared by both ctnetlink and nf_conntrack_bpf */ int __nf_ct_change_timeout (struct nf_conn *ct,u64 timeout)
@@ -2846,5 +2842,3 @@ int nf_ct_change_status_common(struct nf_conn *ct, unsigned int status)return 0 ; }EXPORT_SYMBOL_GPL (nf_ct_change_status_common); - -#endif
--
2.34.1
Kumar Kartikeya Dwivedi
maintainerQuoted 9 lines · Kumar Kartikeya Dwivedi
The current ifdefry for code shared by the BPF and ctnetlink side looks ugly. As per Pablo's request, simplify this by unconditionally compiling in the code. This can be revisited when the shared code between the two grows further.
Suggested-by Pablo Neira Ayuso <[email protected]>Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>---
Pablo, presumably this needs your ack before it can be applied, as it is marked Needs Ack in patchwork.
Quoted 50 lines
include/net/netfilter/nf_conntrack_core.h | 6 ------ net/netfilter/nf_conntrack_core.c | 6 ------ 2 files changed, 12 deletions(-)include/net/netfilter/nf_conntrack_core.h +0
-6@@ -86,10 +86,6 @@ extern spinlock_t nf_conntrack_expect_lock;/* ctnetlink code shared by both ctnetlink and nf_conntrack_bpf */ -#if (IS_BUILTIN (CONFIG_NF_CONNTRACK ) &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF )) || \ - (IS_MODULE (CONFIG_NF_CONNTRACK ) &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES ) || \ -IS_ENABLED (CONFIG_NF_CT_NETLINK )) -static inline void __nf_ct_set_timeout (struct nf_conn *ct,u64 timeout) {if (timeout >INT_MAX )@@ -101,6 +97,4 @@ int __nf_ct_change_timeout(struct nf_conn *ct, u64 cta_timeout);void __nf_ct_change_status (struct nf_conn *ct,unsigned long on,unsigned long off);int nf_ct_change_status_common (struct nf_conn *ct,unsigned int status); -#endif -#endif /* _NF_CONNTRACK_CORE_H */ net/netfilter/nf_conntrack_core.c +0
-7@@ -2787,10 +2787,6 @@ int nf_conntrack_init_net(struct net *net)return ret; } -#if (IS_BUILTIN (CONFIG_NF_CONNTRACK ) &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF )) || \ - (IS_MODULE (CONFIG_NF_CONNTRACK ) &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES ) || \ -IS_ENABLED (CONFIG_NF_CT_NETLINK )) -/* ctnetlink code shared by both ctnetlink and nf_conntrack_bpf */ int __nf_ct_change_timeout (struct nf_conn *ct,u64 timeout)@@ -2846,5 +2842,3 @@ int nf_ct_change_status_common(struct nf_conn *ct, unsigned int status)return 0 ; }EXPORT_SYMBOL_GPL (nf_ct_change_status_common); - -#endif --2.34.1
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 9 lines · On Mon, 25 Jul 2022 10:51:30 +0200 you wrote:
The current ifdefry for code shared by the BPF and ctnetlink side looks ugly. As per Pablo's request, simplify this by unconditionally compiling in the code. This can be revisited when the shared code between the two grows further.
Suggested-by Pablo Neira Ayuso <[email protected]>Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>[...]
Here is the summary with links:
- [bpf-next] net: netfilter: Remove ifdefs for code shared by BPF and ctnetlink
https://git.kernel.org/bpf/bpf-next/c/6e116280b41b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html