ctnetlink: allocation improvements
Subsystems (3)
cover ctnetlink: allocation improvements
Hi Patrick,
this is a resend of the last three patches send last week, which are now rebased against commit af9d32ad6718b9a of nf-net-next-2.6.
I have changed the first patch of this series to use RCU, which you complained about after my initial post. Other than that this series is unchanged.
I'll send another patch shortly which adresses the points Pablo made last week.
Many thanks!
/holger
PATCH 1/3 ctnetlink: allocate right-sized ctnetlink skb
Try to allocate a Netlink skb roughly the size of the actual message, with the help from the l3 and l4 protocol helpers. This is all to prevent a reallocation in netlink_trim() later.
The overhead of allocating the right-sized skb is rather small, with ctnetlink_alloc_skb() actually being inlined away on my x86_64 box. The size of the per-proto space is determined at registration time of the protocol helper.
net/netfilter/nf_conntrack_netlink.c +64 -1
@@ -404,6 +404,69 @@ nla_put_failure: }#ifdef CONFIG_NF_CONNTRACK_EVENTS +/* +* The general structure of a ctnetlink event is +* +* CTA_TUPLE_ORIG +* <l3/l4-proto-attributes> +* CTA_TUPLE_REPLY +* <l3/l4-proto-attributes> +* CTA_ID +* ... +* CTA_PROTOINFO +* <l4-proto-attributes> +* CTA_TUPLE_MASTER +* <l3/l4-proto-attributes> +* +* Therefore the formular is +* +* size = sizeof(headers) + sizeof(generic_nlas) + 3 * sizeof(tuple_nlas) +* + sizeof(protoinfo_nlas) +*/ +static struct sk_buff * +ctnetlink_alloc_skb (const struct nf_conntrack_tuple *tuple,gfp_t gfp) +{ +struct nf_conntrack_l3proto *l3proto; +struct nf_conntrack_l4proto *l4proto; +int len; + +#define NLA_TYPE_SIZE (type) nla_total_size(sizeof(type)) + +/* proto independant part */ + len =NLMSG_SPACE (sizeof (struct nfgenmsg )) + +3 *nla_total_size (0 )/* CTA_TUPLE_ORIG|REPL|MASTER */ + +3 *nla_total_size (0 )/* CTA_TUPLE_IP */ + +3 *nla_total_size (0 )/* CTA_TUPLE_PROTO */ + +3 *NLA_TYPE_SIZE (u_int8_t)/* CTA_PROTO_NUM */ + +NLA_TYPE_SIZE (u_int32_t)/* CTA_ID */ + +NLA_TYPE_SIZE (u_int32_t)/* CTA_STATUS */ + +2 *nla_total_size (0 )/* CTA_COUNTERS_ORIG|REPL */ + +2 *NLA_TYPE_SIZE (uint64_t)/* CTA_COUNTERS_PACKETS */ + +2 *NLA_TYPE_SIZE (uint64_t)/* CTA_COUNTERS_BYTES */ + +NLA_TYPE_SIZE (u_int32_t)/* CTA_TIMEOUT */ + +nla_total_size (0 )/* CTA_PROTOINFO */ + +nla_total_size (0 )/* CTA_HELP */ + +nla_total_size (NF_CT_HELPER_NAME_LEN )/* CTA_HELP_NAME */ + +NLA_TYPE_SIZE (u_int32_t)/* CTA_SECMARK */ + +2 *nla_total_size (0 )/* CTA_NAT_SEQ_ADJ_ORIG|REPL */ + +2 *NLA_TYPE_SIZE (u_int32_t)/* CTA_NAT_SEQ_CORRECTION_POS */ + +2 *NLA_TYPE_SIZE (u_int32_t)/* CTA_NAT_SEQ_CORRECTION_BEFORE */ + +2 *NLA_TYPE_SIZE (u_int32_t)/* CTA_NAT_SEQ_CORRECTION_AFTER */ + +NLA_TYPE_SIZE (u_int32_t);/* CTA_MARK */ + +#undef NLA_TYPE_SIZE + +rcu_read_lock (); + l3proto =__nf_ct_l3proto_find (tuple->src.l3num); + len += l3proto->nla_size; + + l4proto =__nf_ct_l4proto_find (tuple->src.l3num, tuple->dst.protonum); + len += l4proto->nla_size; +rcu_read_unlock (); + +return alloc_skb (len, gfp); +} +static int ctnetlink_conntrack_event (struct notifier_block *this,unsigned long events,void *ptr) {
@@ -437,7 +500,7 @@ static int ctnetlink_conntrack_event(strif (!item->report && !nfnetlink_has_listeners (group))return NOTIFY_DONE ; - skb =alloc_skb (NLMSG_GOODSIZE ,GFP_ATOMIC ); + skb =ctnetlink_alloc_skb (tuple (ct,IP_CT_DIR_ORIGINAL ),GFP_ATOMIC );if (!skb)return NOTIFY_DONE ;
Patrick McHardy
AppliedRe: [patch 1/3] ctnetlink: allocate right-sized ctnetlink skb
Quoted 8 lines · Holger Eitzenberger
Try to allocate a Netlink skb roughly the size of the actual message, with the help from the l3 and l4 protocol helpers. This is all to prevent a reallocation in
netlink_trim()later.The overhead of allocating the right-sized skb is rather small, with
ctnetlink_alloc_skb()actually being inlined away on myx86_64box. The size of the per-proto space is determined at registration time of the protocol helper.
Applied, thanks.
PATCH 2/3 netfilter: add generic function to get len of generic policy
In reply to Holger EitzenbergerUsefull for all protocols which do not add additional data, such as GRE or UDPlite.
include/net/netfilter/nf_conntrack_l4proto.h +1 -0
@@ -113,6 +113,7 @@ extern int nf_ct_port_tuple_to_nlattr(st const struct nf_conntrack_tuple *tuple);extern int nf_ct_port_nlattr_to_tuple (struct nlattr *tb[],struct nf_conntrack_tuple *t); +extern int nf_ct_port_nlattr_tuple_size (void );extern const struct nla_policy nf_ct_port_nla_policy[];#ifdef CONFIG_SYSCTL
net/netfilter/nf_conntrack_core.c +6 -0
@@ -906,6 +906,12 @@ int nf_ct_port_nlattr_to_tuple(struct nl return 0; }EXPORT_SYMBOL_GPL (nf_ct_port_nlattr_to_tuple); + +int nf_ct_port_nlattr_tuple_size (void ) +{ +return nla_policy_len (nf_ct_port_nla_policy,CTA_PROTO_MAX +1 ); +} +EXPORT_SYMBOL_GPL (nf_ct_port_nlattr_tuple_size);#endif /* Used by ipt_REJECT and ip6t_REJECT. */
Patrick McHardy
AppliedRe: [patch 2/3] netfilter: add generic function to get len of generic policy
Quoted 2 lines · Holger Eitzenberger
Usefull for all protocols which do not add additional data, such as GRE or UDPlite.
Applied, thanks.
PATCH 3/3 netfilter: calculate per-protocol nlattr size
In reply to Holger Eitzenbergernet/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +6 -0
@@ -328,6 +328,11 @@ static int ipv4_nlattr_to_tuple(struct nreturn 0 ; } + +static int ipv4_nlattr_tuple_size (void ) +{ +return nla_policy_len (ipv4_nla_policy,CTA_IP_MAX +1 ); +}#endif static struct nf_sockopt_ops so_getorigdst = {
@@ -347,6 +352,7 @@ struct nf_conntrack_l3proto nf_conntrack .get_l4proto = ipv4_get_l4proto,#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = ipv4_tuple_to_nlattr, + .nlattr_tuple_size = ipv4_nlattr_tuple_size, .nlattr_to_tuple = ipv4_nlattr_to_tuple, .nla_policy = ipv4_nla_policy,#endif
net/ipv4/netfilter/nf_conntrack_proto_icmp.c +6 -0
@@ -262,6 +262,11 @@ static int icmp_nlattr_to_tuple(struct n return 0; } + +static int icmp_nlattr_tuple_size (void ) +{ +return nla_policy_len (icmp_nla_policy,CTA_PROTO_MAX +1 ); +}#endif #ifdef CONFIG_SYSCTL
@@ -309,6 +314,7 @@ struct nf_conntrack_l4proto nf_conntrack .me = NULL,#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = icmp_tuple_to_nlattr, + .nlattr_tuple_size = icmp_nlattr_tuple_size, .nlattr_to_tuple = icmp_nlattr_to_tuple, .nla_policy = icmp_nla_policy,#endif
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +6 -0
@@ -342,6 +342,11 @@ static int ipv6_nlattr_to_tuple(struct nreturn 0 ; } + +static int ipv6_nlattr_tuple_size (void ) +{ +return nla_policy_len (ipv6_nla_policy,CTA_IP_MAX +1 ); +}#endif struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6__read_mostly = {
@@ -353,6 +358,7 @@ struct nf_conntrack_l3proto nf_conntrack .get_l4proto = ipv6_get_l4proto,#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = ipv6_tuple_to_nlattr, + .nlattr_tuple_size = ipv6_nlattr_tuple_size, .nlattr_to_tuple = ipv6_nlattr_to_tuple, .nla_policy = ipv6_nla_policy,#endif
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c +6 -0
@@ -268,6 +268,11 @@ static int icmpv6_nlattr_to_tuple(struct return 0; } + +static int icmpv6_nlattr_tuple_size (void ) +{ +return nla_policy_len (icmpv6_nla_policy,CTA_PROTO_MAX +1 ); +}#endif #ifdef CONFIG_SYSCTL
@@ -299,6 +304,7 @@ struct nf_conntrack_l4proto nf_conntrack .error = icmpv6_error,#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = icmpv6_tuple_to_nlattr, + .nlattr_tuple_size = icmpv6_nlattr_tuple_size, .nlattr_to_tuple = icmpv6_nlattr_to_tuple, .nla_policy = icmpv6_nla_policy,#endif
net/netfilter/nf_conntrack_proto_dccp.c +9 -0
@@ -669,6 +669,12 @@ static int nlattr_to_dccp(struct nlattrwrite_unlock_bh (&dccp_lock); return 0; } + +static int dccp_nlattr_size (void ) +{ +return nla_total_size (0 )/* CTA_PROTOINFO_DCCP */ + +nla_policy_len (dccp_nla_policy,CTA_PROTOINFO_DCCP_MAX +1 ); +}#endif #ifdef CONFIG_SYSCTL
@@ -749,8 +755,10 @@ static struct nf_conntrack_l4proto dccp_ .print_conntrack = dccp_print_conntrack,#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .to_nlattr = dccp_to_nlattr, + .nlattr_size = dccp_nlattr_size, .from_nlattr = nlattr_to_dccp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, + .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, .nla_policy = nf_ct_port_nla_policy,#endif
@@ -771,6 +779,7 @@ static struct nf_conntrack_l4proto dccp_ .to_nlattr = dccp_to_nlattr, .from_nlattr = nlattr_to_dccp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, + .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, .nla_policy = nf_ct_port_nla_policy,#endif
net/netfilter/nf_conntrack_proto_gre.c +1 -0
@@ -293,6 +293,7 @@ static struct nf_conntrack_l4proto nf_co .me = THIS_MODULE,#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, + .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, .nla_policy = nf_ct_port_nla_policy,#endif
net/netfilter/nf_conntrack_proto_sctp.c +10 -0
@@ -537,6 +537,12 @@ static int nlattr_to_sctp(struct nlattr return 0; } + +static int sctp_nlattr_size (void ) +{ +return nla_total_size (0 )/* CTA_PROTOINFO_SCTP */ + +nla_policy_len (sctp_nla_policy,CTA_PROTOINFO_SCTP_MAX +1 ); +}#endif #ifdef CONFIG_SYSCTL
@@ -668,8 +674,10 @@ static struct nf_conntrack_l4proto nf_co .me = THIS_MODULE,#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .to_nlattr = sctp_to_nlattr, + .nlattr_size = sctp_nlattr_size, .from_nlattr = nlattr_to_sctp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, + .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, .nla_policy = nf_ct_port_nla_policy,#endif
@@ -696,8 +704,10 @@ static struct nf_conntrack_l4proto nf_co .me = THIS_MODULE,#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .to_nlattr = sctp_to_nlattr, + .nlattr_size = sctp_nlattr_size, .from_nlattr = nlattr_to_sctp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, + .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, .nla_policy = nf_ct_port_nla_policy,#endif
net/netfilter/nf_conntrack_proto_tcp.c +15 -0
@@ -1183,6 +1183,17 @@ static int nlattr_to_tcp(struct nlattr * return 0; } + +static int tcp_nlattr_size (void ) +{ +return nla_total_size (0 )/* CTA_PROTOINFO_TCP */ + +nla_policy_len (tcp_nla_policy,CTA_PROTOINFO_TCP_MAX +1 ); +} + +static int tcp_nlattr_tuple_size (void ) +{ +return nla_policy_len (nf_ct_port_nla_policy,CTA_PROTO_MAX +1 ); +}#endif #ifdef CONFIG_SYSCTL
@@ -1398,9 +1409,11 @@ struct nf_conntrack_l4proto nf_conntrack .error = tcp_error,#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .to_nlattr = tcp_to_nlattr, + .nlattr_size = tcp_nlattr_size, .from_nlattr = nlattr_to_tcp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_tuple_size = tcp_nlattr_tuple_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
@@ -1428,9 +1441,11 @@ struct nf_conntrack_l4proto nf_conntrack .error = tcp_error,#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .to_nlattr = tcp_to_nlattr, + .nlattr_size = tcp_nlattr_size, .from_nlattr = nlattr_to_tcp, .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nlattr_tuple_size = tcp_nlattr_tuple_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/netfilter/nf_conntrack_proto_udp.c +2 -0
@@ -195,6 +195,7 @@ struct nf_conntrack_l4proto nf_conntrack#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_tuple_size = nf_ct_port_nlattr_tuple_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
@@ -222,6 +223,7 @@ struct nf_conntrack_l4proto nf_conntrack#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_tuple_size = nf_ct_port_nlattr_tuple_size, .nla_policy = nf_ct_port_nla_policy,#endif #ifdef CONFIG_SYSCTL
net/netfilter/nf_conntrack_proto_udplite.c +1 -0
@@ -180,6 +180,7 @@ static struct nf_conntrack_l4proto nf_co .error = udplite_error,#if defined(CONFIG_NF_CT_NETLINK ) || defined(CONFIG_NF_CT_NETLINK_MODULE ) .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, + .nlattr_tuple_size = nf_ct_port_nlattr_tuple_size, .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, .nla_policy = nf_ct_port_nla_policy,#endif
Re: [patch 3/3] netfilter: calculate per-protocol nlattr size
Holger Eitzenberger wrote:
Also applied, thanks Holger.