{"id":809382,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809382/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504477589-12045-9-git-send-email-pablo@netfilter.org/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.2/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504477589-12045-9-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-03T22:25:50","name":"[08/47] netfilter: expect: add and use nf_ct_expect_iterate helpers","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"fac24c98680ebe19b98c8f715dbf10879b92950f","submitter":{"id":1315,"url":"http://patchwork.ozlabs.org/api/1.2/people/1315/?format=json","name":"Pablo Neira Ayuso","email":"pablo@netfilter.org"},"delegate":{"id":6139,"url":"http://patchwork.ozlabs.org/api/1.2/users/6139/?format=json","username":"pablo","first_name":"Pablo","last_name":"Neira","email":"pablo@netfilter.org"},"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504477589-12045-9-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":1280,"url":"http://patchwork.ozlabs.org/api/1.2/series/1280/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=1280","date":"2017-09-03T22:25:42","name":"[01/47] netfilter: expect: add to hash table after expect init","version":1,"mbox":"http://patchwork.ozlabs.org/series/1280/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809382/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809382/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netfilter-devel-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xlnfH6Yzsz9s06\n\tfor ;\n\tMon, 4 Sep 2017 08:27:19 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753037AbdICW1F (ORCPT );\n\tSun, 3 Sep 2017 18:27:05 -0400","from mail.us.es ([193.147.175.20]:50786 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753172AbdICW0p (ORCPT );\n\tSun, 3 Sep 2017 18:26:45 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 3AC7A190F68\n\tfor ;\n\tMon, 4 Sep 2017 00:26:18 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 24747B5027\n\tfor ;\n\tMon, 4 Sep 2017 00:26:18 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 18E95B5024; Mon, 4 Sep 2017 00:26:18 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id E11C3B5027;\n\tMon, 4 Sep 2017 00:26:15 +0200 (CEST)","from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int\n\t(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); \n\tMon, 04 Sep 2017 00:26:15 +0200 (CEST)","from salvia.here (unknown [31.4.193.113])\n\t(Authenticated sender: pneira@us.es)\n\tby entrada.int (Postfix) with ESMTPA id 7614D4265A25;\n\tMon, 4 Sep 2017 00:26:15 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.1 (2015-04-28) on\n\tantivirus1-rhel7.int","X-Spam-Level":"","X-Spam-Status":"No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50,\n\tSMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1","X-Virus-Status":"clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int)","X-SMTPAUTHUS":"auth mail.us.es","From":"Pablo Neira Ayuso ","To":"netfilter-devel@vger.kernel.org","Cc":"davem@davemloft.net, netdev@vger.kernel.org","Subject":"[PATCH 08/47] netfilter: expect: add and use nf_ct_expect_iterate\n\thelpers","Date":"Mon, 4 Sep 2017 00:25:50 +0200","Message-Id":"<1504477589-12045-9-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504477589-12045-1-git-send-email-pablo@netfilter.org>","References":"<1504477589-12045-1-git-send-email-pablo@netfilter.org>","X-Virus-Scanned":"ClamAV using ClamSMTP","Sender":"netfilter-devel-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"From: Florian Westphal \n\nWe have several spots that open-code a expect walk, add a helper\nthat is similar to nf_ct_iterate_destroy/nf_ct_iterate_cleanup.\n\nSigned-off-by: Florian Westphal \nSigned-off-by: Pablo Neira Ayuso \n---\n include/net/netfilter/nf_conntrack_expect.h | 5 +++\n net/netfilter/nf_conntrack_expect.c | 54 +++++++++++++++++++++++++\n net/netfilter/nf_conntrack_helper.c | 34 +++++++---------\n net/netfilter/nf_conntrack_netlink.c | 63 ++++++++++-------------------\n 4 files changed, 95 insertions(+), 61 deletions(-)","diff":"diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h\nindex 2ba54feaccd8..818def011110 100644\n--- a/include/net/netfilter/nf_conntrack_expect.h\n+++ b/include/net/netfilter/nf_conntrack_expect.h\n@@ -107,6 +107,11 @@ void nf_ct_remove_expectations(struct nf_conn *ct);\n void nf_ct_unexpect_related(struct nf_conntrack_expect *exp);\n bool nf_ct_remove_expect(struct nf_conntrack_expect *exp);\n \n+void nf_ct_expect_iterate_destroy(bool (*iter)(struct nf_conntrack_expect *e, void *data), void *data);\n+void nf_ct_expect_iterate_net(struct net *net,\n+\t\t\t bool (*iter)(struct nf_conntrack_expect *e, void *data),\n+ void *data, u32 portid, int report);\n+\n /* Allocate space for an expectation: this is mandatory before calling\n nf_ct_expect_related. You will have to call put afterwards. */\n struct nf_conntrack_expect *nf_ct_expect_alloc(struct nf_conn *me);\ndiff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c\nindex 2c63808bea96..dad2c0c22ad5 100644\n--- a/net/netfilter/nf_conntrack_expect.c\n+++ b/net/netfilter/nf_conntrack_expect.c\n@@ -474,6 +474,60 @@ int nf_ct_expect_related_report(struct nf_conntrack_expect *expect,\n }\n EXPORT_SYMBOL_GPL(nf_ct_expect_related_report);\n \n+void nf_ct_expect_iterate_destroy(bool (*iter)(struct nf_conntrack_expect *e, void *data),\n+\t\t\t\t void *data)\n+{\n+\tstruct nf_conntrack_expect *exp;\n+\tconst struct hlist_node *next;\n+\tunsigned int i;\n+\n+\tspin_lock_bh(&nf_conntrack_expect_lock);\n+\n+\tfor (i = 0; i < nf_ct_expect_hsize; i++) {\n+\t\thlist_for_each_entry_safe(exp, next,\n+\t\t\t\t\t &nf_ct_expect_hash[i],\n+\t\t\t\t\t hnode) {\n+\t\t\tif (iter(exp, data) && del_timer(&exp->timeout)) {\n+\t\t\t\tnf_ct_unlink_expect(exp);\n+\t\t\t\tnf_ct_expect_put(exp);\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tspin_unlock_bh(&nf_conntrack_expect_lock);\n+}\n+EXPORT_SYMBOL_GPL(nf_ct_expect_iterate_destroy);\n+\n+void nf_ct_expect_iterate_net(struct net *net,\n+\t\t\t bool (*iter)(struct nf_conntrack_expect *e, void *data),\n+\t\t\t void *data,\n+\t\t\t u32 portid, int report)\n+{\n+\tstruct nf_conntrack_expect *exp;\n+\tconst struct hlist_node *next;\n+\tunsigned int i;\n+\n+\tspin_lock_bh(&nf_conntrack_expect_lock);\n+\n+\tfor (i = 0; i < nf_ct_expect_hsize; i++) {\n+\t\thlist_for_each_entry_safe(exp, next,\n+\t\t\t\t\t &nf_ct_expect_hash[i],\n+\t\t\t\t\t hnode) {\n+\n+\t\t\tif (!net_eq(nf_ct_exp_net(exp), net))\n+\t\t\t\tcontinue;\n+\n+\t\t\tif (iter(exp, data) && del_timer(&exp->timeout)) {\n+\t\t\t\tnf_ct_unlink_expect_report(exp, portid, report);\n+\t\t\t\tnf_ct_expect_put(exp);\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tspin_unlock_bh(&nf_conntrack_expect_lock);\n+}\n+EXPORT_SYMBOL_GPL(nf_ct_expect_iterate_net);\n+\n #ifdef CONFIG_NF_CONNTRACK_PROCFS\n struct ct_expect_iter_state {\n \tstruct seq_net_private p;\ndiff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c\nindex 9129bb3b5153..551a1eddf0fa 100644\n--- a/net/netfilter/nf_conntrack_helper.c\n+++ b/net/netfilter/nf_conntrack_helper.c\n@@ -437,12 +437,22 @@ int nf_conntrack_helper_register(struct nf_conntrack_helper *me)\n }\n EXPORT_SYMBOL_GPL(nf_conntrack_helper_register);\n \n-void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me)\n+static bool expect_iter_me(struct nf_conntrack_expect *exp, void *data)\n {\n-\tstruct nf_conntrack_expect *exp;\n-\tconst struct hlist_node *next;\n-\tunsigned int i;\n+\tstruct nf_conn_help *help = nfct_help(exp->master);\n+\tconst struct nf_conntrack_helper *me = data;\n+\tconst struct nf_conntrack_helper *this;\n+\n+\tif (exp->helper == me)\n+\t\treturn true;\n \n+\tthis = rcu_dereference_protected(help->helper,\n+\t\t\t\t\t lockdep_is_held(&nf_conntrack_expect_lock));\n+\treturn this == me;\n+}\n+\n+void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me)\n+{\n \tmutex_lock(&nf_ct_helper_mutex);\n \thlist_del_rcu(&me->hnode);\n \tnf_ct_helper_count--;\n@@ -453,21 +463,7 @@ void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me)\n \t */\n \tsynchronize_rcu();\n \n-\t/* Get rid of expectations */\n-\tspin_lock_bh(&nf_conntrack_expect_lock);\n-\tfor (i = 0; i < nf_ct_expect_hsize; i++) {\n-\t\thlist_for_each_entry_safe(exp, next,\n-\t\t\t\t\t &nf_ct_expect_hash[i], hnode) {\n-\t\t\tstruct nf_conn_help *help = nfct_help(exp->master);\n-\t\t\tif ((rcu_dereference_protected(\n-\t\t\t\t\thelp->helper,\n-\t\t\t\t\tlockdep_is_held(&nf_conntrack_expect_lock)\n-\t\t\t\t\t) == me || exp->helper == me))\n-\t\t\t\tnf_ct_remove_expect(exp);\n-\t\t}\n-\t}\n-\tspin_unlock_bh(&nf_conntrack_expect_lock);\n-\n+\tnf_ct_expect_iterate_destroy(expect_iter_me, NULL);\n \tnf_ct_iterate_destroy(unhelp, me);\n }\n EXPORT_SYMBOL_GPL(nf_conntrack_helper_unregister);\ndiff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c\nindex 4dba71de4de7..4922c8aefb2a 100644\n--- a/net/netfilter/nf_conntrack_netlink.c\n+++ b/net/netfilter/nf_conntrack_netlink.c\n@@ -2898,6 +2898,21 @@ static int ctnetlink_get_expect(struct net *net, struct sock *ctnl,\n \treturn err == -EAGAIN ? -ENOBUFS : err;\n }\n \n+static bool expect_iter_name(struct nf_conntrack_expect *exp, void *data)\n+{\n+\tconst struct nf_conn_help *m_help;\n+\tconst char *name = data;\n+\n+\tm_help = nfct_help(exp->master);\n+\n+\treturn strcmp(m_help->helper->name, name) == 0;\n+}\n+\n+static bool expect_iter_all(struct nf_conntrack_expect *exp, void *data)\n+{\n+\treturn true;\n+}\n+\n static int ctnetlink_del_expect(struct net *net, struct sock *ctnl,\n \t\t\t\tstruct sk_buff *skb, const struct nlmsghdr *nlh,\n \t\t\t\tconst struct nlattr * const cda[],\n@@ -2906,10 +2921,8 @@ static int ctnetlink_del_expect(struct net *net, struct sock *ctnl,\n \tstruct nf_conntrack_expect *exp;\n \tstruct nf_conntrack_tuple tuple;\n \tstruct nfgenmsg *nfmsg = nlmsg_data(nlh);\n-\tstruct hlist_node *next;\n \tu_int8_t u3 = nfmsg->nfgen_family;\n \tstruct nf_conntrack_zone zone;\n-\tunsigned int i;\n \tint err;\n \n \tif (cda[CTA_EXPECT_TUPLE]) {\n@@ -2949,49 +2962,15 @@ static int ctnetlink_del_expect(struct net *net, struct sock *ctnl,\n \t\tnf_ct_expect_put(exp);\n \t} else if (cda[CTA_EXPECT_HELP_NAME]) {\n \t\tchar *name = nla_data(cda[CTA_EXPECT_HELP_NAME]);\n-\t\tstruct nf_conn_help *m_help;\n \n-\t\t/* delete all expectations for this helper */\n-\t\tspin_lock_bh(&nf_conntrack_expect_lock);\n-\t\tfor (i = 0; i < nf_ct_expect_hsize; i++) {\n-\t\t\thlist_for_each_entry_safe(exp, next,\n-\t\t\t\t\t\t &nf_ct_expect_hash[i],\n-\t\t\t\t\t\t hnode) {\n-\n-\t\t\t\tif (!net_eq(nf_ct_exp_net(exp), net))\n-\t\t\t\t\tcontinue;\n-\n-\t\t\t\tm_help = nfct_help(exp->master);\n-\t\t\t\tif (!strcmp(m_help->helper->name, name) &&\n-\t\t\t\t del_timer(&exp->timeout)) {\n-\t\t\t\t\tnf_ct_unlink_expect_report(exp,\n-\t\t\t\t\t\t\tNETLINK_CB(skb).portid,\n-\t\t\t\t\t\t\tnlmsg_report(nlh));\n-\t\t\t\t\tnf_ct_expect_put(exp);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t\tspin_unlock_bh(&nf_conntrack_expect_lock);\n+\t\tnf_ct_expect_iterate_net(net, expect_iter_name, name,\n+\t\t\t\t\t NETLINK_CB(skb).portid,\n+\t\t\t\t\t nlmsg_report(nlh));\n \t} else {\n \t\t/* This basically means we have to flush everything*/\n-\t\tspin_lock_bh(&nf_conntrack_expect_lock);\n-\t\tfor (i = 0; i < nf_ct_expect_hsize; i++) {\n-\t\t\thlist_for_each_entry_safe(exp, next,\n-\t\t\t\t\t\t &nf_ct_expect_hash[i],\n-\t\t\t\t\t\t hnode) {\n-\n-\t\t\t\tif (!net_eq(nf_ct_exp_net(exp), net))\n-\t\t\t\t\tcontinue;\n-\n-\t\t\t\tif (del_timer(&exp->timeout)) {\n-\t\t\t\t\tnf_ct_unlink_expect_report(exp,\n-\t\t\t\t\t\t\tNETLINK_CB(skb).portid,\n-\t\t\t\t\t\t\tnlmsg_report(nlh));\n-\t\t\t\t\tnf_ct_expect_put(exp);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t\tspin_unlock_bh(&nf_conntrack_expect_lock);\n+\t\tnf_ct_expect_iterate_net(net, expect_iter_all, NULL,\n+\t\t\t\t\t NETLINK_CB(skb).portid,\n+\t\t\t\t\t nlmsg_report(nlh));\n \t}\n \n \treturn 0;\n","prefixes":["08/47"]}