netfilter updates for net-next
Subsystems (3)
Florian Westphal
maintainercover netfilter updates for net-next
Hello,
This batch contains a few updates for your *net-next* tree. First 4 Patches, from Yue Haibing, remove unused prototypes in various netfilter headers.
Last patch makes nfnetlink_log to always include a packet timestamp, up to now it was only included if the skb had assigned previously. From Maciej Żenczykowski.
The following changes since commit b98a5aa7e4c20d6e4d9062ee0f0156ff3ad300fa:
Merge branch 'net-remove-redundant-initialization-owner' (2023-08-07 19:18:30 -0700)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git tags/nf-next-2023-08-08
for you to fetch changes up to 1d85594fd3e7e39e63b53b1bdc2d89db43b6ecd5:
netfilter: nfnetlink_log: always add a timestamp (2023-08-08 13:03:36 +0200)
----------------------------------------------------------------
nf-next pull request 2023-08-08
----------------------------------------------------------------
Maciej Żenczykowski (1):
netfilter: nfnetlink_log: always add a timestamp
Yue Haibing (4):
netfilter: gre: Remove unused function declaration nf_ct_gre_keymap_flush()
netfilter: helper: Remove unused function declarations
netfilter: conntrack: Remove unused function declarations
netfilter: h323: Remove unused function declarations
include/linux/netfilter/nf_conntrack_h323.h | 4 ---- include/linux/netfilter/nf_conntrack_proto_gre.h | 1 - include/net/netfilter/nf_conntrack.h | 4 ---- include/net/netfilter/nf_conntrack_acct.h | 2 -- include/net/netfilter/nf_conntrack_helper.h | 3 --- include/net/netfilter/nf_conntrack_labels.h | 1 - net/netfilter/nfnetlink_log.c | 6 ++---- 7 files changed, 2 insertions(+), 19 deletions(-)
Florian Westphal
maintainerPATCH 1/5 netfilter: gre: Remove unused function declaration nf_ct_gre_keymap_flush()
From: Yue Haibing <[email protected]>
Commit a23f89a99906 ("netfilter: conntrack: nf_ct_gre_keymap_flush() removal") leave this unused, remove it.
--- include/linux/netfilter/nf_conntrack_proto_gre.h | 1 - 1 file changed, 1 deletion(-)
include/linux/netfilter/nf_conntrack_proto_gre.h +0 -1
@@ -25,7 +25,6 @@ struct nf_ct_gre_keymap {int nf_ct_gre_keymap_add (struct nf_conn *ct,enum ip_conntrack_dir dir,struct nf_conntrack_tuple *t); -void nf_ct_gre_keymap_flush (struct net *net);/* delete keymap entries */ void nf_ct_gre_keymap_destroy (struct nf_conn *ct);
Signature · 1 line
2.41.0
Re: [PATCH next-next 1/5] netfilter: gre: Remove unused function declaration nf_ct_gre_keymap_flush()
This series was applied to netdev/net-next.git (main) by Florian Westphal <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Florian Westphal <[email protected]>:
Quoted 9 lines · On Tue, 8 Aug 2023 14:41:44 +0200 you wrote:
From: Yue Haibing <[email protected]>
Commit
a23f89a99906("netfilter: conntrack:nf_ct_gre_keymap_flush()removal") leave this unused, remove it.Signed-off-by Yue Haibing <[email protected]>Signed-off-by Florian Westphal <[email protected]>[...]
Here is the summary with links:
- [next-next,1/5] netfilter: gre: Remove unused function declaration nf_ct_gre_keymap_flush()
https://git.kernel.org/netdev/net-next/c/29cfda963f89 - [next-next,2/5] netfilter: helper: Remove unused function declarations https://git.kernel.org/netdev/net-next/c/529f63fa11eb - [next-next,3/5] netfilter: conntrack: Remove unused function declarations https://git.kernel.org/netdev/net-next/c/172af3eab05f - [next-next,4/5] netfilter: h323: Remove unused function declarations https://git.kernel.org/netdev/net-next/c/61e9ab294b39 - [next-next,5/5] netfilter: nfnetlink_log: always add a timestamp https://git.kernel.org/netdev/net-next/c/1d85594fd3e7
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Florian Westphal
maintainerPATCH 2/5 netfilter: helper: Remove unused function declarations
In reply to Florian WestphalFrom: Yue Haibing <[email protected]>
Commit b118509076b3 ("netfilter: remove nf_conntrack_helper sysctl and modparam toggles") leave these unused declarations.
--- include/net/netfilter/nf_conntrack_helper.h | 3 --- 1 file changed, 3 deletions(-)
include/net/netfilter/nf_conntrack_helper.h +0 -3
@@ -136,8 +136,6 @@ static inline void *nfct_help_data(const struct nf_conn *ct)return (void *)help->data; } -void nf_conntrack_helper_pernet_init (struct net *net); -int nf_conntrack_helper_init (void );void nf_conntrack_helper_fini (void );
@@ -182,5 +180,4 @@ void nf_nat_helper_unregister(struct nf_conntrack_nat_helper *nat);int nf_nat_helper_try_module_get (const char *name,u16 l3num,u8 protonum);void nf_nat_helper_put (struct nf_conntrack_helper *helper); -void nf_ct_set_auto_assign_helper_warned (struct net *net);#endif /*_NF_CONNTRACK_HELPER_H*/
Signature · 1 line
2.41.0
Florian Westphal
maintainerPATCH 3/5 netfilter: conntrack: Remove unused function declarations
In reply to Florian WestphalFrom: Yue Haibing <[email protected]>
Commit 1015c3de23ee ("netfilter: conntrack: remove extension register api") leave nf_conntrack_acct_fini() and nf_conntrack_labels_init() unused, remove it. And commit a0ae2562c6c4 ("netfilter: conntrack: remove l3proto abstraction") leave behind nf_ct_l3proto_try_module_get() and nf_ct_l3proto_module_put().
--- include/net/netfilter/nf_conntrack.h | 4 ---- include/net/netfilter/nf_conntrack_acct.h | 2 -- include/net/netfilter/nf_conntrack_labels.h | 1 - 3 files changed, 7 deletions(-)
include/net/netfilter/nf_conntrack.h +0 -4
@@ -190,10 +190,6 @@ static inline void nf_ct_put(struct nf_conn *ct)nf_ct_destroy (&ct->ct_general); } -/* Protocol module loading */ -int nf_ct_l3proto_try_module_get (unsigned short l3proto); -void nf_ct_l3proto_module_put (unsigned short l3proto); -/* load module; enable/disable conntrack in this namespace */ int nf_ct_netns_get (struct net *net,u8 nfproto);void nf_ct_netns_put (struct net *net,u8 nfproto);
include/net/netfilter/nf_conntrack_acct.h +0 -2
@@ -78,6 +78,4 @@ static inline void nf_ct_acct_update(struct nf_conn *ct, u32 dir,void nf_conntrack_acct_pernet_init (struct net *net); -void nf_conntrack_acct_fini (void ); -#endif /* _NF_CONNTRACK_ACCT_H */
include/net/netfilter/nf_conntrack_labels.h +0 -1
@@ -52,7 +52,6 @@ int nf_connlabels_replace(struct nf_conn *ct, const u32 *data, const u32 *mask, unsigned int words);#ifdef CONFIG_NF_CONNTRACK_LABELS -int nf_conntrack_labels_init (void );int nf_connlabels_get (struct net *net,unsigned int bit);void nf_connlabels_put (struct net *net);#else
Signature · 1 line
2.41.0
Florian Westphal
maintainerPATCH 4/5 netfilter: h323: Remove unused function declarations
In reply to Florian WestphalFrom: Yue Haibing <[email protected]>
Commit f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") declared but never implemented these.
--- include/linux/netfilter/nf_conntrack_h323.h | 4 ---- 1 file changed, 4 deletions(-)
include/linux/netfilter/nf_conntrack_h323.h +0 -4
@@ -34,10 +34,6 @@ struct nf_ct_h323_master {int get_h225_addr (struct nf_conn *ct,unsigned char *data,TransportAddress *taddr,union nf_inet_addr *addr,__be16 *port); -void nf_conntrack_h245_expect (struct nf_conn *new, -struct nf_conntrack_expect *this); -void nf_conntrack_q931_expect (struct nf_conn *new, -struct nf_conntrack_expect *this);struct nfct_h323_nat_hooks { int (*set_h245_addr)(struct sk_buff *skb, unsigned int protoff,
Signature · 1 line
2.41.0
Florian Westphal
maintainerPATCH 5/5 netfilter: nfnetlink_log: always add a timestamp
In reply to Florian WestphalFrom: Maciej Żenczykowski <[email protected]>
Compared to all the other work we're already doing to deliver an skb to userspace this is very cheap - at worse an extra call to ktime_get_real() - and very useful.
(and indeed it may even be cheaper if we're running from other hooks)
(background: Android occasionally logs packets which caused wake from sleep/suspend and we'd like to have timestamps reliably associated with these events)
--- net/netfilter/nfnetlink_log.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
net/netfilter/nfnetlink_log.c +2 -4
@@ -470,7 +470,6 @@ __build_packet_message(struct nfnl_log_net *log,sk_buff_data_t old_tail = inst->skb->tail;struct sock *sk;const unsigned char *hwhdrp; -ktime_t tstamp; nlh = nfnl_msg_put(inst->skb, 0, 0, nfnl_msg_type(NFNL_SUBSYS_ULOG, NFULNL_MSG_PACKET),
@@ -599,10 +598,9 @@ __build_packet_message(struct nfnl_log_net *log, goto nla_put_failure; } - tstamp =skb_tstamp_cond (skb, false); -if (hooknum <=NF_INET_FORWARD && tstamp) { +if (hooknum <=NF_INET_FORWARD ) { +struct timespec64 kts =ktime_to_timespec64 (skb_tstamp_cond (skb, true));struct nfulnl_msg_packet_timestamp ts; -struct timespec64 kts =ktime_to_timespec64 (tstamp); ts.sec =cpu_to_be64 (kts.tv_sec); ts.usec =cpu_to_be64 (kts.tv_nsec /NSEC_PER_USEC );
Signature · 1 line
2.41.0