{"id":810568,"url":"http://patchwork.ozlabs.org/api/patches/810568/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20170906123952.12555-3-fw@strlen.de/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/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":"<20170906123952.12555-3-fw@strlen.de>","list_archive_url":null,"date":"2017-09-06T12:39:52","name":"[nf,2/2] netfilter: nat: use keyed locks","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"04563e203eb12edd187d1a3f4ef76b9eb7de5f47","submitter":{"id":1025,"url":"http://patchwork.ozlabs.org/api/people/1025/?format=json","name":"Florian Westphal","email":"fw@strlen.de"},"delegate":{"id":6139,"url":"http://patchwork.ozlabs.org/api/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/20170906123952.12555-3-fw@strlen.de/mbox/","series":[{"id":1790,"url":"http://patchwork.ozlabs.org/api/series/1790/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=1790","date":"2017-09-06T12:39:50","name":"netfilter: nat: do not use rhltable","version":1,"mbox":"http://patchwork.ozlabs.org/series/1790/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810568/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810568/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 3xnNTC36zPz9s76\n\tfor ;\n\tWed, 6 Sep 2017 22:39:59 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753161AbdIFMj5 (ORCPT );\n\tWed, 6 Sep 2017 08:39:57 -0400","from Chamillionaire.breakpoint.cc ([146.0.238.67]:34888 \"EHLO\n\tChamillionaire.breakpoint.cc\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1753933AbdIFMjk (ORCPT\n\t);\n\tWed, 6 Sep 2017 08:39:40 -0400","from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2)\n\t(envelope-from )\n\tid 1dpZZU-0001Ho-3H; Wed, 06 Sep 2017 14:36:44 +0200"],"From":"Florian Westphal ","To":"","Cc":"Florian Westphal , Ivan Babrou ","Subject":"[PATCH nf 2/2] netfilter: nat: use keyed locks","Date":"Wed, 6 Sep 2017 14:39:52 +0200","Message-Id":"<20170906123952.12555-3-fw@strlen.de>","X-Mailer":"git-send-email 2.13.0","In-Reply-To":"<20170906123952.12555-1-fw@strlen.de>","References":"<20170906123952.12555-1-fw@strlen.de>","Sender":"netfilter-devel-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"no 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 \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 2fb80a4bfb34..ad29637d1b62 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@@ -423,13 +423,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@@ -523,6 +525,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@@ -538,9 +550,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@@ -668,11 +678,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@@ -794,10 +801,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@@ -810,6 +819,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":["nf","2/2"]}