{"id":811741,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811741/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504892748-1605-7-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":"<1504892748-1605-7-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-08T17:45:45","name":"[6/9] netfilter: nat: use keyed locks","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"04563e203eb12edd187d1a3f4ef76b9eb7de5f47","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/1504892748-1605-7-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":2261,"url":"http://patchwork.ozlabs.org/api/1.2/series/2261/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=2261","date":"2017-09-08T17:45:46","name":"[1/9] netfilter: ipvs: fix the issue that sctp_conn_schedule drops non-INIT packet","version":1,"mbox":"http://patchwork.ozlabs.org/series/2261/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811741/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811741/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 3xplBX4gmQz9s8J\n\tfor ;\n\tSat, 9 Sep 2017 03:47:00 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1756652AbdIHRqt (ORCPT );\n\tFri, 8 Sep 2017 13:46:49 -0400","from mail.us.es ([193.147.175.20]:54500 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1756781AbdIHRqD (ORCPT );\n\tFri, 8 Sep 2017 13:46:03 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 947D68D050F\n\tfor ;\n\tFri, 8 Sep 2017 19:45:32 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 875522DC87\n\tfor ;\n\tFri, 8 Sep 2017 19:45:32 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 7CF3ADA2AF; Fri, 8 Sep 2017 19:45:32 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 59BC4B5026;\n\tFri, 8 Sep 2017 19:45:30 +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\tFri, 08 Sep 2017 19:45:30 +0200 (CEST)","from salvia.here (129.166.216.87.static.jazztel.es\n\t[87.216.166.129]) (Authenticated sender: pneira@us.es)\n\tby entrada.int (Postfix) with ESMTPA id 07AB844581E1;\n\tFri, 8 Sep 2017 19:45:29 +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 6/9] netfilter: nat: use keyed locks","Date":"Fri, 8 Sep 2017 19:45:45 +0200","Message-Id":"<1504892748-1605-7-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504892748-1605-1-git-send-email-pablo@netfilter.org>","References":"<1504892748-1605-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\nno need to serialize on a single lock, we can partition the table and\nadd/delete in parallel to different slots.\nThis restores one of the advantages that got lost with the rhlist\nrevert.\n\nCc: Ivan Babrou \nSigned-off-by: Florian Westphal \nSigned-off-by: Pablo Neira Ayuso \n---\n net/netfilter/nf_nat_core.c | 36 ++++++++++++++++++++++++------------\n 1 file changed, 24 insertions(+), 12 deletions(-)","diff":"diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c\nindex f090419f5f97..f393a7086025 100644\n--- a/net/netfilter/nf_nat_core.c\n+++ b/net/netfilter/nf_nat_core.c\n@@ -30,7 +30,7 @@\n #include \n #include \n \n-static DEFINE_SPINLOCK(nf_nat_lock);\n+static spinlock_t nf_nat_locks[CONNTRACK_LOCKS];\n \n static DEFINE_MUTEX(nf_nat_proto_mutex);\n static const struct nf_nat_l3proto __rcu *nf_nat_l3protos[NFPROTO_NUMPROTO]\n@@ -425,13 +425,15 @@ nf_nat_setup_info(struct nf_conn *ct,\n \n \tif (maniptype == NF_NAT_MANIP_SRC) {\n \t\tunsigned int srchash;\n+\t\tspinlock_t *lock;\n \n \t\tsrchash = hash_by_src(net,\n \t\t\t\t &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple);\n-\t\tspin_lock_bh(&nf_nat_lock);\n+\t\tlock = &nf_nat_locks[srchash % ARRAY_SIZE(nf_nat_locks)];\n+\t\tspin_lock_bh(lock);\n \t\thlist_add_head_rcu(&ct->nat_bysource,\n \t\t\t\t &nf_nat_bysource[srchash]);\n-\t\tspin_unlock_bh(&nf_nat_lock);\n+\t\tspin_unlock_bh(lock);\n \t}\n \n \t/* It's done. */\n@@ -525,6 +527,16 @@ static int nf_nat_proto_remove(struct nf_conn *i, void *data)\n \treturn i->status & IPS_NAT_MASK ? 1 : 0;\n }\n \n+static void __nf_nat_cleanup_conntrack(struct nf_conn *ct)\n+{\n+\tunsigned int h;\n+\n+\th = hash_by_src(nf_ct_net(ct), &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple);\n+\tspin_lock_bh(&nf_nat_locks[h % ARRAY_SIZE(nf_nat_locks)]);\n+\thlist_del_rcu(&ct->nat_bysource);\n+\tspin_unlock_bh(&nf_nat_locks[h % ARRAY_SIZE(nf_nat_locks)]);\n+}\n+\n static int nf_nat_proto_clean(struct nf_conn *ct, void *data)\n {\n \tif (nf_nat_proto_remove(ct, data))\n@@ -540,9 +552,7 @@ static int nf_nat_proto_clean(struct nf_conn *ct, void *data)\n \t * will delete entry from already-freed table.\n \t */\n \tclear_bit(IPS_SRC_NAT_DONE_BIT, &ct->status);\n-\tspin_lock_bh(&nf_nat_lock);\n-\thlist_del_rcu(&ct->nat_bysource);\n-\tspin_unlock_bh(&nf_nat_lock);\n+\t__nf_nat_cleanup_conntrack(ct);\n \n \t/* don't delete conntrack. Although that would make things a lot\n \t * simpler, we'd end up flushing all conntracks on nat rmmod.\n@@ -670,11 +680,8 @@ EXPORT_SYMBOL_GPL(nf_nat_l3proto_unregister);\n /* No one using conntrack by the time this called. */\n static void nf_nat_cleanup_conntrack(struct nf_conn *ct)\n {\n-\tif (ct->status & IPS_SRC_NAT_DONE) {\n-\t\tspin_lock_bh(&nf_nat_lock);\n-\t\thlist_del_rcu(&ct->nat_bysource);\n-\t\tspin_unlock_bh(&nf_nat_lock);\n-\t}\n+\tif (ct->status & IPS_SRC_NAT_DONE)\n+\t\t__nf_nat_cleanup_conntrack(ct);\n }\n \n static struct nf_ct_ext_type nat_extend __read_mostly = {\n@@ -796,10 +803,12 @@ static struct nf_ct_helper_expectfn follow_master_nat = {\n \n static int __init nf_nat_init(void)\n {\n-\tint ret;\n+\tint ret, i;\n \n \t/* Leave them the same for the moment. */\n \tnf_nat_htable_size = nf_conntrack_htable_size;\n+\tif (nf_nat_htable_size < ARRAY_SIZE(nf_nat_locks))\n+\t\tnf_nat_htable_size = ARRAY_SIZE(nf_nat_locks);\n \n \tnf_nat_bysource = nf_ct_alloc_hashtable(&nf_nat_htable_size, 0);\n \tif (!nf_nat_bysource)\n@@ -812,6 +821,9 @@ static int __init nf_nat_init(void)\n \t\treturn ret;\n \t}\n \n+\tfor (i = 0; i < ARRAY_SIZE(nf_nat_locks); i++)\n+\t\tspin_lock_init(&nf_nat_locks[i]);\n+\n \tnf_ct_helper_expectfn_register(&follow_master_nat);\n \n \tBUG_ON(nfnetlink_parse_nat_setup_hook != NULL);\n","prefixes":["6/9"]}