fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / core / dst.c

diff --git a/net/core/dst.c b/net/core/dst.c
index 9f14ae8..836ec66 100644 (file)
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -19,8 +19,6 @@
 
 #include <net/dst.h>
 
-const char dst_underflow_bug_msg[] = KERN_DEBUG "BUG: dst underflow %d: %p at %p\n";
-
 /* Locking strategy:
  * 1) Garbage collection state of dead destination cache
  *    entries is protected by dst_lock.
@@ -34,19 +32,19 @@ static struct dst_entry     *dst_garbage_list;
 #if RT_CACHE_DEBUG >= 2 
 static atomic_t                         dst_total = ATOMIC_INIT(0);
 #endif
-static spinlock_t               dst_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(dst_lock);
 
 static unsigned long dst_gc_timer_expires;
 static unsigned long dst_gc_timer_inc = DST_GC_MAX;
 static void dst_run_gc(unsigned long);
 static void ___dst_free(struct dst_entry * dst);
 
-static struct timer_list dst_gc_timer =
-       TIMER_INITIALIZER(dst_run_gc, DST_GC_MIN, 0);
+static DEFINE_TIMER(dst_gc_timer, dst_run_gc, DST_GC_MIN, 0);
 
 static void dst_run_gc(unsigned long dummy)
 {
        int    delayed = 0;
+       int    work_performed;
        struct dst_entry * dst, **dstp;
 
        if (!spin_trylock(&dst_lock)) {
@@ -54,9 +52,9 @@ static void dst_run_gc(unsigned long dummy)
                return;
        }
 
-
        del_timer(&dst_gc_timer);
        dstp = &dst_garbage_list;
+       work_performed = 0;
        while ((dst = *dstp) != NULL) {
                if (atomic_read(&dst->__refcnt)) {
                        dstp = &dst->next;
@@ -64,6 +62,7 @@ static void dst_run_gc(unsigned long dummy)
                        continue;
                }
                *dstp = dst->next;
+               work_performed = 1;
 
                dst = dst_destroy(dst);
                if (dst) {
@@ -88,15 +87,19 @@ static void dst_run_gc(unsigned long dummy)
                dst_gc_timer_inc = DST_GC_MAX;
                goto out;
        }
-       if ((dst_gc_timer_expires += dst_gc_timer_inc) > DST_GC_MAX)
-               dst_gc_timer_expires = DST_GC_MAX;
-       dst_gc_timer_inc += DST_GC_INC;
-       dst_gc_timer.expires = jiffies + dst_gc_timer_expires;
+       if (!work_performed) {
+               if ((dst_gc_timer_expires += dst_gc_timer_inc) > DST_GC_MAX)
+                       dst_gc_timer_expires = DST_GC_MAX;
+               dst_gc_timer_inc += DST_GC_INC;
+       } else {
+               dst_gc_timer_inc = DST_GC_INC;
+               dst_gc_timer_expires = DST_GC_MIN;
+       }
 #if RT_CACHE_DEBUG >= 2
        printk("dst_total: %d/%d %ld\n",
               atomic_read(&dst_total), delayed,  dst_gc_timer_expires);
 #endif
-       add_timer(&dst_gc_timer);
+       mod_timer(&dst_gc_timer, jiffies + dst_gc_timer_expires);
 
 out:
        spin_unlock(&dst_lock);
@@ -108,9 +111,9 @@ static int dst_discard_in(struct sk_buff *skb)
        return 0;
 }
 
-static int dst_discard_out(struct sk_buff **pskb)
+static int dst_discard_out(struct sk_buff *skb)
 {
-       kfree_skb(*pskb);
+       kfree_skb(skb);
        return 0;
 }
 
@@ -122,7 +125,7 @@ void * dst_alloc(struct dst_ops * ops)
                if (ops->gc())
                        return NULL;
        }
-       dst = kmem_cache_alloc(ops->kmem_cachep, SLAB_ATOMIC);
+       dst = kmem_cache_alloc(ops->kmem_cachep, GFP_ATOMIC);
        if (!dst)
                return NULL;
        memset(dst, 0, ops->entry_size);
@@ -171,6 +174,8 @@ struct dst_entry *dst_destroy(struct dst_entry * dst)
        struct neighbour *neigh;
        struct hh_cache *hh;
 
+       smp_rmb();
+
 again:
        neigh = dst->neighbour;
        hh = dst->hh;
@@ -198,13 +203,15 @@ again:
 
        dst = child;
        if (dst) {
+               int nohash = dst->flags & DST_NOHASH;
+
                if (atomic_dec_and_test(&dst->__refcnt)) {
                        /* We were real parent of this dst, so kill child. */
