get rid of module refcounting in ctnetlink
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/8 get rid of module refcounting in ctnetlink
This patch replaces the unnecessary module refcounting with the read-side locks. With this patch, all the dump and fill_info function are called under the RCU read lock.
Based on a patch from Fabian Hugelshofer.
---
net/netfilter/nf_conntrack_netlink.c | 38 ++++++++++++++++------------------ 1 files changed, 18 insertions(+), 20 deletions(-)
net/netfilter/nf_conntrack_netlink.c +18 -20
@@ -105,16 +105,14 @@ ctnetlink_dump_tuples(struct sk_buff *skb,struct nf_conntrack_l3proto *l3proto;struct nf_conntrack_l4proto *l4proto; - l3proto =nf_ct_l3proto_find_get (tuple->src.l3num); + l3proto =__nf_ct_l3proto_find (tuple->src.l3num); ret =ctnetlink_dump_tuples_ip (skb, tuple, l3proto); -nf_ct_l3proto_put (l3proto);if (unlikely (ret <0 ))return ret; - l4proto =nf_ct_l4proto_find_get (tuple->src.l3num, tuple->dst.protonum); + l4proto =__nf_ct_l4proto_find (tuple->src.l3num, tuple->dst.protonum); ret =ctnetlink_dump_tuples_proto (skb, tuple, l4proto); -nf_ct_l4proto_put (l4proto);return ret; }
@@ -151,11 +149,9 @@ ctnetlink_dump_protoinfo(struct sk_buff *skb, const struct nf_conn *ct)struct nlattr *nest_proto;int ret; - l4proto =nf_ct_l4proto_find_get (nf_ct_l3num (ct),nf_ct_protonum (ct)); -if (!l4proto->to_nlattr) { -nf_ct_l4proto_put (l4proto); + l4proto =__nf_ct_l4proto_find (nf_ct_l3num (ct),nf_ct_protonum (ct)); +if (!l4proto->to_nlattr)return 0 ; - } nest_proto =nla_nest_start (skb,CTA_PROTOINFO |NLA_F_NESTED );if (!nest_proto)
@@ -163,14 +159,11 @@ ctnetlink_dump_protoinfo(struct sk_buff *skb, const struct nf_conn *ct) ret = l4proto->to_nlattr (skb, nest_proto, ct); -nf_ct_l4proto_put (l4proto); -nla_nest_end (skb, nest_proto);return ret; nla_put_failure: -nf_ct_l4proto_put (l4proto);return -1 ; }
@@ -184,7 +177,6 @@ ctnetlink_dump_helpinfo(struct sk_buff *skb, const struct nf_conn *ct)if (!help)return 0 ; -rcu_read_lock (); helper =rcu_dereference (help->helper);if (!helper) goto out;
@@ -199,11 +191,9 @@ ctnetlink_dump_helpinfo(struct sk_buff *skb, const struct nf_conn *ct)nla_nest_end (skb, nest_helper); out: -rcu_read_unlock ();return 0 ; nla_put_failure: -rcu_read_unlock ();return -1 ; }
@@ -461,6 +451,7 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, nfmsg->version =NFNETLINK_V0 ; nfmsg->res_id =0 ; +rcu_read_lock (); nest_parms =nla_nest_start (skb,CTA_TUPLE_ORIG |NLA_F_NESTED );if (!nest_parms) goto nla_put_failure;
@@ -517,13 +508,15 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, && ctnetlink_dump_mark(skb, ct) < 0) goto nla_put_failure;#endif +rcu_read_unlock (); nlh->nlmsg_len = skb->tail - b;nfnetlink_send (skb,0 , group,0 );return NOTIFY_DONE ; -nlmsg_failure: nla_put_failure: +rcu_read_unlock (); +nlmsg_failure:kfree_skb (skb);return NOTIFY_DONE ; }
@@ -860,8 +853,10 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,return -ENOMEM ; } +rcu_read_lock (); err =ctnetlink_fill_info (skb2,NETLINK_CB (skb).pid, nlh->nlmsg_seq,IPCTNL_MSG_CT_NEW ,1 , ct); +rcu_read_unlock ();nf_ct_put (ct);if (err <=0 ) goto free;
@@ -1319,16 +1314,14 @@ ctnetlink_exp_dump_mask(struct sk_buff *skb,if (!nest_parms) goto nla_put_failure; - l3proto =nf_ct_l3proto_find_get (tuple->src.l3num); + l3proto =__nf_ct_l3proto_find (tuple->src.l3num); ret =ctnetlink_dump_tuples_ip (skb, &m, l3proto); -nf_ct_l3proto_put (l3proto);if (unlikely (ret <0 )) goto nla_put_failure; - l4proto =nf_ct_l4proto_find_get (tuple->src.l3num, tuple->dst.protonum); + l4proto =__nf_ct_l4proto_find (tuple->src.l3num, tuple->dst.protonum); ret =ctnetlink_dump_tuples_proto (skb, &m, l4proto); -nf_ct_l4proto_put (l4proto);if (unlikely (ret <0 )) goto nla_put_failure;
@@ -1435,15 +1428,18 @@ static int ctnetlink_expect_event(struct notifier_block *this, nfmsg->version =NFNETLINK_V0 ; nfmsg->res_id =0 ; +rcu_read_lock ();if (ctnetlink_exp_dump_expect (skb, exp) <0 ) goto nla_put_failure; +rcu_read_unlock (); nlh->nlmsg_len = skb->tail - b;nfnetlink_send (skb,0 ,NFNLGRP_CONNTRACK_EXP_NEW ,0 );return NOTIFY_DONE ; -nlmsg_failure: nla_put_failure: +rcu_read_unlock (); +nlmsg_failure:kfree_skb (skb);return NOTIFY_DONE ; }
@@ -1547,9 +1543,11 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb,if (!skb2) goto out; +rcu_read_lock (); err =ctnetlink_exp_fill_info (skb2,NETLINK_CB (skb).pid, nlh->nlmsg_seq,IPCTNL_MSG_EXP_NEW ,1 , exp); +rcu_read_unlock ();if (err <=0 ) goto free;
Pablo Neira Ayuso
maintainerPATCH 2/8 connection tracking helper name persistent aliases
This patch adds the macro MODULE_ALIAS_NFCT_HELPER that defines a way to provide generic and persistent aliases for the connection tracking helpers.
This next patch requires this patch.
---
include/net/netfilter/nf_conntrack.h | 3 +++ net/netfilter/nf_conntrack_amanda.c | 1 + net/netfilter/nf_conntrack_ftp.c | 1 + net/netfilter/nf_conntrack_h323_main.c | 1 + net/netfilter/nf_conntrack_irc.c | 1 + net/netfilter/nf_conntrack_netbios_ns.c | 1 + net/netfilter/nf_conntrack_pptp.c | 1 + net/netfilter/nf_conntrack_sane.c | 1 + net/netfilter/nf_conntrack_sip.c | 1 + net/netfilter/nf_conntrack_tftp.c | 1 + 10 files changed, 12 insertions(+), 0 deletions(-)
include/net/netfilter/nf_conntrack.h +3 -0
@@ -298,5 +298,8 @@ do { \local_bh_enable (); \ } while (0) +#define MODULE_ALIAS_NFCT_HELPER (helper) \ + MODULE_ALIAS("nfct-helper-" helper) +#endif /* __KERNEL__ */ #endif /* _NF_CONNTRACK_H */
net/netfilter/nf_conntrack_amanda.c +1 -0
@@ -30,6 +30,7 @@ MODULE_AUTHOR("Brian J. Murrell <[email protected]>");MODULE_DESCRIPTION ("Amanda connection tracking module" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("ip_conntrack_amanda" ); +MODULE_ALIAS_NFCT_HELPER ("amanda" );module_param (master_timeout, uint,0600 );MODULE_PARM_DESC (master_timeout,"timeout for the master connection" );
net/netfilter/nf_conntrack_ftp.c +1 -0
@@ -29,6 +29,7 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Rusty Russell <[email protected]>" );MODULE_DESCRIPTION ("ftp connection tracking helper" );MODULE_ALIAS ("ip_conntrack_ftp" ); +MODULE_ALIAS_NFCT_HELPER ("ftp" );/* This is slow, but it's simple. --RR */ static char *ftp_buffer;
net/netfilter/nf_conntrack_h323_main.c +1 -0
@@ -1831,3 +1831,4 @@ MODULE_AUTHOR("Jing Min Zhao <[email protected]>");MODULE_DESCRIPTION ("H.323 connection tracking helper" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("ip_conntrack_h323" ); +MODULE_ALIAS_NFCT_HELPER ("h323" );
net/netfilter/nf_conntrack_irc.c +1 -0
@@ -41,6 +41,7 @@ MODULE_AUTHOR("Harald Welte <[email protected]>");MODULE_DESCRIPTION ("IRC (DCC) connection tracking helper" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("ip_conntrack_irc" ); +MODULE_ALIAS_NFCT_HELPER ("irc" );module_param_array (ports, ushort, &ports_c,0400 );MODULE_PARM_DESC (ports,"port numbers of IRC servers" );
net/netfilter/nf_conntrack_netbios_ns.c +1 -0
@@ -37,6 +37,7 @@ MODULE_AUTHOR("Patrick McHardy <[email protected]>");MODULE_DESCRIPTION ("NetBIOS name service broadcast connection tracking helper" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("ip_conntrack_netbios_ns" ); +MODULE_ALIAS_NFCT_HELPER ("netbios_ns" );static unsigned int timeout__read_mostly =3 ;module_param (timeout, uint,0400 );
net/netfilter/nf_conntrack_pptp.c +1 -0
@@ -37,6 +37,7 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Harald Welte <[email protected]>" );MODULE_DESCRIPTION ("Netfilter connection tracking helper module for PPTP" );MODULE_ALIAS ("ip_conntrack_pptp" ); +MODULE_ALIAS_NFCT_HELPER ("pptp" );static DEFINE_SPINLOCK (nf_pptp_lock);
net/netfilter/nf_conntrack_sane.c +1 -0
@@ -30,6 +30,7 @@MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Michal Schmidt <[email protected]>" );MODULE_DESCRIPTION ("SANE connection tracking helper" ); +MODULE_ALIAS_NFCT_HELPER ("sane" );static char *sane_buffer;
net/netfilter/nf_conntrack_sip.c +1 -0
@@ -28,6 +28,7 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("Christian Hentschel <[email protected]>" );MODULE_DESCRIPTION ("SIP connection tracking helper" );MODULE_ALIAS ("ip_conntrack_sip" ); +MODULE_ALIAS_NFCT_HELPER ("sip" );#define MAX_PORTS 8static unsigned short ports[MAX_PORTS ];
net/netfilter/nf_conntrack_tftp.c +1 -0
@@ -22,6 +22,7 @@ MODULE_AUTHOR("Magnus Boden <[email protected]>");MODULE_DESCRIPTION ("TFTP connection tracking helper" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("ip_conntrack_tftp" ); +MODULE_ALIAS_NFCT_HELPER ("tftp" );#define MAX_PORTS 8static unsigned short ports[MAX_PORTS ];
Patrick McHardy
AppliedRe: [PATCH 2/8] [PATCH] connection tracking helper name persistent aliases
Quoted 5 lines · Pablo Neira Ayuso
This patch adds the macro
MODULE_ALIAS_NFCT_HELPERthat defines a way to provide generic and persistent aliases for the connection tracking helpers.This next patch requires this patch.
Applied, thanks.
Pablo Neira Ayuso
maintainerPATCH 3/8 Helper modules load-on-demand support for ctnetlink
In reply to Pablo Neira AyusoThis patch adds module loading for helpers via ctnetlink.
* Creation path: We support explicit and implicit helper assignation. For the explicit case, we try to load the module. If the module is correctly loaded and the helper is present, we return EAGAIN to re-start the creation. Otherwise, we return EOPNOTSUPP.
* Update path: release the spin lock, load the module and check. If it is present, then return EAGAIN to re-start the update.
This patch includes a minor change in nfnetlink to support EAGAIN. Based on a suggestion from Patrick McHardy.
This patch provides a refactorized function to lookup-and-set the connection tracking helper. The function removes the exported symbol __nf_ct_helper_find as it has not clients anymore.
---
include/net/netfilter/nf_conntrack_helper.h | 16 +++++- net/netfilter/nf_conntrack_core.c | 30 +----------- net/netfilter/nf_conntrack_helper.c | 33 ++++++++++++- net/netfilter/nf_conntrack_netlink.c | 70 ++++++++++++++++++++++++--- net/netfilter/nfnetlink.c | 3 + 5 files changed, 109 insertions(+), 43 deletions(-)
include/net/netfilter/nf_conntrack_helper.h +13 -3
@@ -39,9 +39,6 @@ struct nf_conntrack_helper };extern struct nf_conntrack_helper * -__nf_ct_helper_find (const struct nf_conntrack_tuple *tuple); - -extern struct nf_conntrack_helper *__nf_conntrack_helper_find_byname (const char *name);extern int nf_conntrack_helper_register (struct nf_conntrack_helper *);
@@ -49,6 +46,19 @@ extern void nf_conntrack_helper_unregister(struct nf_conntrack_helper *);extern struct nf_conn_help *nf_ct_helper_ext_add (struct nf_conn *ct,gfp_t gfp); +extern int __nf_ct_set_helper (struct nf_conn *ct,gfp_t flags); + +static inline int nf_ct_set_helper (struct nf_conn *ct,gfp_t flags) +{ +int ret; + +rcu_read_lock (); + ret =__nf_ct_set_helper (ct, flags); +rcu_read_unlock (); + +return ret; +} +static inline struct nf_conn_help *nfct_help (const struct nf_conn *ct) {return nf_ct_ext_find (ct,NF_CT_EXT_HELPER );
net/netfilter/nf_conntrack_core.c +2 -28
@@ -581,14 +581,7 @@ init_conntrack(struct net *net,nf_conntrack_get (&ct->master->ct_general);NF_CT_STAT_INC (net, expect_new); }else { -struct nf_conntrack_helper *helper; - - helper =__nf_ct_helper_find (&repl_tuple); -if (helper) { - help =nf_ct_helper_ext_add (ct,GFP_ATOMIC ); -if (help) -rcu_assign_pointer (help->helper, helper); - } +__nf_ct_set_helper (ct,GFP_ATOMIC );NF_CT_STAT_INC (net, new); }
@@ -765,7 +758,6 @@ void nf_conntrack_alter_reply(struct nf_conn *ct, const struct nf_conntrack_tuple *newreply) {struct nf_conn_help *help =nfct_help (ct); -struct nf_conntrack_helper *helper;/* Should be unconfirmed, so not in hash table yet */ NF_CT_ASSERT (!nf_ct_is_confirmed (ct));
@@ -777,25 +769,7 @@ void nf_conntrack_alter_reply(struct nf_conn *ct,if (ct->master || (help && !hlist_empty (&help->expectations)))return ; -rcu_read_lock (); - helper =__nf_ct_helper_find (newreply); -if (helper ==NULL ) { -if (help) -rcu_assign_pointer (help->helper,NULL ); - goto out; - } - -if (help ==NULL ) { - help =nf_ct_helper_ext_add (ct,GFP_ATOMIC ); -if (help ==NULL ) - goto out; - }else { -memset (&help->help,0 ,sizeof (help->help)); - } - -rcu_assign_pointer (help->helper, helper); -out: -rcu_read_unlock (); +nf_ct_set_helper (ct,GFP_ATOMIC ); }EXPORT_SYMBOL_GPL (nf_conntrack_alter_reply);
net/netfilter/nf_conntrack_helper.c +31 -2
@@ -44,7 +44,7 @@ static unsigned int helper_hash(const struct nf_conntrack_tuple *tuple) (__force __u16)tuple->src.u.all) % nf_ct_helper_hsize; } -struct nf_conntrack_helper * +static struct nf_conntrack_helper *__nf_ct_helper_find (const struct nf_conntrack_tuple *tuple) {struct nf_conntrack_helper *helper;
@@ -62,7 +62,6 @@ __nf_ct_helper_find(const struct nf_conntrack_tuple *tuple) }return NULL ; } -EXPORT_SYMBOL_GPL (__nf_ct_helper_find);struct nf_conntrack_helper *__nf_conntrack_helper_find_byname (const char *name)
@@ -94,6 +93,36 @@ struct nf_conn_help *nf_ct_helper_ext_add(struct nf_conn *ct, gfp_t gfp) }EXPORT_SYMBOL_GPL (nf_ct_helper_ext_add); +int __nf_ct_set_helper (struct nf_conn *ct,gfp_t flags) +{ +int ret =0 ; +struct nf_conntrack_helper *helper; +struct nf_conn_help *help =nfct_help (ct); + + helper =__nf_ct_helper_find (&ct->tuplehash[IP_CT_DIR_REPLY ].tuple); +if (helper ==NULL ) { +if (help) +rcu_assign_pointer (help->helper,NULL ); + ret = -ENOENT ; + goto out; + } + +if (help ==NULL ) { + help =nf_ct_helper_ext_add (ct, flags); +if (help ==NULL ) { + ret = -ENOMEM ; + goto out; + } + }else { +memset (&help->help,0 ,sizeof (help->help)); + } + +rcu_assign_pointer (help->helper, helper); +out: +return ret; +} +EXPORT_SYMBOL_GPL (__nf_ct_set_helper); +static inline int unhelp (struct nf_conntrack_tuple_hash *i,const struct nf_conntrack_helper *me) {
net/netfilter/nf_conntrack_netlink.c +61 -9
92 lines not on this page · raw message
net/netfilter/nfnetlink.c +2 -1
@@ -165,7 +165,8 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) }else return -EINVAL ; -return nc->call (nfnl, skb, nlh, cda); +while ((err = nc->call (nfnl, skb, nlh, cda)) == -EAGAIN ); +return err; } }
Re: [PATCH 3/8] [PATCH] Helper modules load-on-demand support for ctnetlink
Quoted 9 lines · Pablo Neira Ayuso
This patch adds module loading for helpers via ctnetlink.
* Creation path: We support explicit and implicit helper assignation. For the explicit case, we try to load the module. If the module is correctly loaded and the helper is present, we return EAGAIN to re-start the creation. Otherwise, we return EOPNOTSUPP.
* Update path: release the spin lock, load the module and check. If it is present, then return EAGAIN to re-start the update.
Quoted 6 lines
This patch includes a minor change in nfnetlink to support EAGAIN. Based on a suggestion from Patrick McHardy.
This patch provides a refactorized function to lookup-and-set the connection tracking helper. The function removes the exported symbol
__nf_ct_helper_findas it has not clients anymore.
This one doesn't apply:
patching file include/net/netfilter/nf_conntrack_helper.h
patching file net/netfilter/nf_conntrack_core.c
Hunk #1 FAILED at 581.
Hunk #2 succeeded at 753 (offset -5 lines).
Hunk #3 succeeded at 764 (offset -5 lines).
1 out of 3 hunks FAILED -- saving rejects to file net/netfilter/nf_conntrack_core.c.rej patching file net/netfilter/nf_conntrack_helper.c
patching file net/netfilter/nf_conntrack_netlink.c
Hunk #2 succeeded at 1131 with fuzz 1.
patching file net/netfilter/nfnetlink.c
include/net/netfilter/nf_conntrack_helper.h extern void nf_conntrack_helper_unregister(struct nf_conntrack_helper *); · line 57
Quoted 7 lines
include/net/netfilter/nf_conntrack_helper.h +7
-0+static inline int nf_ct_set_helper (struct nf_conn *ct,gfp_t flags) +{ +int ret; + +rcu_read_lock (); + ret =__nf_ct_set_helper (ct, flags); +rcu_read_unlock ();
Its a bit confusing to use rcu_read_lock for a function called _set_something, I would suggest to just do the rcu_read_lock in that function itself.
Quoted 6 lines
net/netfilter/nf_conntrack_netlink.c +0
-0@@ -952,8 +952,22 @@ ctnetlink_change_helper(struct nf_conn *ct, struct nlattr *cda[]) }
net/netfilter/nf_conntrack_netlink.c ctnetlink_change_helper(struct nf_conn *ct, struct nlattr *cda[]) · line 961
Quoted 10 lines
net/netfilter/nf_conntrack_netlink.c +7
-1helper =__nf_conntrack_helper_find_byname (helpname); -if (helper ==NULL ) +if (helper ==NULL ) { +#ifdef CONFIG_KMOD +spin_unlock_bh (&nf_conntrack_lock); + +if (request_module ("nfct-helper-%s" , helpname) <0 ) { +spin_lock_bh (&nf_conntrack_lock); +return -EOPNOTSUPP ;
EOPNOTSUPP doesn't seem wrong, but we usually use ENOENT for lookup failures. It also needs to drop the nfnl_lock for request_module().
net/netfilter/nfnetlink.c static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) · line 168
Quoted 10 lines
net/netfilter/nfnetlink.c +1
-1@@ -165,7 +165,8 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) }else return -EINVAL ; -return nc->call (nfnl, skb, nlh, cda); +while ((err = nc->call (nfnl, skb, nlh, cda)) == -EAGAIN );
Ughh no hiding of ";" please :) With dropping nfnl_lock() in ctnetlink, this needs to do the get_subsys() and find_client() again anyways since both are protected by that lock.
I have this patch in my nftables tree:
@@ -132,6 +140,7 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
return 0;
type = nlh->nlmsg_type;
+replay:
ss = nfnetlink_get_subsys(type);
if (!ss) {
#ifdef CONFIG_KMOD
@@ -165,7 +174,10 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
} else
return -EINVAL;- return nc->call(nfnl, skb, nlh, cda);
+ err = nc->call(nfnl, skb, nlh, cda);
+ if (err == -EAGAIN)
+ goto replay;
+ return err;
}}
Re: [PATCH 3/8] [PATCH] Helper modules load-on-demand support for ctnetlink
Quoted 12 lines · Patrick McHardy
This one doesn't apply:
patching file
include/net/netfilter/nf_conntrack_helper.h
patching filenet/netfilter/nf_conntrack_core.c
Hunk #1 FAILED at 581.
Hunk #2 succeeded at 753 (offset -5 lines).
Hunk #3 succeeded at 764 (offset -5 lines).
1 out of 3 hunks FAILED -- saving rejects to filenet/netfilter/nf_conntrack_core.c.rejpatching filenet/netfilter/nf_conntrack_helper.c
patching filenet/netfilter/nf_conntrack_netlink.c
Hunk #2 succeeded at 1131 with fuzz 1.
patching filenet/netfilter/nfnetlink.c
Oops, I think I didn't refresh my tree, so it didn't include any of the netfilter patches I sent to Dave :)
The remaining issues, especially the nfnl_lock think, should be fixed though.
Pablo Neira Ayuso
maintainerRe: [PATCH 3/8] [PATCH] Helper modules load-on-demand support for ctnetlink
Quoted 15 lines · Patrick McHardy
Quoted 13 lines · Patrick McHardy
This one doesn't apply:
patching file
include/net/netfilter/nf_conntrack_helper.hpatching filenet/netfilter/nf_conntrack_core.cHunk #1 FAILED at 581.
Hunk #2 succeeded at 753 (offset -5 lines).
Hunk #3 succeeded at 764 (offset -5 lines).
1 out of 3 hunks FAILED -- saving rejects to filenet/netfilter/nf_conntrack_core.c.rej
patching filenet/netfilter/nf_conntrack_helper.cpatching filenet/netfilter/nf_conntrack_netlink.cHunk #2 succeeded at 1131 with fuzz 1.
patching filenet/netfilter/nfnetlink.c
Quoted 2 lines
Oops, I think I didn't refresh my tree, so it didn't include any of the netfilter patches I sent to Dave :)
So, what do I have to do now? I'm cloning Dave's tree now to put the patches on top on it. Fine with it?
Quoted 2 lines
The remaining issues, especially the
nfnl_lockthink, should be fixed though.
OK. BTW, returning EOPNOTSUPP looks better to me. ENOENT is misleading since the user won't be able to differenciate between "I don't know anything about that helper" and "this conntrack entry does not exist". So, I prefer using EOPNOTSUPP.
Signature · 1 line
"Los honestos son inadaptados sociales" -- Les Luthiers
Re: [PATCH 3/8] [PATCH] Helper modules load-on-demand support for ctnetlink
Quoted 15 lines · Pablo Neira Ayuso
Quoted 14 lines · Patrick McHardy
Quoted 13 lines · Patrick McHardy
This one doesn't apply:
patching file
include/net/netfilter/nf_conntrack_helper.hpatching filenet/netfilter/nf_conntrack_core.cHunk #1 FAILED at 581.
Hunk #2 succeeded at 753 (offset -5 lines).
Hunk #3 succeeded at 764 (offset -5 lines).
1 out of 3 hunks FAILED -- saving rejects to filenet/netfilter/nf_conntrack_core.c.rej
patching filenet/netfilter/nf_conntrack_helper.cpatching filenet/netfilter/nf_conntrack_netlink.cHunk #2 succeeded at 1131 with fuzz 1.
patching filenet/netfilter/nfnetlink.c
Quoted 5 lines
Quoted 2 lines
Oops, I think I didn't refresh my tree, so it didn't include any of the netfilter patches I sent to Dave :)
So, what do I have to do now? I'm cloning Dave's tree now to put the patches on top on it. Fine with it?
I think it was my mistake, let me try again ... yes, it applies cleanly. Both Dave's tree or my tree should work, but use Dave's if you want to be safe since I haven't updated mine yet.
Quoted 7 lines
Quoted 2 lines
The remaining issues, especially the
nfnl_lockthink, should be fixed though.OK. BTW, returning EOPNOTSUPP looks better to me. ENOENT is misleading since the user won't be able to differenciate between "I don't know anything about that helper" and "this conntrack entry does not exist". So, I prefer using EOPNOTSUPP.
Makes sense.
Pablo Neira Ayuso
maintainerRe: [PATCH 3/8] [PATCH] Helper modules load-on-demand support for ctnetlink
Quoted 19 lines · Patrick McHardy
Quoted 18 lines · Pablo Neira Ayuso
Quoted 16 lines · Patrick McHardy
Quoted 13 lines · Patrick McHardy
This one doesn't apply:
patching file
include/net/netfilter/nf_conntrack_helper.hpatching filenet/netfilter/nf_conntrack_core.cHunk #1 FAILED at 581.
Hunk #2 succeeded at 753 (offset -5 lines).
Hunk #3 succeeded at 764 (offset -5 lines).
1 out of 3 hunks FAILED -- saving rejects to filenet/netfilter/nf_conntrack_core.c.rej
patching filenet/netfilter/nf_conntrack_helper.cpatching filenet/netfilter/nf_conntrack_netlink.cHunk #2 succeeded at 1131 with fuzz 1.
patching filenet/netfilter/nfnetlink.cOops, I think I didn't refresh my tree, so it didn't include any of the netfilter patches I sent to Dave :)
Quoted 6 lines
Quoted 2 lines
So, what do I have to do now? I'm cloning Dave's tree now to put the patches on top on it. Fine with it?
I think it was my mistake, let me try again ... yes, it applies cleanly. Both Dave's tree or my tree should work, but use Dave's if you want to be safe since I haven't updated mine yet.
OK, attached the new version of the patch.
Signature · 1 line
"Los honestos son inadaptados sociales" -- Les Luthiers
[PATCH] Helper modules load-on-demand support for ctnetlink
From: Pablo Neira Ayuso <[email protected]>
This patch adds module loading for helpers via ctnetlink.
* Creation path: We support explicit and implicit helper assignation. For the explicit case, we try to load the module. If the module is correctly loaded and the helper is present, we return EAGAIN to re-start the creation. Otherwise, we return EOPNOTSUPP.
* Update path: release the spin lock, load the module and check. If it is present, then return EAGAIN to re-start the update.
This patch includes a minor change in nfnetlink to support EAGAIN. Based on a suggestion from Patrick McHardy.
This patch provides a refactorized function to lookup-and-set the connection tracking helper. The function removes the exported symbol __nf_ct_helper_find as it has not clients anymore.
---
include/linux/netfilter/nfnetlink.h | 3 + include/net/netfilter/nf_conntrack_helper.h | 5 +- net/netfilter/nf_conntrack_core.c | 28 +--------- net/netfilter/nf_conntrack_helper.c | 33 +++++++++++- net/netfilter/nf_conntrack_netlink.c | 73 ++++++++++++++++++++++++--- net/netfilter/nfnetlink.c | 12 +++- 6 files changed, 111 insertions(+), 43 deletions(-)
include/linux/netfilter/nfnetlink.h +3 -0
@@ -78,6 +78,9 @@ extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, int echo);extern int nfnetlink_unicast (struct sk_buff *skb,u_int32_t pid,int flags); +extern void nfnl_lock (void ); +extern void nfnl_unlock (void ); +#define MODULE_ALIAS_NFNL_SUBSYS (subsys) \ MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys))
include/net/netfilter/nf_conntrack_helper.h +2 -3
@@ -39,9 +39,6 @@ struct nf_conntrack_helper };extern struct nf_conntrack_helper * -__nf_ct_helper_find (const struct nf_conntrack_tuple *tuple); - -extern struct nf_conntrack_helper *__nf_conntrack_helper_find_byname (const char *name);extern int nf_conntrack_helper_register (struct nf_conntrack_helper *);
@@ -49,6 +46,8 @@ extern void nf_conntrack_helper_unregister(struct nf_conntrack_helper *);extern struct nf_conn_help *nf_ct_helper_ext_add (struct nf_conn *ct,gfp_t gfp); +extern int __nf_ct_set_helper (struct nf_conn *ct,gfp_t flags); +static inline struct nf_conn_help *nfct_help (const struct nf_conn *ct) {return nf_ct_ext_find (ct,NF_CT_EXT_HELPER );
net/netfilter/nf_conntrack_core.c +2 -26
@@ -581,14 +581,7 @@ init_conntrack(struct net *net,nf_conntrack_get (&ct->master->ct_general);NF_CT_STAT_INC (net, expect_new); }else { -struct nf_conntrack_helper *helper; - - helper =__nf_ct_helper_find (&repl_tuple); -if (helper) { - help =nf_ct_helper_ext_add (ct,GFP_ATOMIC ); -if (help) -rcu_assign_pointer (help->helper, helper); - } +__nf_ct_set_helper (ct,GFP_ATOMIC );NF_CT_STAT_INC (net, new); }
@@ -765,7 +758,6 @@ void nf_conntrack_alter_reply(struct nf_conn *ct, const struct nf_conntrack_tuple *newreply) {struct nf_conn_help *help =nfct_help (ct); -struct nf_conntrack_helper *helper;/* Should be unconfirmed, so not in hash table yet */ NF_CT_ASSERT (!nf_ct_is_confirmed (ct));
@@ -778,23 +770,7 @@ void nf_conntrack_alter_reply(struct nf_conn *ct,return ;rcu_read_lock (); - helper =__nf_ct_helper_find (newreply); -if (helper ==NULL ) { -if (help) -rcu_assign_pointer (help->helper,NULL ); - goto out; - } - -if (help ==NULL ) { - help =nf_ct_helper_ext_add (ct,GFP_ATOMIC ); -if (help ==NULL ) - goto out; - }else { -memset (&help->help,0 ,sizeof (help->help)); - } - -rcu_assign_pointer (help->helper, helper); -out: +__nf_ct_set_helper (ct,GFP_ATOMIC );rcu_read_unlock (); }EXPORT_SYMBOL_GPL (nf_conntrack_alter_reply);
net/netfilter/nf_conntrack_helper.c +31 -2
@@ -44,7 +44,7 @@ static unsigned int helper_hash(const struct nf_conntrack_tuple *tuple) (__force __u16)tuple->src.u.all) % nf_ct_helper_hsize; } -struct nf_conntrack_helper * +static struct nf_conntrack_helper *__nf_ct_helper_find (const struct nf_conntrack_tuple *tuple) {struct nf_conntrack_helper *helper;
@@ -62,7 +62,6 @@ __nf_ct_helper_find(const struct nf_conntrack_tuple *tuple) }return NULL ; } -EXPORT_SYMBOL_GPL (__nf_ct_helper_find);struct nf_conntrack_helper *__nf_conntrack_helper_find_byname (const char *name)
@@ -94,6 +93,36 @@ struct nf_conn_help *nf_ct_helper_ext_add(struct nf_conn *ct, gfp_t gfp) }EXPORT_SYMBOL_GPL (nf_ct_helper_ext_add); +int __nf_ct_set_helper (struct nf_conn *ct,gfp_t flags) +{ +int ret =0 ; +struct nf_conntrack_helper *helper; +struct nf_conn_help *help =nfct_help (ct); + + helper =__nf_ct_helper_find (&ct->tuplehash[IP_CT_DIR_REPLY ].tuple); +if (helper ==NULL ) { +if (help) +rcu_assign_pointer (help->helper,NULL ); + ret = -ENOENT ; + goto out; + } + +if (help ==NULL ) { + help =nf_ct_helper_ext_add (ct, flags); +if (help ==NULL ) { + ret = -ENOMEM ; + goto out; + } + }else { +memset (&help->help,0 ,sizeof (help->help)); + } + +rcu_assign_pointer (help->helper, helper); +out: +return ret; +} +EXPORT_SYMBOL_GPL (__nf_ct_set_helper); +static inline int unhelp (struct nf_conntrack_tuple_hash *i,const struct nf_conntrack_helper *me) {
net/netfilter/nf_conntrack_netlink.c +64 -9
95 lines not on this page · raw message
net/netfilter/nfnetlink.c +9 -3
@@ -44,15 +44,17 @@ static struct sock *nfnl = NULL;static const struct nfnetlink_subsystem *subsys_table[NFNL_SUBSYS_COUNT ];static DEFINE_MUTEX (nfnl_mutex); -static inline void nfnl_lock (void ) +void nfnl_lock (void ) {mutex_lock (&nfnl_mutex); } +EXPORT_SYMBOL_GPL (nfnl_lock); -static inline void nfnl_unlock (void ) +void nfnl_unlock (void ) {mutex_unlock (&nfnl_mutex); } +EXPORT_SYMBOL_GPL (nfnl_unlock);int nfnetlink_subsys_register (const struct nfnetlink_subsystem *n) {
@@ -132,6 +134,7 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)return 0 ; type = nlh->nlmsg_type; +replay: ss =nfnetlink_get_subsys (type);if (!ss) {#ifdef CONFIG_KMOD
@@ -165,7 +168,10 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) }else return -EINVAL ; -return nc->call (nfnl, skb, nlh, cda); + err = nc->call (nfnl, skb, nlh, cda); +if (err == -EAGAIN ) + goto replay; +return err; } }
Pablo Neira Ayuso
maintainerPATCH 4/8 use EOPNOTSUPP instead of EINVAL if the conntrack has no helper
In reply to Pablo Neira AyusoThis patch changes the return value if the conntrack has no helper assigned. Instead of EINVAL, which is reserved for malformed messages, it returns EOPNOTSUPP.
---
net/netfilter/nf_conntrack_netlink.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/netfilter/nf_conntrack_netlink.c +1 -1
@@ -1729,7 +1729,7 @@ ctnetlink_create_expect(struct nlattr *cda[], u_int8_t u3)if (!help || !help->helper) {/* such conntrack hasn't got any helper, abort */ - err = -EINVAL ; + err = -EOPNOTSUPP ; goto out; }
Patrick McHardy
AppliedRe: [PATCH 4/8] [PATCH] use EOPNOTSUPP instead of EINVAL if the conntrack has no helper
Quoted 3 lines · Pablo Neira Ayuso
This patch changes the return value if the conntrack has no helper assigned. Instead of EINVAL, which is reserved for malformed messages, it returns EOPNOTSUPP.
Applied, thanks.
Pablo Neira Ayuso
maintainerPATCH 5/8 deliver events for conntracks created via ctnetlink
In reply to Pablo Neira AyusoAs for now, the creation and update of conntracks via ctnetlink do not propagate an event to userspace. This can result in inconsistent situations if several userspace processes modify the connection tracking table by means of ctnetlink at the same time. Specifically, using the conntrack command line tool and conntrackd at the same time can trigger unconsistencies.
This patch also modifies the event cache infrastructure to pass the process PID and the ECHO flag to nfnetlink_send() to report back to userspace if the process that triggered the change needs so. Based on a suggestion from Patrick McHardy.
---
include/net/netfilter/nf_conntrack.h | 2 - include/net/netfilter/nf_conntrack_ecache.h | 59 +++++++++++++++++- include/net/netfilter/nf_conntrack_expect.h | 2 + net/netfilter/nf_conntrack_core.c | 29 ++++++++- net/netfilter/nf_conntrack_ecache.c | 14 +++- net/netfilter/nf_conntrack_expect.c | 43 +++++++++++-- net/netfilter/nf_conntrack_netlink.c | 88 ++++++++++++++++++++++----- 7 files changed, 203 insertions(+), 34 deletions(-)
include/net/netfilter/nf_conntrack.h +1 -1
@@ -199,7 +199,7 @@ __nf_conntrack_find(struct net *net, const struct nf_conntrack_tuple *tuple);extern void nf_conntrack_hash_insert (struct nf_conn *ct); -extern void nf_conntrack_flush (struct net *net); +extern void nf_conntrack_flush (struct net *net,u32 pid,int report); extern bool nf_ct_get_tuplepr(const struct sk_buff *skb, unsigned int nhoff, u_int16_t l3num,
include/net/netfilter/nf_conntrack_ecache.h +55 -4
92 lines not on this page · raw message
include/net/netfilter/nf_conntrack_expect.h +2 -0
@@ -100,6 +100,8 @@ void nf_ct_expect_init(struct nf_conntrack_expect *, unsigned int, u_int8_t, u_int8_t, const __be16 *, const __be16 *);void nf_ct_expect_put (struct nf_conntrack_expect *exp);int nf_ct_expect_related (struct nf_conntrack_expect *expect); +int nf_ct_expect_related_report (struct nf_conntrack_expect *expect, +u32 pid,int report);#endif /*_NF_CONNTRACK_EXPECT_H*/
net/netfilter/nf_conntrack_core.c +25 -4
@@ -174,7 +174,8 @@ destroy_conntrack(struct nf_conntrack *nfct)NF_CT_ASSERT (atomic_read (&nfct->use) ==0 );NF_CT_ASSERT (!timer_pending (&ct->timeout)); -nf_conntrack_event (IPCT_DESTROY , ct); +if (!test_bit (IPS_DYING_BIT , &ct->status)) +nf_conntrack_event (IPCT_DESTROY , ct);set_bit (IPS_DYING_BIT , &ct->status);/* To make sure we don't get any weird locking issues here:
@@ -963,8 +964,24 @@ void nf_ct_iterate_cleanup(struct net *net, }EXPORT_SYMBOL_GPL (nf_ct_iterate_cleanup); +struct __nf_ct_flush_report { +u32 pid; +int report; +}; +static int kill_all (struct nf_conn *i,void *data) { +struct __nf_ct_flush_report *fr = (struct __nf_ct_flush_report *)data; + +if (!fr->report) +return 1 ; + +/* get_next_corpse sets the dying bit for us */ +nf_conntrack_event_report (IPCT_DESTROY , + i, + fr->pid, + fr->report); +return 1 ; }
@@ -978,9 +995,13 @@ void nf_ct_free_hashtable(struct hlist_head *hash, int vmalloced, unsigned int s }EXPORT_SYMBOL_GPL (nf_ct_free_hashtable); -void nf_conntrack_flush (struct net *net) +void nf_conntrack_flush (struct net *net,u32 pid,int report) { -nf_ct_iterate_cleanup (net, kill_all,NULL ); +struct __nf_ct_flush_report fr = { + .pid = pid, + .report = report, + }; +nf_ct_iterate_cleanup (net, kill_all, &fr); }EXPORT_SYMBOL_GPL (nf_conntrack_flush);
@@ -996,7 +1017,7 @@ static void nf_conntrack_cleanup_net(struct net *net)nf_ct_event_cache_flush (net);nf_conntrack_ecache_fini (net); i_see_dead_people: -nf_conntrack_flush (net); +nf_conntrack_flush (net,0 ,0 );if (atomic_read (&net->ct.count) !=0 ) {schedule (); goto i_see_dead_people;
net/netfilter/nf_conntrack_ecache.c +11 -3
@@ -35,9 +35,17 @@ static inline void __nf_ct_deliver_cached_events(struct nf_conntrack_ecache *ecache) {if (nf_ct_is_confirmed (ecache->ct) && !nf_ct_is_dying (ecache->ct) - && ecache->events) -atomic_notifier_call_chain (&nf_conntrack_chain, ecache->events, - ecache->ct); + && ecache->events) { +struct nf_ct_event item = { + .ct = ecache->ct, + .pid =0 , + .report =0 + }; + +atomic_notifier_call_chain (&nf_conntrack_chain, + ecache->events, + &item); + } ecache->events =0 ;nf_ct_put (ecache->ct);
net/netfilter/nf_conntrack_expect.c +36 -7
72 lines not on this page · raw message
net/netfilter/nf_conntrack_netlink.c +73 -15
191 lines not on this page · raw message
Re: [PATCH 5/8] [PATCH] deliver events for conntracks created via ctnetlink
Quoted 10 lines · Pablo Neira Ayuso
As for now, the creation and update of conntracks via ctnetlink do not propagate an event to userspace. This can result in inconsistent situations if several userspace processes modify the connection tracking table by means of ctnetlink at the same time. Specifically, using the conntrack command line tool and conntrackd at the same time can trigger unconsistencies.
This patch also modifies the event cache infrastructure to pass the process PID and the ECHO flag to
nfnetlink_send()to report back to userspace if the process that triggered the change needs so. Based on a suggestion from Patrick McHardy.
Looks pretty good, some minor issues:
- there are quite a lot of trailing whitespaces in this patch, please remove those.
include/net/netfilter/nf_conntrack_ecache.h struct nf_conntrack_ecache { · line 25
Quoted 6 lines
include/net/netfilter/nf_conntrack_ecache.h +6
-0+/* This structure is passed to event handler */ +struct nf_ct_event { +struct nf_conn *ct; +u32 pid; +int report; +};
Just a suggestion: passing the nlmsghdr instead of the ECHO flag and doing the approriate handling in the event functions seems more logical to me. I think I know why you did it this way (no reporting on unload, no netlink context there), see below about that.
net/netfilter/nf_conntrack_core.c destroy_conntrack(struct nf_conntrack *nfct) · line 178
Quoted 11 lines
net/netfilter/nf_conntrack_core.c +2
-1@@ -174,7 +174,8 @@ destroy_conntrack(struct nf_conntrack *nfct)NF_CT_ASSERT (atomic_read (&nfct->use) ==0 );NF_CT_ASSERT (!timer_pending (&ct->timeout)); -nf_conntrack_event (IPCT_DESTROY , ct); +if (!test_bit (IPS_DYING_BIT , &ct->status)) +nf_conntrack_event (IPCT_DESTROY , ct);
Whats the idea behind this change? Is it simply an optimization?
Quoted 8 lines
net/netfilter/nf_conntrack_core.c +1
-0set_bit (IPS_DYING_BIT , &ct->status);/* To make sure we don't get any weird locking issues here: @@ -963,8 +964,24 @@ void nf_ct_iterate_cleanup(struct net *net, }EXPORT_SYMBOL_GPL (nf_ct_iterate_cleanup); +struct __nf_ct_flush_report {
net/netfilter/nf_conntrack_core.c void nf_ct_iterate_cleanup(struct net *net, · line 977
Quoted 10 lines
net/netfilter/nf_conntrack_core.c +8
-0+u32 pid; +int report; +}; +static int kill_all (struct nf_conn *i,void *data) { +struct __nf_ct_flush_report *fr = (struct __nf_ct_flush_report *)data; + +if (!fr->report) +return 1 ;
Whats the reasoning behind not reporting destroy events on unload? I don't think there's anything special about module unload, so it seems inconsistent.
Pablo Neira Ayuso
maintainerRe: [PATCH 5/8] [PATCH] deliver events for conntracks created via ctnetlink
Quoted 4 lines · Patrick McHardy
Looks pretty good, some minor issues:
- there are quite a lot of trailing whitespaces in this patch, please remove those.
I have added a tweak for vim to remove them automatically when I write the file, so this should not happen anymore. BTW, does git complain on this by default when I apply one patch or I have to tweak something?
Quoted 4 lines
Quoted 4 lines
include/net/netfilter/nf_conntrack_ecache.h +4
-0+/* This structure is passed to event handler */ +struct nf_ct_event { +struct nf_conn *ct; +u32 pid;
Quoted 8 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ int report; +};Just a suggestion: passing the nlmsghdr instead of the ECHO flag and doing the approriate handling in the event functions seems more logical to me. I think I know why you did it this way (no reporting on unload, no netlink context there), see below about that.
Indeed.
Quoted 9 lines
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-0@@ -174,7 +174,8 @@ destroy_conntrack(struct nf_conntrack *nfct)NF_CT_ASSERT (atomic_read (&nfct->use) ==0 );NF_CT_ASSERT (!timer_pending (&ct->timeout));
Quoted 5 lines
net/netfilter/nf_conntrack_core.c destroy_conntrack(struct nf_conntrack *nfct) · line 178
Quoted 3 lines
net/netfilter/nf_conntrack_core.c +2
-1-nf_conntrack_event (IPCT_DESTROY , ct); +if (!test_bit (IPS_DYING_BIT , &ct->status)) +nf_conntrack_event (IPCT_DESTROY , ct);Whats the idea behind this change? Is it simply an optimization?
If we remove a conntrack entry via ctnetlink, we get the event report twice, one from ctnetlink and another one from death_by_timeout, so we set the dying bit in ctnetlink to avoid this double reporting in death_by_timeout. This idea is actually yours :)
Quoted 7 lines
Quoted 7 lines
net/netfilter/nf_conntrack_core.c +0
-0set_bit (IPS_DYING_BIT , &ct->status);/* To make sure we don't get any weird locking issues here: @@ -963,8 +964,24 @@ void nf_ct_iterate_cleanup(struct net *net, }EXPORT_SYMBOL_GPL (nf_ct_iterate_cleanup);
Quoted 16 lines
net/netfilter/nf_conntrack_core.c void nf_ct_iterate_cleanup(struct net *net, · line 977
Quoted 12 lines
net/netfilter/nf_conntrack_core.c +9
-0+struct __nf_ct_flush_report { +u32 pid; +int report; +}; +static int kill_all (struct nf_conn *i,void *data) { +struct __nf_ct_flush_report *fr = (struct __nf_ct_flush_report *)data; + +if (!fr->report) +return 1 ;Whats the reasoning behind not reporting destroy events on unload? I don't think there's anything special about module unload, so it seems inconsistent.
OK, I'll fix this. I'm going to prepare another patch round to cover this issues.
Signature · 1 line
"Los honestos son inadaptados sociales" -- Les Luthiers
Re: [PATCH 5/8] [PATCH] deliver events for conntracks created via ctnetlink
Quoted 9 lines · Pablo Neira Ayuso
Quoted 4 lines · Patrick McHardy
Looks pretty good, some minor issues:
- there are quite a lot of trailing whitespaces in this patch, please remove those.
I have added a tweak for vim to remove them automatically when I write the file, so this should not happen anymore. BTW, does git complain on this by default when I apply one patch or I have to tweak something?
I think it only does when importing a patch, not when doing commits.
Quoted 28 lines
Quoted 11 lines
include/net/netfilter/nf_conntrack_ecache.h struct nf_conntrack_ecache { · line 25
Quoted 6 lines
include/net/netfilter/nf_conntrack_ecache.h +6
-0+/* This structure is passed to event handler */ +struct nf_ct_event { +struct nf_conn *ct; +u32 pid; +int report; +};Just a suggestion: passing the nlmsghdr instead of the ECHO flag and doing the approriate handling in the event functions seems more logical to me. I think I know why you did it this way (no reporting on unload, no netlink context there), see below about that.
Indeed.
Quoted 9 lines
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-0@@ -174,7 +174,8 @@ destroy_conntrack(struct nf_conntrack *nfct)NF_CT_ASSERT (atomic_read (&nfct->use) ==0 );NF_CT_ASSERT (!timer_pending (&ct->timeout));Quoted 4 lines
net/netfilter/nf_conntrack_core.c destroy_conntrack(struct nf_conntrack *nfct) · line 178
Quoted 3 lines
net/netfilter/nf_conntrack_core.c +2
-1-nf_conntrack_event (IPCT_DESTROY , ct); +if (!test_bit (IPS_DYING_BIT , &ct->status)) +nf_conntrack_event (IPCT_DESTROY , ct);Whats the idea behind this change? Is it simply an optimization?
Quoted 4 lines
If we remove a conntrack entry via ctnetlink, we get the event report twice, one from ctnetlink and another one from
death_by_timeout, so we set the dying bit in ctnetlink to avoid this double reporting indeath_by_timeout. This idea is actually yours :)
I see, thanks for the explanation :)
Quoted 11 lines
Quoted 8 lines
net/netfilter/nf_conntrack_core.c void nf_ct_iterate_cleanup(struct net *net, · line 977
Quoted 5 lines
net/netfilter/nf_conntrack_core.c +4
-0+struct __nf_ct_flush_report *fr = (struct __nf_ct_flush_report *)data; + +if (!fr->report) +return 1 ;Whats the reasoning behind not reporting destroy events on unload? I don't think there's anything special about module unload, so it seems inconsistent.
OK, I'll fix this. I'm going to prepare another patch round to cover this issues.
Unfortunately the networking merge window is closed already.
The NAT decoupling qualifies as a bugfix in my opinion and we can get that one in, the others unfortunately will have to wait.
Pablo Neira Ayuso
maintainerPATCH 6/8 bump the expectation helper name
In reply to Pablo Neira AyusoInclude the expectation helper name at expectation dumping.
---
net/netfilter/nf_conntrack_netlink.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
net/netfilter/nf_conntrack_netlink.c +9 -0
@@ -1443,6 +1443,7 @@ ctnetlink_exp_dump_expect(struct sk_buff *skb, const struct nf_conntrack_expect *exp) {struct nf_conn *master = exp->master; +struct nf_conn_help *help =nfct_help (master);long timeout = (exp->timeout.expires - jiffies) /HZ ;if (timeout <0 )
@@ -1460,6 +1461,14 @@ ctnetlink_exp_dump_expect(struct sk_buff *skb,NLA_PUT_BE32 (skb,CTA_EXPECT_TIMEOUT ,htonl (timeout));NLA_PUT_BE32 (skb,CTA_EXPECT_ID ,htonl ((unsigned long )exp)); +if (help) { +struct nf_conntrack_helper *helper; + + helper =rcu_dereference (help->helper); +if (helper) +NLA_PUT_STRING (skb,CTA_EXPECT_HELP_NAME , helper->name); + } +return 0 ; nla_put_failure:
Pablo Neira Ayuso
maintainerPATCH 7/8 dynamic calculation of event message size for ctnetlink
In reply to Pablo Neira AyusoThis patch adds dynamic message size calculation for ctnetlink. This reduces CPU consumption since the overhead in the message trimming is removed.
Based on a suggestion from Patrick McHardy.
---
include/net/netfilter/nf_conntrack_l3proto.h | 2 include/net/netfilter/nf_conntrack_l4proto.h | 3 + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 8 ++ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 6 + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 8 ++ net/netfilter/nf_conntrack_core.c | 6 + net/netfilter/nf_conntrack_netlink.c | 103 ++++++++++++++++++++++++ net/netfilter/nf_conntrack_proto_dccp.c | 10 ++ net/netfilter/nf_conntrack_proto_gre.c | 1 net/netfilter/nf_conntrack_proto_sctp.c | 12 +++ net/netfilter/nf_conntrack_proto_tcp.c | 14 +++ net/netfilter/nf_conntrack_proto_udp.c | 2 net/netfilter/nf_conntrack_proto_udplite.c | 2 14 files changed, 182 insertions(+), 1 deletions(-)
include/net/netfilter/nf_conntrack_l3proto.h +2 -0
@@ -55,6 +55,8 @@ struct nf_conntrack_l3protoint (*nlattr_to_tuple)(struct nlattr *tb[],struct nf_conntrack_tuple *t); + +size_t (*nlattr_size)(void );const struct nla_policy *nla_policy;#ifdef CONFIG_SYSCTL
include/net/netfilter/nf_conntrack_l4proto.h +3 -0
@@ -72,6 +72,8 @@ struct nf_conntrack_l4proto const struct nf_conntrack_tuple *t);int (*nlattr_to_tuple)(struct nlattr *tb[],struct nf_conntrack_tuple *t); +size_t (*nlattr_size)(void ); +size_t (*nlattr_protoinfo_size)(void );const struct nla_policy *nla_policy;#ifdef CONFIG_SYSCTL
@@ -115,6 +117,7 @@ extern int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb, const struct nf_conntrack_tuple *tuple);extern int nf_ct_port_nlattr_to_tuple (struct nlattr *tb[],struct nf_conntrack_tuple *t); +extern size_t nf_ct_port_nlattr_size (void );extern const struct nla_policy nf_ct_port_nla_policy[];#ifdef CONFIG_SYSCTL
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +6 -0
@@ -330,6 +330,11 @@ static int ipv4_nlattr_to_tuple(struct nlattr *tb[],return 0 ; } + +static size_t ipv4_nlattr_size (void ) +{ +return nla_total_size (sizeof (u_int32_t))*2 ; +}#endif static struct nf_sockopt_ops so_getorigdst = {
@@ -350,6 +355,7 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = {#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = ipv4_tuple_to_nlattr, .nlattr_to_tuple = ipv4_nlattr_to_tuple, + .nlattr_size = ipv4_nlattr_size, .nla_policy = ipv4_nla_policy,#endif #if defined(CONFIG_SYSCTL ) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT )
net/ipv4/netfilter/nf_conntrack_proto_icmp.c +8 -0
@@ -262,6 +262,13 @@ static int icmp_nlattr_to_tuple(struct nlattr *tb[], return 0; } + +static size_t icmp_nlattr_size (void ) +{ +return nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (u_int16_t)); +}#endif #ifdef CONFIG_SYSCTL
@@ -310,6 +317,7 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly =#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = icmp_tuple_to_nlattr, .nlattr_to_tuple = icmp_nlattr_to_tuple, + .nlattr_size = icmp_nlattr_size, .nla_policy = icmp_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +6 -0
@@ -342,6 +342,11 @@ static int ipv6_nlattr_to_tuple(struct nlattr *tb[],return 0 ; } + +static size_t ipv6_nlattr_size (void ) +{ +return nla_total_size (sizeof (u_int32_t)*4 )*2 ; +}#endif struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6__read_mostly = {
@@ -354,6 +359,7 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 __read_mostly = {#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = ipv6_tuple_to_nlattr, .nlattr_to_tuple = ipv6_nlattr_to_tuple, + .nlattr_size = ipv6_nlattr_size, .nla_policy = ipv6_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c +8 -0
@@ -243,6 +243,13 @@ static int icmpv6_nlattr_to_tuple(struct nlattr *tb[], return 0; } + +static size_t icmpv6_nlattr_size (void ) +{ +return nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (u_int16_t)); +}#endif #ifdef CONFIG_SYSCTL
@@ -275,6 +282,7 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 __read_mostly =#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = icmpv6_tuple_to_nlattr, .nlattr_to_tuple = icmpv6_nlattr_to_tuple, + .nlattr_size = icmpv6_nlattr_size, .nla_policy = icmpv6_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/netfilter/nf_conntrack_core.c +6 -0
@@ -895,6 +895,12 @@ int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[], return 0; }EXPORT_SYMBOL_GPL (nf_ct_port_nlattr_to_tuple); + +size_t nf_ct_port_nlattr_size (void ) +{ +return nla_total_size (sizeof (u_int16_t))*2 ; +} +EXPORT_SYMBOL_GPL (nf_ct_port_nlattr_size);#endif /* Used by ipt_REJECT and ip6t_REJECT. */
net/netfilter/nf_conntrack_netlink.c +102 -1
115 lines not on this page · raw message
net/netfilter/nf_conntrack_proto_dccp.c +10 -0
@@ -657,6 +657,12 @@ static int nlattr_to_dccp(struct nlattr *cda[], struct nf_conn *ct)write_unlock_bh (&dccp_lock); return 0; } + +static size_t dccp_nlattr_protoinfo_size (void ) +{ +return nla_total_size (0 )*2 +/* CTA_PROTOINFO */ +nla_total_size (sizeof (u_int8_t)); +}#endif #ifdef CONFIG_SYSCTL
@@ -749,6 +755,8 @@ static struct nf_conntrack_l4proto dccp_proto4 __read_mostly = { .from_nlattr = nlattr_to_dccp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, + .nlattr_protoinfo_size = dccp_nlattr_protoinfo_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
@@ -774,6 +782,8 @@ static struct nf_conntrack_l4proto dccp_proto6 __read_mostly = { .from_nlattr = nlattr_to_dccp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, + .nlattr_protoinfo_size = dccp_nlattr_protoinfo_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/netfilter/nf_conntrack_proto_gre.c +1 -0
@@ -294,6 +294,7 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 __read_mostly = {#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, .nla_policy = nf_ct_port_nla_policy,#endif };
net/netfilter/nf_conntrack_proto_sctp.c +12 -0
@@ -537,6 +537,14 @@ static int nlattr_to_sctp(struct nlattr *cda[], struct nf_conn *ct) return 0; } + +static size_t sctp_nlattr_protoinfo_size (void ) +{ +return nla_total_size (0 )*2 +/* CTA_PROTOINFO */ +nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (u_int32_t)) + +nla_total_size (sizeof (u_int32_t)); +}#endif #ifdef CONFIG_SYSCTL
@@ -671,6 +679,8 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp4 __read_mostly = { .from_nlattr = nlattr_to_sctp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, + .nlattr_protoinfo_size = sctp_nlattr_protoinfo_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
@@ -699,6 +709,8 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp6 __read_mostly = { .from_nlattr = nlattr_to_sctp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, + .nlattr_protoinfo_size = sctp_nlattr_protoinfo_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/netfilter/nf_conntrack_proto_tcp.c +14 -0
@@ -1181,6 +1181,16 @@ static int nlattr_to_tcp(struct nlattr *cda[], struct nf_conn *ct) return 0; } + +static size_t tcp_nlattr_protoinfo_size (void ) +{ +return nla_total_size (0 )*2 +/* CTA_PROTOINFO */ +nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (struct nf_ct_tcp_flags )) + +nla_total_size (sizeof (struct nf_ct_tcp_flags )); +}#endif #ifdef CONFIG_SYSCTL
@@ -1399,6 +1409,8 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4 __read_mostly = .from_nlattr = nlattr_to_tcp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, + .nlattr_protoinfo_size = tcp_nlattr_protoinfo_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
@@ -1429,6 +1441,8 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6 __read_mostly = .from_nlattr = nlattr_to_tcp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, + .nlattr_protoinfo_size = tcp_nlattr_protoinfo_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/netfilter/nf_conntrack_proto_udp.c +2 -0
@@ -193,6 +193,7 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4 __read_mostly =#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
@@ -220,6 +221,7 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6 __read_mostly =#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/netfilter/nf_conntrack_proto_udplite.c +2 -0
@@ -181,6 +181,7 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4 __read_mostly =#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
@@ -204,6 +205,7 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6 __read_mostly =#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
Pablo Neira Ayuso
maintainerRe: [PATCH 7/8] [PATCH] dynamic calculation of event message size for ctnetlink
Quoted 3 lines · Pablo Neira Ayuso
This patch adds dynamic message size calculation for ctnetlink. This reduces CPU consumption since the overhead in the message trimming is removed.
Please, take this patch instead. I just noticed one uninitilized variable in calculate_helper_room_size().
Signature · 1 line
"Los honestos son inadaptados sociales" -- Les Luthiers
[PATCH] dynamic calculation of event message size for ctnetlink
From: Pablo Neira Ayuso <[email protected]>
This patch adds dynamic message size calculation for ctnetlink. This reduces CPU consumption since the overhead in the message trimming is removed.
Based on a suggestion from Patrick McHardy.
---
include/net/netfilter/nf_conntrack_l3proto.h | 2 include/net/netfilter/nf_conntrack_l4proto.h | 3 + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 8 ++ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 6 + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 8 ++ net/netfilter/nf_conntrack_core.c | 6 + net/netfilter/nf_conntrack_netlink.c | 103 ++++++++++++++++++++++++ net/netfilter/nf_conntrack_proto_dccp.c | 10 ++ net/netfilter/nf_conntrack_proto_gre.c | 1 net/netfilter/nf_conntrack_proto_sctp.c | 12 +++ net/netfilter/nf_conntrack_proto_tcp.c | 14 +++ net/netfilter/nf_conntrack_proto_udp.c | 2 net/netfilter/nf_conntrack_proto_udplite.c | 2 14 files changed, 182 insertions(+), 1 deletions(-)
include/net/netfilter/nf_conntrack_l3proto.h +2 -0
@@ -55,6 +55,8 @@ struct nf_conntrack_l3protoint (*nlattr_to_tuple)(struct nlattr *tb[],struct nf_conntrack_tuple *t); + +size_t (*nlattr_size)(void );const struct nla_policy *nla_policy;#ifdef CONFIG_SYSCTL
include/net/netfilter/nf_conntrack_l4proto.h +3 -0
@@ -72,6 +72,8 @@ struct nf_conntrack_l4proto const struct nf_conntrack_tuple *t);int (*nlattr_to_tuple)(struct nlattr *tb[],struct nf_conntrack_tuple *t); +size_t (*nlattr_size)(void ); +size_t (*nlattr_protoinfo_size)(void );const struct nla_policy *nla_policy;#ifdef CONFIG_SYSCTL
@@ -115,6 +117,7 @@ extern int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb, const struct nf_conntrack_tuple *tuple);extern int nf_ct_port_nlattr_to_tuple (struct nlattr *tb[],struct nf_conntrack_tuple *t); +extern size_t nf_ct_port_nlattr_size (void );extern const struct nla_policy nf_ct_port_nla_policy[];#ifdef CONFIG_SYSCTL
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +6 -0
@@ -330,6 +330,11 @@ static int ipv4_nlattr_to_tuple(struct nlattr *tb[],return 0 ; } + +static size_t ipv4_nlattr_size (void ) +{ +return nla_total_size (sizeof (u_int32_t))*2 ; +}#endif static struct nf_sockopt_ops so_getorigdst = {
@@ -350,6 +355,7 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = {#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = ipv4_tuple_to_nlattr, .nlattr_to_tuple = ipv4_nlattr_to_tuple, + .nlattr_size = ipv4_nlattr_size, .nla_policy = ipv4_nla_policy,#endif #if defined(CONFIG_SYSCTL ) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT )
net/ipv4/netfilter/nf_conntrack_proto_icmp.c +8 -0
@@ -262,6 +262,13 @@ static int icmp_nlattr_to_tuple(struct nlattr *tb[], return 0; } + +static size_t icmp_nlattr_size (void ) +{ +return nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (u_int16_t)); +}#endif #ifdef CONFIG_SYSCTL
@@ -310,6 +317,7 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly =#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = icmp_tuple_to_nlattr, .nlattr_to_tuple = icmp_nlattr_to_tuple, + .nlattr_size = icmp_nlattr_size, .nla_policy = icmp_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +6 -0
@@ -342,6 +342,11 @@ static int ipv6_nlattr_to_tuple(struct nlattr *tb[],return 0 ; } + +static size_t ipv6_nlattr_size (void ) +{ +return nla_total_size (sizeof (u_int32_t)*4 )*2 ; +}#endif struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6__read_mostly = {
@@ -354,6 +359,7 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 __read_mostly = {#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = ipv6_tuple_to_nlattr, .nlattr_to_tuple = ipv6_nlattr_to_tuple, + .nlattr_size = ipv6_nlattr_size, .nla_policy = ipv6_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c +8 -0
@@ -243,6 +243,13 @@ static int icmpv6_nlattr_to_tuple(struct nlattr *tb[], return 0; } + +static size_t icmpv6_nlattr_size (void ) +{ +return nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (u_int16_t)); +}#endif #ifdef CONFIG_SYSCTL
@@ -275,6 +282,7 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 __read_mostly =#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = icmpv6_tuple_to_nlattr, .nlattr_to_tuple = icmpv6_nlattr_to_tuple, + .nlattr_size = icmpv6_nlattr_size, .nla_policy = icmpv6_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/netfilter/nf_conntrack_core.c +6 -0
@@ -897,6 +897,12 @@ int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[], return 0; }EXPORT_SYMBOL_GPL (nf_ct_port_nlattr_to_tuple); + +size_t nf_ct_port_nlattr_size (void ) +{ +return nla_total_size (sizeof (u_int16_t))*2 ; +} +EXPORT_SYMBOL_GPL (nf_ct_port_nlattr_size);#endif /* Used by ipt_REJECT and ip6t_REJECT. */
net/netfilter/nf_conntrack_netlink.c +102 -1
115 lines not on this page · raw message
net/netfilter/nf_conntrack_proto_dccp.c +10 -0
@@ -657,6 +657,12 @@ static int nlattr_to_dccp(struct nlattr *cda[], struct nf_conn *ct)write_unlock_bh (&dccp_lock); return 0; } + +static size_t dccp_nlattr_protoinfo_size (void ) +{ +return nla_total_size (0 )*2 +/* CTA_PROTOINFO */ +nla_total_size (sizeof (u_int8_t)); +}#endif #ifdef CONFIG_SYSCTL
@@ -749,6 +755,8 @@ static struct nf_conntrack_l4proto dccp_proto4 __read_mostly = { .from_nlattr = nlattr_to_dccp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, + .nlattr_protoinfo_size = dccp_nlattr_protoinfo_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
@@ -774,6 +782,8 @@ static struct nf_conntrack_l4proto dccp_proto6 __read_mostly = { .from_nlattr = nlattr_to_dccp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, + .nlattr_protoinfo_size = dccp_nlattr_protoinfo_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/netfilter/nf_conntrack_proto_gre.c +1 -0
@@ -294,6 +294,7 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 __read_mostly = {#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, .nla_policy = nf_ct_port_nla_policy,#endif };
net/netfilter/nf_conntrack_proto_sctp.c +12 -0
@@ -537,6 +537,14 @@ static int nlattr_to_sctp(struct nlattr *cda[], struct nf_conn *ct) return 0; } + +static size_t sctp_nlattr_protoinfo_size (void ) +{ +return nla_total_size (0 )*2 +/* CTA_PROTOINFO */ +nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (u_int32_t)) + +nla_total_size (sizeof (u_int32_t)); +}#endif #ifdef CONFIG_SYSCTL
@@ -671,6 +679,8 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp4 __read_mostly = { .from_nlattr = nlattr_to_sctp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, + .nlattr_protoinfo_size = sctp_nlattr_protoinfo_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
@@ -699,6 +709,8 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp6 __read_mostly = { .from_nlattr = nlattr_to_sctp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, + .nlattr_protoinfo_size = sctp_nlattr_protoinfo_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/netfilter/nf_conntrack_proto_tcp.c +14 -0
@@ -1181,6 +1181,16 @@ static int nlattr_to_tcp(struct nlattr *cda[], struct nf_conn *ct) return 0; } + +static size_t tcp_nlattr_protoinfo_size (void ) +{ +return nla_total_size (0 )*2 +/* CTA_PROTOINFO */ +nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (u_int8_t)) + +nla_total_size (sizeof (struct nf_ct_tcp_flags )) + +nla_total_size (sizeof (struct nf_ct_tcp_flags )); +}#endif #ifdef CONFIG_SYSCTL
@@ -1399,6 +1409,8 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4 __read_mostly = .from_nlattr = nlattr_to_tcp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, + .nlattr_protoinfo_size = tcp_nlattr_protoinfo_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
@@ -1429,6 +1441,8 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6 __read_mostly = .from_nlattr = nlattr_to_tcp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, + .nlattr_protoinfo_size = tcp_nlattr_protoinfo_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/netfilter/nf_conntrack_proto_udp.c +2 -0
@@ -193,6 +193,7 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4 __read_mostly =#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
@@ -220,6 +221,7 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6 __read_mostly =#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/netfilter/nf_conntrack_proto_udplite.c +2 -0
@@ -181,6 +181,7 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4 __read_mostly =#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
@@ -204,6 +205,7 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6 __read_mostly =#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_size = nf_ct_port_nlattr_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
Pablo Neira Ayuso
maintainerPATCH 8/8 remove module dependency between ctnetlink and nf_nat
In reply to Pablo Neira AyusoThis patch removes the module dependency between ctnetlink and nf_nat by means of an indirect call that is initialized when nf_nat is loaded. Now, nf_conntrack_netlink only requires nf_conntrack and nfnetlink.
This patch puts nfnetlink_parse_nat_setup_hook into the nf_conntrack_core to avoid dependencies between ctnetlink, nf_conntrack_ipv4 and nf_conntrack_ipv6.
---
include/net/netfilter/nf_nat_core.h | 8 ++ net/ipv4/netfilter/nf_nat_core.c | 97 ++++++++++++++++++++++++++++ net/netfilter/nf_conntrack_core.c | 7 ++ net/netfilter/nf_conntrack_netlink.c | 116 +++++++++++----------------------- 4 files changed, 150 insertions(+), 78 deletions(-)
include/net/netfilter/nf_nat_core.h +8 -0
@@ -25,4 +25,12 @@ static inline int nf_nat_initialized(struct nf_conn *ct, else return test_bit(IPS_DST_NAT_DONE_BIT, &ct->status); } + +struct nlattr ; + +extern int +(*nfnetlink_parse_nat_setup_hook)(struct nf_conn *ct, +enum nf_nat_manip_type manip, +struct nlattr *attr); +#endif /* _NF_NAT_CORE_H */
net/ipv4/netfilter/nf_nat_core.c +97 -0
119 lines not on this page · raw message
net/netfilter/nf_conntrack_core.c +7 -0
@@ -38,9 +38,16 @@#include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_extend.h> #include <net/netfilter/nf_conntrack_acct.h> +#include <net/netfilter/nf_nat.h> #define NF_CONNTRACK_VERSION "0.5.0" +unsigned int +(*nfnetlink_parse_nat_setup_hook)(struct nf_conn *ct, +enum nf_nat_manip_type manip, +struct nlattr *attr)__read_mostly ; +EXPORT_SYMBOL_GPL (nfnetlink_parse_nat_setup_hook); +DEFINE_SPINLOCK (nf_conntrack_lock);EXPORT_SYMBOL_GPL (nf_conntrack_lock);
net/netfilter/nf_conntrack_netlink.c +38 -78
138 lines not on this page · raw message
Patrick McHardy
AppliedQuoted 5 lines · Pablo Neira Ayuso
This patch replaces the unnecessary module refcounting with the read-side locks. With this patch, all the dump and
fill_infofunction are called under the RCU read lock.Based on a patch from Fabian Hugelshofer.
Applied, thanks.
Some of the new rcu_read_locks wouldn't have been necessary though since some of the paths can only be reached through nf_hook_slow, which already does rcu_read_lock() (and we're relying on that in many spots).