From patchwork Sat Nov 7 00:06:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarno Rajahalme X-Patchwork-Id: 541166 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8E43F1402BF for ; Sat, 7 Nov 2015 11:06:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nicira_com.20150623.gappssmtp.com header.i=@nicira_com.20150623.gappssmtp.com header.b=sn5x2IFn; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932318AbbKGAGV (ORCPT ); Fri, 6 Nov 2015 19:06:21 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:34894 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753331AbbKGAGS (ORCPT ); Fri, 6 Nov 2015 19:06:18 -0500 Received: by pasz6 with SMTP id z6so141368226pas.2 for ; Fri, 06 Nov 2015 16:06:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nicira_com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VjwJM9mrp9ZJYboxRpXSfNw8iVM8OL6Kp3WvUGNBP+k=; b=sn5x2IFneo9lH6nxMcZxu35e3L0gBE4NpEOZcX5lmw59LGUuXzblMavy681ht0D5La t3dsKInz2+QMtkrXU+yNQx/HDBwPFeiobew5fwe1heUyCuVVrtcf8YEZ+NyRKreEALjO bvDujII3LE7hmYw5WiFsvc2Hg/7msZiizXGXdAw+A2DAkKwYDtJak3LSpBjxV0fXwpLY mSEbQTxqQFuAe/wOBfQKLCQNkzj977kSXH2cykXbOIfSrewslAjdcnttDFew8QFpURsZ 2JNOuivfrciIMJviSKxtxMfGZ484+eZJuPO9WF8+7/HIi97UmmIcrvB0ecgQ1YesXXOS LHEw== 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:in-reply-to :references; bh=VjwJM9mrp9ZJYboxRpXSfNw8iVM8OL6Kp3WvUGNBP+k=; b=XUzujHO4JkAbA+5drPKL0SjAbRny5cNTF/MlCav+Tz4QeFtUSFqcJ44fN8Gf5gzrzf D8d0WpaVujVUVRKw6QaalASBFcozDsDCTCvjUAHQ0WvPfMXFb4b2sBfbKrbZ5MFuSCKB 26Ck6Z07WGflW8JCcU3pxIRvPr3InQmGu6vvaRdZ72wm66jywXaE2JrGRIlb5WKYnr/q 29z0XLnsZLpneR8qO0TnWGDUjGLbfFhCI34q5QfOGojlXfyTwyJhIxhzAwHDco267JLG vQH52KSTqXpvWFr95LkjTqlmcF8DKUxtJlbhc8oQ6lu3qu65LMhqERGUeIgHBsKejO0u 7AYw== X-Gm-Message-State: ALoCoQlGX6zTFf9s67PtjgJqP8HMUh4QzT7x7nBJvBM4+8aTWIF5bG3BEPU0HwxN3+fqw3b3AEjj X-Received: by 10.66.158.234 with SMTP id wx10mr21806595pab.72.1446854777579; Fri, 06 Nov 2015 16:06:17 -0800 (PST) Received: from sc9-mailhost3.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id l16sm2160090pbq.22.2015.11.06.16.06.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Nov 2015 16:06:17 -0800 (PST) From: Jarno Rajahalme To: netdev@vger.kernel.org Cc: netfilter-devel@vger.kernel.org, dev@openvswitch.org, jrajahalme@nicira.com Subject: [RFC PATCH net-next v2 2/8] netfilter: Factor out nf_ct_get_info(). Date: Fri, 6 Nov 2015 16:06:02 -0800 Message-Id: <1446854768-38299-3-git-send-email-jrajahalme@nicira.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1446854768-38299-1-git-send-email-jrajahalme@nicira.com> References: <1446854768-38299-1-git-send-email-jrajahalme@nicira.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Define a new inline function to map conntrack status to enum ip_conntrack_info. This removes the need to otherwise duplicate this code in a later patch ("openvswitch: Find existing conntrack entry after upcall."). Signed-off-by: Jarno Rajahalme --- include/net/netfilter/nf_conntrack.h | 15 +++++++++++++++ net/netfilter/nf_conntrack_core.c | 22 +++------------------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index fde4068..b3de10e 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -125,6 +125,21 @@ nf_ct_tuplehash_to_ctrack(const struct nf_conntrack_tuple_hash *hash) tuplehash[hash->tuple.dst.dir]); } +static inline enum ip_conntrack_info +nf_ct_get_info(const struct nf_conntrack_tuple_hash *h) +{ + const struct nf_conn *ct = nf_ct_tuplehash_to_ctrack(h); + + if (NF_CT_DIRECTION(h) == IP_CT_DIR_REPLY) + return IP_CT_ESTABLISHED_REPLY; + /* Once we've had two way comms, always ESTABLISHED. */ + if (test_bit(IPS_SEEN_REPLY_BIT, &ct->status)) + return IP_CT_ESTABLISHED; + if (test_bit(IPS_EXPECTED_BIT, &ct->status)) + return IP_CT_RELATED; + return IP_CT_NEW; +} + static inline u_int16_t nf_ct_l3num(const struct nf_conn *ct) { return ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num; diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 3cb3cb8..70ddbd8 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1056,25 +1056,9 @@ resolve_normal_ct(struct net *net, struct nf_conn *tmpl, ct = nf_ct_tuplehash_to_ctrack(h); /* It exists; we have (non-exclusive) reference. */ - if (NF_CT_DIRECTION(h) == IP_CT_DIR_REPLY) { - *ctinfo = IP_CT_ESTABLISHED_REPLY; - /* Please set reply bit if this packet OK */ - *set_reply = 1; - } else { - /* Once we've had two way comms, always ESTABLISHED. */ - if (test_bit(IPS_SEEN_REPLY_BIT, &ct->status)) { - pr_debug("nf_conntrack_in: normal packet for %p\n", ct); - *ctinfo = IP_CT_ESTABLISHED; - } else if (test_bit(IPS_EXPECTED_BIT, &ct->status)) { - pr_debug("nf_conntrack_in: related packet for %p\n", - ct); - *ctinfo = IP_CT_RELATED; - } else { - pr_debug("nf_conntrack_in: new packet for %p\n", ct); - *ctinfo = IP_CT_NEW; - } - *set_reply = 0; - } + *ctinfo = nf_ct_get_info(h); + *set_reply = NF_CT_DIRECTION(h) == IP_CT_DIR_REPLY; + skb->nfct = &ct->ct_general; skb->nfctinfo = *ctinfo; return ct;