-                       if (dst->flags&DST_NOHASH)
+                       if (nohash)
                                goto again;
                } else {
                        /* Child is still referenced, return it for freeing. */
-                       if (dst->flags&DST_NOHASH)
+                       if (nohash)
                                return dst;
                        /* Child is still in his hash table */
                }
@@ -220,31 +227,28 @@ again:
  *
  * Commented and originally written by Alexey.
  */
-static void dst_ifdown(struct dst_entry *dst, int unregister)
+static inline void dst_ifdown(struct dst_entry *dst, struct net_device *dev,
+                             int unregister)
 {
-       struct net_device *dev = dst->dev;
+       if (dst->ops->ifdown)
+               dst->ops->ifdown(dst, dev, unregister);
+
+       if (dev != dst->dev)
+               return;
 
        if (!unregister) {
                dst->input = dst_discard_in;
                dst->output = dst_discard_out;
-       }
-
-       do {
-               if (unregister) {
-                       dst->dev = &loopback_dev;
-                       dev_hold(&loopback_dev);
+       } else {
+               dst->dev = &loopback_dev;
+               dev_hold(&loopback_dev);
+               dev_put(dev);
+               if (dst->neighbour && dst->neighbour->dev == dev) {
+                       dst->neighbour->dev = &loopback_dev;
                        dev_put(dev);
-                       if (dst->neighbour && dst->neighbour->dev == dev) {
-                               dst->neighbour->dev = &loopback_dev;
-                               dev_put(dev);
-                               dev_hold(&loopback_dev);
-                       }
+                       dev_hold(&loopback_dev);
                }
-
-               if (dst->ops->ifdown)
-                       dst->ops->ifdown(dst, unregister);
-       } while ((dst = dst->child) && dst->flags & DST_NOHASH &&
-                dst->dev == dev);
+       }
 }
 
 static int dst_dev_event(struct notifier_block *this, unsigned long event, void *ptr)
@@ -257,8 +261,7 @@ static int dst_dev_event(struct notifier_block *this, unsigned long event, void
        case NETDEV_DOWN:
                spin_lock_bh(&dst_lock);
                for (dst = dst_garbage_list; dst; dst = dst->next) {
-                       if (dst->dev == dev)
-                               dst_ifdown(dst, event != NETDEV_DOWN);
+                       dst_ifdown(dst, dev, event != NETDEV_DOWN);
                }
                spin_unlock_bh(&dst_lock);
                break;
@@ -266,7 +269,7 @@ static int dst_dev_event(struct notifier_block *this, unsigned long event, void
        return NOTIFY_DONE;
 }
 
-struct notifier_block dst_dev_notifier = {
+static struct notifier_block dst_dev_notifier = {
        .notifier_call  = dst_dev_event,
 };
 
@@ -275,7 +278,6 @@ void __init dst_init(void)
        register_netdevice_notifier(&dst_dev_notifier);
 }
 
-EXPORT_SYMBOL(dst_underflow_bug_msg);
 EXPORT_SYMBOL(__dst_free);
 EXPORT_SYMBOL(dst_alloc);
 EXPORT_SYMBOL(dst_destroy);