This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / ipv4 / netfilter / ip_conntrack_core.c

diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
index a3d6247..c96655b 100644 (file)
--- a/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -62,6 +62,7 @@ DECLARE_RWLOCK(ip_conntrack_expect_tuple_lock);
 
 /* ip_conntrack_standalone needs this */
 atomic_t ip_conntrack_count = ATOMIC_INIT(0);
+EXPORT_SYMBOL(ip_conntrack_count);
 
 void (*ip_conntrack_destroyed)(struct ip_conntrack *conntrack) = NULL;
 LIST_HEAD(ip_conntrack_expect_list);
@@ -315,7 +316,6 @@ destroy_conntrack(struct nf_conntrack *nfct)
                }
                kmem_cache_free(ip_conntrack_expect_cachep, ct->master);
        }
-       CONNTRACK_STAT_INC(delete);
        WRITE_UNLOCK(&ip_conntrack_lock);
 
        if (master)
@@ -324,16 +324,16 @@ destroy_conntrack(struct nf_conntrack *nfct)
        DEBUGP("destroy_conntrack: returning ct=%p to slab\n", ct);
        kmem_cache_free(ip_conntrack_cachep, ct);
        atomic_dec(&ip_conntrack_count);
+       CONNTRACK_STAT_INC(delete);
 }
 
 static void death_by_timeout(unsigned long ul_conntrack)
 {
        struct ip_conntrack *ct = (void *)ul_conntrack;
 
-       WRITE_LOCK(&ip_conntrack_lock);
-       /* Inside lock so preempt is disabled on module removal path.
-        * Otherwise we can get spurious warnings. */
        CONNTRACK_STAT_INC(delete_list);
+
+       WRITE_LOCK(&ip_conntrack_lock);
        clean_from_lists(ct);
        WRITE_UNLOCK(&ip_conntrack_lock);
        ip_conntrack_put(ct);
@@ -355,14 +355,16 @@ __ip_conntrack_find(const struct ip_conntrack_tuple *tuple,
 {
        struct ip_conntrack_tuple_hash *h;
        unsigned int hash = hash_conntrack(tuple);
+       /* use per_cpu() to avoid multiple calls to smp_processor_id() */
+       unsigned int cpu = smp_processor_id();
 
        MUST_BE_READ_LOCKED(&ip_conntrack_lock);
        list_for_each_entry(h, &ip_conntrack_hash[hash], list) {
                if (conntrack_tuple_cmp(h, tuple, ignored_conntrack)) {
-                       CONNTRACK_STAT_INC(found);
+                       per_cpu(ip_conntrack_stat, cpu).found++;
                        return h;
                }
-               CONNTRACK_STAT_INC(searched);
+               per_cpu(ip_conntrack_stat, cpu).searched++;
        }
 
        return NULL;
@@ -437,14 +439,13 @@ __ip_conntrack_confirm(struct sk_buff *skb)
                add_timer(&ct->timeout);
                atomic_inc(&ct->ct_general.use);
                set_bit(IPS_CONFIRMED_BIT, &ct->status);
-               CONNTRACK_STAT_INC(insert);
                WRITE_UNLOCK(&ip_conntrack_lock);
+               CONNTRACK_STAT_INC(insert);
                return NF_ACCEPT;
        }
 
-       CONNTRACK_STAT_INC(insert_failed);
        WRITE_UNLOCK(&ip_conntrack_lock);
-
+       CONNTRACK_STAT_INC(insert_failed);
        return NF_DROP;
 }
 
@@ -602,9 +603,6 @@ init_conntrack(const struct ip_conntrack_tuple *tuple,
                __set_bit(IPS_EXPECTED_BIT, &conntrack->status);
                conntrack->master = expected;
                expected->sibling = conntrack;
-#if CONFIG_IP_NF_CONNTRACK_MARK
-               conntrack->mark = expected->expectant->mark;
-#endif
                LIST_DELETE(&ip_conntrack_expect_list, expected);
                expected->expectant->expecting--;
                nf_conntrack_get(&master_ct(conntrack)->ct_general);