{"id":833937,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833937/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171103152636.9967-2-pablo@netfilter.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171103152636.9967-2-pablo@netfilter.org>","list_archive_url":null,"date":"2017-11-03T15:26:32","name":"[RFC,WIP,1/5] netfilter: nf_conntrack: move nf_ct_netns_{get,put}() to core","commit_ref":null,"pull_url":null,"state":"rfc","archived":true,"hash":"d5de5a6b19494c98c11c7631e728cbad7701e654","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":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20171103152636.9967-2-pablo@netfilter.org/mbox/","series":[{"id":11752,"url":"http://patchwork.ozlabs.org/api/1.2/series/11752/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=11752","date":"2017-11-03T15:26:31","name":"Flow offload infrastructure","version":1,"mbox":"http://patchwork.ozlabs.org/series/11752/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/833937/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833937/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@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=netdev-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 3yT5Rf0GzZz9s7M\n\tfor ;\n\tSat, 4 Nov 2017 02:27:26 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755995AbdKCP1V (ORCPT );\n\tFri, 3 Nov 2017 11:27:21 -0400","from mail.us.es ([193.147.175.20]:43312 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1755825AbdKCP0q (ORCPT );\n\tFri, 3 Nov 2017 11:26:46 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 65103C0B2C\n\tfor ; Fri, 3 Nov 2017 16:26:45 +0100 (CET)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 548BBB7FE7\n\tfor ; Fri, 3 Nov 2017 16:26:45 +0100 (CET)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 4A20AB7FE0; Fri, 3 Nov 2017 16:26:45 +0100 (CET)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 146FDB7FE7;\n\tFri, 3 Nov 2017 16:26:43 +0100 (CET)","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, 03 Nov 2017 16:26:43 +0100 (CET)","from salvia.here (unknown [31.4.245.115])\n\t(Authenticated sender: pneira@us.es)\n\tby entrada.int (Postfix) with ESMTPA id C904A403DFA0;\n\tFri, 3 Nov 2017 16:26:42 +0100 (CET)"],"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":"netdev@vger.kernel.org","Subject":"[PATCH RFC, WIP 1/5] netfilter: nf_conntrack: move nf_ct_netns_{get,\n\tput}() to core","Date":"Fri, 3 Nov 2017 16:26:32 +0100","Message-Id":"<20171103152636.9967-2-pablo@netfilter.org>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20171103152636.9967-1-pablo@netfilter.org>","References":"<20171103152636.9967-1-pablo@netfilter.org>","X-Virus-Scanned":"ClamAV using ClamSMTP","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"So we can call this from other expression that need conntrack in place\nto work.\n\nSigned-off-by: Pablo Neira Ayuso \n---\n net/netfilter/nf_conntrack_proto.c | 37 ++++++++++++++++++++++++++++++++++--\n net/netfilter/nft_ct.c | 39 +++-----------------------------------\n 2 files changed, 38 insertions(+), 38 deletions(-)","diff":"diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c\nindex b3e489c859ec..4379f1244154 100644\n--- a/net/netfilter/nf_conntrack_proto.c\n+++ b/net/netfilter/nf_conntrack_proto.c\n@@ -125,7 +125,7 @@ void nf_ct_l3proto_module_put(unsigned short l3proto)\n }\n EXPORT_SYMBOL_GPL(nf_ct_l3proto_module_put);\n \n-int nf_ct_netns_get(struct net *net, u8 nfproto)\n+static int nf_ct_netns_do_get(struct net *net, u8 nfproto)\n {\n \tconst struct nf_conntrack_l3proto *l3proto;\n \tint ret;\n@@ -150,9 +150,33 @@ int nf_ct_netns_get(struct net *net, u8 nfproto)\n \n \treturn ret;\n }\n+\n+int nf_ct_netns_get(struct net *net, u8 nfproto)\n+{\n+\tint err;\n+\n+\tif (nfproto == NFPROTO_INET) {\n+\t\terr = nf_ct_netns_do_get(net, NFPROTO_IPV4);\n+\t\tif (err < 0)\n+\t\t\tgoto err1;\n+\t\terr = nf_ct_netns_do_get(net, NFPROTO_IPV6);\n+\t\tif (err < 0)\n+\t\t\tgoto err2;\n+\t} else {\n+\t\terr = nf_ct_netns_do_get(net, nfproto);\n+\t\tif (err < 0)\n+\t\t\tgoto err1;\n+\t}\n+\treturn 0;\n+\n+err2:\n+\tnf_ct_netns_put(net, NFPROTO_IPV4);\n+err1:\n+\treturn err;\n+}\n EXPORT_SYMBOL_GPL(nf_ct_netns_get);\n \n-void nf_ct_netns_put(struct net *net, u8 nfproto)\n+static void nf_ct_netns_do_put(struct net *net, u8 nfproto)\n {\n \tconst struct nf_conntrack_l3proto *l3proto;\n \n@@ -171,6 +195,15 @@ void nf_ct_netns_put(struct net *net, u8 nfproto)\n \n \tnf_ct_l3proto_module_put(nfproto);\n }\n+\n+void nf_ct_netns_put(struct net *net, uint8_t nfproto)\n+{\n+\tif (nfproto == NFPROTO_INET) {\n+\t\tnf_ct_netns_do_put(net, NFPROTO_IPV4);\n+\t\tnf_ct_netns_do_put(net, NFPROTO_IPV6);\n+\t} else\n+\t\tnf_ct_netns_do_put(net, nfproto);\n+}\n EXPORT_SYMBOL_GPL(nf_ct_netns_put);\n \n const struct nf_conntrack_l4proto *\ndiff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c\nindex bd0975d7dd6f..2647b895f4b0 100644\n--- a/net/netfilter/nft_ct.c\n+++ b/net/netfilter/nft_ct.c\n@@ -312,39 +312,6 @@ static const struct nla_policy nft_ct_policy[NFTA_CT_MAX + 1] = {\n \t[NFTA_CT_SREG]\t\t= { .type = NLA_U32 },\n };\n \n-static int nft_ct_netns_get(struct net *net, uint8_t family)\n-{\n-\tint err;\n-\n-\tif (family == NFPROTO_INET) {\n-\t\terr = nf_ct_netns_get(net, NFPROTO_IPV4);\n-\t\tif (err < 0)\n-\t\t\tgoto err1;\n-\t\terr = nf_ct_netns_get(net, NFPROTO_IPV6);\n-\t\tif (err < 0)\n-\t\t\tgoto err2;\n-\t} else {\n-\t\terr = nf_ct_netns_get(net, family);\n-\t\tif (err < 0)\n-\t\t\tgoto err1;\n-\t}\n-\treturn 0;\n-\n-err2:\n-\tnf_ct_netns_put(net, NFPROTO_IPV4);\n-err1:\n-\treturn err;\n-}\n-\n-static void nft_ct_netns_put(struct net *net, uint8_t family)\n-{\n-\tif (family == NFPROTO_INET) {\n-\t\tnf_ct_netns_put(net, NFPROTO_IPV4);\n-\t\tnf_ct_netns_put(net, NFPROTO_IPV6);\n-\t} else\n-\t\tnf_ct_netns_put(net, family);\n-}\n-\n #ifdef CONFIG_NF_CONNTRACK_ZONES\n static void nft_ct_tmpl_put_pcpu(void)\n {\n@@ -489,7 +456,7 @@ static int nft_ct_get_init(const struct nft_ctx *ctx,\n \tif (err < 0)\n \t\treturn err;\n \n-\terr = nft_ct_netns_get(ctx->net, ctx->afi->family);\n+\terr = nf_ct_netns_get(ctx->net, ctx->afi->family);\n \tif (err < 0)\n \t\treturn err;\n \n@@ -583,7 +550,7 @@ static int nft_ct_set_init(const struct nft_ctx *ctx,\n \tif (err < 0)\n \t\tgoto err1;\n \n-\terr = nft_ct_netns_get(ctx->net, ctx->afi->family);\n+\terr = nf_ct_netns_get(ctx->net, ctx->afi->family);\n \tif (err < 0)\n \t\tgoto err1;\n \n@@ -606,7 +573,7 @@ static void nft_ct_set_destroy(const struct nft_ctx *ctx,\n \tstruct nft_ct *priv = nft_expr_priv(expr);\n \n \t__nft_ct_set_destroy(ctx, priv);\n-\tnft_ct_netns_put(ctx->net, ctx->afi->family);\n+\tnf_ct_netns_put(ctx->net, ctx->afi->family);\n }\n \n static int nft_ct_get_dump(struct sk_buff *skb, const struct nft_expr *expr)\n","prefixes":["RFC","WIP","1/5"]}