Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752980AbdF2Qvc (ORCPT ); Thu, 29 Jun 2017 12:51:32 -0400 Received: from mail.us.es ([193.147.175.20]:59644 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752136AbdF2Qv0 (ORCPT ); Thu, 29 Jun 2017 12:51:26 -0400 Date: Thu, 29 Jun 2017 18:51:12 +0200 From: Pablo Neira Ayuso To: Haishuang Yan Cc: Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] netfilter: ctnetlink: move CTA_TIMEOUT case to outside Message-ID: <20170629165112.GA8551@salvia> References: <1496983067-11214-1-git-send-email-yanhaishuang@cmss.chinamobile.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1496983067-11214-1-git-send-email-yanhaishuang@cmss.chinamobile.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1635 Lines: 46 On Fri, Jun 09, 2017 at 12:37:47PM +0800, Haishuang Yan wrote: > When cda[CTA_TIMEOUT] is zero, ctnetlink_new_conntrack will > free allocated ct and return, so move it to outside to optimize > this situation. > > Signed-off-by: Haishuang Yan > --- > net/netfilter/nf_conntrack_netlink.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c > index a8be9b7..d1e6b1c 100644 > --- a/net/netfilter/nf_conntrack_netlink.c > +++ b/net/netfilter/nf_conntrack_netlink.c > @@ -1768,9 +1768,6 @@ static int change_seq_adj(struct nf_ct_seqadj *seq, > if (IS_ERR(ct)) > return ERR_PTR(-ENOMEM); > > - if (!cda[CTA_TIMEOUT]) > - goto err1; Actually, I think we would make ctnetlink a better place if we just relax this. I mean, I would like to see how a patch to use the default timeout based on the protocol state looks like. ctnetlink is overly pendantic, in asking things that we can probably infer, just in case the user doesn't specify this. > - > ct->timeout = nfct_time_stamp + ntohl(nla_get_be32(cda[CTA_TIMEOUT])) * HZ; > > rcu_read_lock(); > @@ -1944,7 +1941,7 @@ static int ctnetlink_new_conntrack(struct net *net, struct sock *ctnl, > if (nlh->nlmsg_flags & NLM_F_CREATE) { > enum ip_conntrack_events events; > > - if (!cda[CTA_TUPLE_ORIG] || !cda[CTA_TUPLE_REPLY]) > + if (!cda[CTA_TUPLE_ORIG] || !cda[CTA_TUPLE_REPLY] || !cda[CTA_TIMEOUT]) > return -EINVAL; > if (otuple.dst.protonum != rtuple.dst.protonum) > return -EINVAL; > -- > 1.8.3.1 > > >