datapath: Delay conntrack helper call for new connections.

Upstream commit:
    commit 28b6e0c1ace45779c60e7cefe6d469b7ecb520b8
    Author: Jarno Rajahalme <jarno@ovn.org>
    Date:   Thu Mar 10 10:54:22 2016 -0800

    openvswitch: Delay conntrack helper call for new connections.

    There is no need to help connections that are not confirmed, so we can
    delay helping new connections to the time when they are confirmed.
    This change is needed for NAT support, and having this as a separate
    patch will make the following NAT patch a bit easier to review.

    Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
    Acked-by: Joe Stringer <joe@ovn.org>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Jesse Gross <jesse@kernel.org>

diff --git a/datapath/conntrack.c b/datapath/conntrack.c
index 41fbab2..7d67296 100644 (file)
--- a/datapath/conntrack.c
+++ b/datapath/conntrack.c
@@ -495,7 +495,11 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
         * actually run the packet through conntrack twice unless it's for a
         * different zone.
         */
-       if (!skb_nfct_cached(net, key, info, skb)) {
+       bool cached = skb_nfct_cached(net, key, info, skb);
+       enum ip_conntrack_info ctinfo;
+       struct nf_conn *ct;
+
+       if (!cached) {
                struct nf_conn *tmpl = info->ct;
                int err;
 
@@ -518,11 +522,18 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
                        return -ENOENT;
 
                ovs_ct_update_key(skb, info, key, true);
+       }
 
-               if (ovs_ct_helper(skb, info->family) != NF_ACCEPT) {
-                       WARN_ONCE(1, "helper rejected packet");
-                       return -EINVAL;
-               }
+       /* Call the helper only if:
+        * - nf_conntrack_in() was executed above ("!cached") for a confirmed
+        *   connection, or
+        * - When committing an unconfirmed connection.
+        */
+       ct = nf_ct_get(skb, &ctinfo);
+       if (ct && (nf_ct_is_confirmed(ct) ? !cached : info->commit) &&
+           ovs_ct_helper(skb, info->family) != NF_ACCEPT) {
+               WARN_ONCE(1, "helper rejected packet");
+               return -EINVAL;
        }
 
        return 0;