From patchwork Fri Jul 31 23:50:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 502762 X-Patchwork-Delegate: fw@strlen.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E71781402A7 for ; Sat, 1 Aug 2015 09:50:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752596AbbGaXuj (ORCPT ); Fri, 31 Jul 2015 19:50:39 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:34636 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751639AbbGaXui (ORCPT ); Fri, 31 Jul 2015 19:50:38 -0400 Received: by pacan13 with SMTP id an13so48853034pac.1 for ; Fri, 31 Jul 2015 16:50:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3cvyLhCR16TdOrBPkvflVkDTasOhLv6h7J4rsv0IRGY=; b=dsrELnU4fJ+2bvCeB14QQ0h+fBtDgCRKc6uD4Qc8INV0hIHexeNSU+H1W1zXE52i+W A/GAxPmHaQStJUSUqUP/odPOFP3EqQ2gQvajz3u9BLL62zmOsxLms3ybawhBeVDx2+lN VttT3sG4snKgr0JMF5C78lrgYBWZK3nf0f5JfvodhqUGSeN5wDLYFZG0jDYfyLl4Phd7 j1BXnVz910x5QxpMQGnS5VXdbYkxM4f9slyWCrsm1i4a1BGJOiDsnhFNDPZtsVZhce8I kcb2BfkrpdB4oVAn+iThYZ8M0ltuhJuWJPJc/XutZ80ARX4Nfclm+OhaNEixuRslbEls 3QOA== X-Gm-Message-State: ALoCoQkLwOLoHt5xhZLXKv1y8FWSf8c1gPRbKtTsrQZPZQ8zA69Cl6xVC0EV6iPV082bIdiPokYf X-Received: by 10.66.174.174 with SMTP id bt14mr12425418pac.109.1438386637906; Fri, 31 Jul 2015 16:50:37 -0700 (PDT) Received: from localhost.localdomain ([208.91.2.4]) by smtp.gmail.com with ESMTPSA id ow5sm9649347pdb.30.2015.07.31.16.50.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 31 Jul 2015 16:50:37 -0700 (PDT) From: Joe Stringer To: pablo@netfilter.org Cc: fw@strlen.de, netfilter-devel@vger.kernel.org Subject: [PATCH nf-next] netfilter: connlabels: Export setting connlabel length Date: Fri, 31 Jul 2015 16:50:24 -0700 Message-Id: <1438386624-52057-1-git-send-email-joestringer@nicira.com> X-Mailer: git-send-email 2.1.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Add functions to change connlabel length into nf_conntrack_labels.c so they may be reused by other modules like OVS and nftables without needing to jump through xt_match_check() hoops. Suggested-by: Florian Westphal Signed-off-by: Joe Stringer --- include/net/netfilter/nf_conntrack_labels.h | 4 ++++ net/netfilter/nf_conntrack_labels.c | 24 ++++++++++++++++++++++++ net/netfilter/xt_connlabel.c | 15 ++------------- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/include/net/netfilter/nf_conntrack_labels.h b/include/net/netfilter/nf_conntrack_labels.h index dec6336..7e2b1d0 100644 --- a/include/net/netfilter/nf_conntrack_labels.h +++ b/include/net/netfilter/nf_conntrack_labels.h @@ -54,7 +54,11 @@ int nf_connlabels_replace(struct nf_conn *ct, #ifdef CONFIG_NF_CONNTRACK_LABELS int nf_conntrack_labels_init(void); void nf_conntrack_labels_fini(void); +int nf_connlabels_get(struct net *net, unsigned int n_bits); +void nf_connlabels_put(struct net *net); #else static inline int nf_conntrack_labels_init(void) { return 0; } static inline void nf_conntrack_labels_fini(void) {} +static inline int nf_connlabels_get(struct net *net, unsigned int n_bits) { return 0; } +static inline void nf_connlabels_put(struct net *net) {} #endif diff --git a/net/netfilter/nf_conntrack_labels.c b/net/netfilter/nf_conntrack_labels.c index bb53f12..00df4e71 100644 --- a/net/netfilter/nf_conntrack_labels.c +++ b/net/netfilter/nf_conntrack_labels.c @@ -91,6 +91,30 @@ int nf_connlabels_replace(struct nf_conn *ct, EXPORT_SYMBOL_GPL(nf_connlabels_replace); #endif +int nf_connlabels_get(struct net *net, unsigned int n_bits) +{ + size_t words; + + if (n_bits > XT_CONNLABEL_MAXBIT + 1) + return -ERANGE; + + net->ct.labels_used++; + words = BITS_TO_LONGS(n_bits); + if (words > net->ct.label_words) + net->ct.label_words = words; + + return 0; +} +EXPORT_SYMBOL_GPL(nf_connlabels_get); + +void nf_connlabels_put(struct net *net) +{ + net->ct.labels_used--; + if (net->ct.labels_used == 0) + net->ct.label_words = 0; +} +EXPORT_SYMBOL_GPL(nf_connlabels_put); + static struct nf_ct_ext_type labels_extend __read_mostly = { .len = sizeof(struct nf_conn_labels), .align = __alignof__(struct nf_conn_labels), diff --git a/net/netfilter/xt_connlabel.c b/net/netfilter/xt_connlabel.c index 9f8719d..f8bb936 100644 --- a/net/netfilter/xt_connlabel.c +++ b/net/netfilter/xt_connlabel.c @@ -42,10 +42,6 @@ static int connlabel_mt_check(const struct xt_mtchk_param *par) XT_CONNLABEL_OP_SET; struct xt_connlabel_mtinfo *info = par->matchinfo; int ret; - size_t words; - - if (info->bit > XT_CONNLABEL_MAXBIT) - return -ERANGE; if (info->options & ~options) { pr_err("Unknown options in mask %x\n", info->options); @@ -59,19 +55,12 @@ static int connlabel_mt_check(const struct xt_mtchk_param *par) return ret; } - par->net->ct.labels_used++; - words = BITS_TO_LONGS(info->bit+1); - if (words > par->net->ct.label_words) - par->net->ct.label_words = words; - - return ret; + return nf_connlabels_get(par->net, info->bit + 1); } static void connlabel_mt_destroy(const struct xt_mtdtor_param *par) { - par->net->ct.labels_used--; - if (par->net->ct.labels_used == 0) - par->net->ct.label_words = 0; + nf_connlabels_put(par->net); nf_ct_l3proto_module_put(par->family); }