{"id":809372,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809372/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504477589-12045-3-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-3-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-03T22:25:44","name":"[02/47] netfilter: nf_tables: keep chain counters away from hot path","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"198873d95dac7df6ebdcae15f5c65e37c1318a44","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-3-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/809372/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809372/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 3xlndh5p4Pz9s7M\n\tfor ;\n\tMon, 4 Sep 2017 08:26:48 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753149AbdICW0p (ORCPT );\n\tSun, 3 Sep 2017 18:26:45 -0400","from mail.us.es ([193.147.175.20]:50778 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753052AbdICW0j (ORCPT );\n\tSun, 3 Sep 2017 18:26:39 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id CD3F3190F63\n\tfor ;\n\tMon, 4 Sep 2017 00:26:12 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id B864CB502C\n\tfor ;\n\tMon, 4 Sep 2017 00:26:12 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid AD500B5028; Mon, 4 Sep 2017 00:26:12 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 993852DC87;\n\tMon, 4 Sep 2017 00:26:10 +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:10 +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 486BC4265A22;\n\tMon, 4 Sep 2017 00:26:10 +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 02/47] netfilter: nf_tables: keep chain counters away from\n\thot path","Date":"Mon, 4 Sep 2017 00:25:44 +0200","Message-Id":"<1504477589-12045-3-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":"These chain counters are only used by the iptables-compat tool, that\nallow users to use the x_tables extensions from the existing nf_tables\nframework. This patch makes nf_tables by ~5% for the general usecase,\nie. native nft users, where no chain counters are used at all.\n\nSigned-off-by: Pablo Neira Ayuso \n---\n include/net/netfilter/nf_tables_core.h | 2 ++\n net/netfilter/nf_tables_api.c | 11 +++--------\n net/netfilter/nf_tables_core.c | 26 ++++++++++++++++++--------\n 3 files changed, 23 insertions(+), 16 deletions(-)","diff":"diff --git a/include/net/netfilter/nf_tables_core.h b/include/net/netfilter/nf_tables_core.h\nindex 8f690effec37..424684c33771 100644\n--- a/include/net/netfilter/nf_tables_core.h\n+++ b/include/net/netfilter/nf_tables_core.h\n@@ -49,6 +49,8 @@ struct nft_payload_set {\n };\n \n extern const struct nft_expr_ops nft_payload_fast_ops;\n+\n+extern struct static_key_false nft_counters_enabled;\n extern struct static_key_false nft_trace_enabled;\n \n #endif /* _NET_NF_TABLES_CORE_H */\ndiff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c\nindex 7843efa33c59..7fbf0070aba1 100644\n--- a/net/netfilter/nf_tables_api.c\n+++ b/net/netfilter/nf_tables_api.c\n@@ -1240,6 +1240,8 @@ static void nf_tables_chain_destroy(struct nft_chain *chain)\n \n \t\tmodule_put(basechain->type->owner);\n \t\tfree_percpu(basechain->stats);\n+\t\tif (basechain->stats)\n+\t\t\tstatic_branch_dec(&nft_counters_enabled);\n \t\tif (basechain->ops[0].dev != NULL)\n \t\t\tdev_put(basechain->ops[0].dev);\n \t\tkfree(basechain);\n@@ -1504,14 +1506,7 @@ static int nf_tables_newchain(struct net *net, struct sock *nlsk,\n \t\t\t\treturn PTR_ERR(stats);\n \t\t\t}\n \t\t\tbasechain->stats = stats;\n-\t\t} else {\n-\t\t\tstats = netdev_alloc_pcpu_stats(struct nft_stats);\n-\t\t\tif (stats == NULL) {\n-\t\t\t\tnft_chain_release_hook(&hook);\n-\t\t\t\tkfree(basechain);\n-\t\t\t\treturn -ENOMEM;\n-\t\t\t}\n-\t\t\trcu_assign_pointer(basechain->stats, stats);\n+\t\t\tstatic_branch_inc(&nft_counters_enabled);\n \t\t}\n \n \t\thookfn = hook.type->hooks[hook.num];\ndiff --git a/net/netfilter/nf_tables_core.c b/net/netfilter/nf_tables_core.c\nindex 65dbeadcb118..c5bab08b0d73 100644\n--- a/net/netfilter/nf_tables_core.c\n+++ b/net/netfilter/nf_tables_core.c\n@@ -114,6 +114,22 @@ static bool nft_payload_fast_eval(const struct nft_expr *expr,\n \treturn true;\n }\n \n+DEFINE_STATIC_KEY_FALSE(nft_counters_enabled);\n+\n+static noinline void nft_update_chain_stats(const struct nft_chain *chain,\n+\t\t\t\t\t const struct nft_pktinfo *pkt)\n+{\n+\tstruct nft_stats *stats;\n+\n+\tlocal_bh_disable();\n+\tstats = this_cpu_ptr(rcu_dereference(nft_base_chain(chain)->stats));\n+\tu64_stats_update_begin(&stats->syncp);\n+\tstats->pkts++;\n+\tstats->bytes += pkt->skb->len;\n+\tu64_stats_update_end(&stats->syncp);\n+\tlocal_bh_enable();\n+}\n+\n struct nft_jumpstack {\n \tconst struct nft_chain\t*chain;\n \tconst struct nft_rule\t*rule;\n@@ -130,7 +146,6 @@ nft_do_chain(struct nft_pktinfo *pkt, void *priv)\n \tstruct nft_regs regs;\n \tunsigned int stackptr = 0;\n \tstruct nft_jumpstack jumpstack[NFT_JUMP_STACK_SIZE];\n-\tstruct nft_stats *stats;\n \tint rulenum;\n \tunsigned int gencursor = nft_genmask_cur(net);\n \tstruct nft_traceinfo info;\n@@ -220,13 +235,8 @@ nft_do_chain(struct nft_pktinfo *pkt, void *priv)\n \tnft_trace_packet(&info, basechain, NULL, -1,\n \t\t\t NFT_TRACETYPE_POLICY);\n \n-\trcu_read_lock_bh();\n-\tstats = this_cpu_ptr(rcu_dereference(nft_base_chain(basechain)->stats));\n-\tu64_stats_update_begin(&stats->syncp);\n-\tstats->pkts++;\n-\tstats->bytes += pkt->skb->len;\n-\tu64_stats_update_end(&stats->syncp);\n-\trcu_read_unlock_bh();\n+\tif (static_branch_unlikely(&nft_counters_enabled))\n+\t\tnft_update_chain_stats(basechain, pkt);\n \n \treturn nft_base_chain(basechain)->policy;\n }\n","prefixes":["02/47"]}