xnu-1228.12.14.tar.gz

[apple/xnu.git] / bsd / netinet / ip_flow.c

diff --git a/bsd/netinet/ip_flow.c b/bsd/netinet/ip_flow.c
index ad1ed394f9c444bf63380bc873467944d638c7d6..4fb3f8596b3a9caf6ef176203a0adaa98c6d420d 100644 (file)
--- a/bsd/netinet/ip_flow.c
+++ b/bsd/netinet/ip_flow.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000,2007 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -72,6 +72,7 @@
 #include <sys/kernel.h>
 
 #include <sys/sysctl.h>
 #include <sys/kernel.h>
 
 #include <sys/sysctl.h>

+#include <libkern/OSAtomic.h>

 
 #include <net/if.h>
 #include <net/route.h>
 
 #include <net/if.h>
 #include <net/route.h>


@@ -218,24 +219,21 @@ ipflow_addstats(
        struct ipflow *ipf)
 {
        ipf->ipf_ro.ro_rt->rt_use += ipf->ipf_uses;
        struct ipflow *ipf)
 {
        ipf->ipf_ro.ro_rt->rt_use += ipf->ipf_uses;

-       ipstat.ips_cantforward += ipf->ipf_errors + ipf->ipf_dropped;
-       ipstat.ips_forward += ipf->ipf_uses;
-       ipstat.ips_fastforward += ipf->ipf_uses;
+       OSAddAtomic(ipf->ipf_errors + ipf->ipf_dropped, (SInt32*)&ipstat.ips_cantforward);
+       OSAddAtomic(ipf->ipf_uses, (SInt32*)&ipstat.ips_forward);
+       OSAddAtomic(ipf->ipf_uses, (SInt32*)&ipstat.ips_fastforward);

 }
 
 static void
 ipflow_free(
        struct ipflow *ipf)
 {
 }
 
 static void
 ipflow_free(
        struct ipflow *ipf)
 {

-       int s;

        /*
         * Remove the flow from the hash table (at elevated IPL).
         * Once it's off the list, we can deal with it at normal
         * network IPL.
         */
        /*
         * Remove the flow from the hash table (at elevated IPL).
         * Once it's off the list, we can deal with it at normal
         * network IPL.
         */

-       s = splimp();

        LIST_REMOVE(ipf, ipf_next);
        LIST_REMOVE(ipf, ipf_next);

-       splx(s);

        ipflow_addstats(ipf);
        rtfree(ipf->ipf_ro.ro_rt);
        ipflow_inuse--;
        ipflow_addstats(ipf);
        rtfree(ipf->ipf_ro.ro_rt);
        ipflow_inuse--;


@@ -248,7 +246,6 @@ ipflow_reap(
 {
        struct ipflow *ipf, *maybe_ipf = NULL;
        int idx;
 {
        struct ipflow *ipf, *maybe_ipf = NULL;
        int idx;

-       int s;

 
        for (idx = 0; idx < IPFLOW_HASHSIZE; idx++) {
                ipf = LIST_FIRST(&ipflows[idx]);
 
        for (idx = 0; idx < IPFLOW_HASHSIZE; idx++) {
                ipf = LIST_FIRST(&ipflows[idx]);


@@ -279,14 +276,13 @@ ipflow_reap(
        /*
         * Remove the entry from the flow table.
         */
        /*
         * Remove the entry from the flow table.
         */

-       s = splimp();

        LIST_REMOVE(ipf, ipf_next);
        LIST_REMOVE(ipf, ipf_next);

-       splx(s);

        ipflow_addstats(ipf);
        rtfree(ipf->ipf_ro.ro_rt);
        ipflow_addstats(ipf);
        rtfree(ipf->ipf_ro.ro_rt);

+       ipf->ipf_ro.ro_rt = NULL;

        return ipf;
 }
        return ipf;
 }

-
+/* note: called under the ip_mutex lock */

 void
 ipflow_slowtimo(
        void)
 void
 ipflow_slowtimo(
        void)


@@ -303,6 +299,8 @@ ipflow_slowtimo(
                        } else {
                                ipf->ipf_last_uses = ipf->ipf_uses;
                                ipf->ipf_ro.ro_rt->rt_use += ipf->ipf_uses;
                        } else {
                                ipf->ipf_last_uses = ipf->ipf_uses;
                                ipf->ipf_ro.ro_rt->rt_use += ipf->ipf_uses;

+                               OSAddAtomic(ipf->ipf_uses, (SInt32*)&ipstat.ips_forward);
+                               OSAddAtomic(ipf->ipf_uses, (SInt32*)&ipstat.ips_fastforward);

                                ipstat.ips_forward += ipf->ipf_uses;
                                ipstat.ips_fastforward += ipf->ipf_uses;
                                ipf->ipf_uses = 0;
                                ipstat.ips_forward += ipf->ipf_uses;
                                ipstat.ips_fastforward += ipf->ipf_uses;
                                ipf->ipf_uses = 0;


@@ -320,7 +318,6 @@ ipflow_create(
        const struct ip *const ip = mtod(m, struct ip *);
        struct ipflow *ipf;
        unsigned hash;
        const struct ip *const ip = mtod(m, struct ip *);
        struct ipflow *ipf;
        unsigned hash;

-       int s;

 
        /*
         * Don't create cache entries for ICMP messages.
 
        /*
         * Don't create cache entries for ICMP messages.


@@ -345,11 +342,10 @@ ipflow_create(
                }
                bzero((caddr_t) ipf, sizeof(*ipf));
        } else {
                }
                bzero((caddr_t) ipf, sizeof(*ipf));
        } else {

-               s = splimp();

                LIST_REMOVE(ipf, ipf_next);
                LIST_REMOVE(ipf, ipf_next);

-               splx(s);

                ipflow_addstats(ipf);
                rtfree(ipf->ipf_ro.ro_rt);
                ipflow_addstats(ipf);
                rtfree(ipf->ipf_ro.ro_rt);

+               ipf->ipf_ro.ro_rt = NULL;

                ipf->ipf_uses = ipf->ipf_last_uses = 0;
                ipf->ipf_errors = ipf->ipf_dropped = 0;
        }
                ipf->ipf_uses = ipf->ipf_last_uses = 0;
                ipf->ipf_errors = ipf->ipf_dropped = 0;
        }


@@ -357,8 +353,10 @@ ipflow_create(
        /*
         * Fill in the updated information.
         */
        /*
         * Fill in the updated information.
         */

+       lck_mtx_lock(rt_mtx);

        ipf->ipf_ro = *ro;
        ipf->ipf_ro = *ro;

-       rtref(ro->ro_rt);               //### LD 5/25/04 needs rt_mtx lock
+       rtref(ro->ro_rt);
+       lck_mtx_unlock(rt_mtx);

        ipf->ipf_dst = ip->ip_dst;
        ipf->ipf_src = ip->ip_src;
        ipf->ipf_tos = ip->ip_tos;
        ipf->ipf_dst = ip->ip_dst;
        ipf->ipf_src = ip->ip_src;
        ipf->ipf_tos = ip->ip_tos;


@@ -367,7 +365,5 @@ ipflow_create(
         * Insert into the approriate bucket of the flow table.
         */
        hash = ipflow_hash(ip->ip_dst, ip->ip_src, ip->ip_tos);
         * Insert into the approriate bucket of the flow table.
         */
        hash = ipflow_hash(ip->ip_dst, ip->ip_src, ip->ip_tos);

-       s = splimp();

        LIST_INSERT_HEAD(&ipflows[hash], ipf, ipf_next);
        LIST_INSERT_HEAD(&ipflows[hash], ipf, ipf_next);

-       splx(s);

 }
 }