From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Gao feng <gaofeng@cn.fujitsu.com>
Cc: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org
Subject: Re: [PATCH 03/10] netfilter: add nf_ct_kfree_compat_sysctl_table to make codes clear
Date: Fri, 15 Jun 2012 12:08:06 +0200 [thread overview]
Message-ID: <20120615100806.GB13867@1984> (raw)
In-Reply-To: <4FDA9186.408@cn.fujitsu.com>
On Fri, Jun 15, 2012 at 09:36:06AM +0800, Gao feng wrote:
> Hi Pablo:
>
> 于 2012年06月15日 02:06, Pablo Neira Ayuso 写道:
> > On Thu, Jun 14, 2012 at 06:07:18PM +0800, Gao feng wrote:
> >> add function nf_ct_kfree_compat_sysctl_table to kfree l4proto's
> >> compat sysctl table and set the sysctl table point to NULL.
> >>
> >> Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
> >> ---
> >> include/net/netfilter/nf_conntrack_l4proto.h | 8 ++++++++
> >> net/netfilter/nf_conntrack_proto.c | 4 +---
> >> 2 files changed, 9 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
> >> index 5dd60f2..889b717 100644
> >> --- a/include/net/netfilter/nf_conntrack_l4proto.h
> >> +++ b/include/net/netfilter/nf_conntrack_l4proto.h
> >> @@ -132,6 +132,14 @@ extern int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[],
> >> extern int nf_ct_port_nlattr_tuple_size(void);
> >> extern const struct nla_policy nf_ct_port_nla_policy[];
> >>
> >> +static inline void nf_ct_kfree_compat_sysctl_table(struct nf_proto_net *pn)
> >> +{
> >> +#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
> >> + kfree(pn->ctl_compat_table);
> >> + pn->ctl_compat_table = NULL;
> >> +#endif
> >> +}
inline is usually reserved for fast path, not initialization path.
Although this function is fairly small, I think I prefer that this
function is defined in nf_conntrack_proto.c and exported.
> >> +
> >> #ifdef CONFIG_SYSCTL
> >> #ifdef DEBUG_INVALID_PACKETS
> >> #define LOG_INVALID(net, proto) \
> >> diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
> >> index 8fc0332..c9df1b4 100644
> >> --- a/net/netfilter/nf_conntrack_proto.c
> >> +++ b/net/netfilter/nf_conntrack_proto.c
> >> @@ -361,9 +361,7 @@ int nf_ct_l4proto_register_sysctl(struct net *net,
> >> NULL);
> >> if (err == 0)
> >> goto out;
> >> -
> >> - kfree(pn->ctl_compat_table);
> >> - pn->ctl_compat_table = NULL;
> >> + nf_ct_kfree_compat_sysctl_table(pn);
> >
> > if this is the only client of this function, then make it static and
> > define it inside nf_conntrack_proto.c
> >
>
> tcp_init_net,udp_init_net use this function too.
>
> Thanks
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2012-06-15 10:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-14 10:07 [PATCH 01/10] netfilter: fix problem with proto register Gao feng
2012-06-14 10:07 ` [PATCH 02/10] netfilter: add parameter proto for l4proto.init_net Gao feng
2012-06-14 17:59 ` Pablo Neira Ayuso
2012-06-15 1:38 ` Gao feng
2012-06-15 10:10 ` Pablo Neira Ayuso
2012-06-15 10:49 ` Gao feng
2012-06-14 10:07 ` [PATCH 03/10] netfilter: add nf_ct_kfree_compat_sysctl_table to make codes clear Gao feng
2012-06-14 18:06 ` Pablo Neira Ayuso
2012-06-15 1:36 ` Gao feng
2012-06-15 10:08 ` Pablo Neira Ayuso [this message]
2012-06-14 10:07 ` [PATCH 04/10] netfilter: regard users as refcount for l4proto's per-net data Gao feng
2012-06-14 18:03 ` Pablo Neira Ayuso
2012-06-14 10:07 ` [PATCH 05/10] netfilter: merge tcpv[4,6]_net_init into tcp_net_init Gao feng
2012-06-15 11:44 ` Pablo Neira Ayuso
2012-06-15 12:30 ` Gao feng
2012-06-14 10:07 ` [PATCH 06/10] merge udpv[4,6]_net_init into udp_net_init Gao feng
2012-06-14 18:13 ` Pablo Neira Ayuso
2012-06-14 10:07 ` [PATCH 07/10] netfilter: nf_conntrack_l4proto_udplite[4,6] cleanup Gao feng
2012-06-14 18:17 ` Pablo Neira Ayuso
2012-06-14 10:07 ` [PATCH 08/10] netfilter: merge sctpv[4,6]_net_init into sctp_net_init Gao feng
2012-06-14 10:07 ` [PATCH 09/10] netfilter: nf_conntrack_l4proto_generic cleanup Gao feng
2012-06-14 10:07 ` [PATCH 10/10] netfilter: nf_conntrack_l4proto_dccp[4,6] cleanup Gao feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120615100806.GB13867@1984 \
--to=pablo@netfilter.org \
--cc=gaofeng@cn.fujitsu.com \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).