Merge branches 'release', 'misc' and 'misc-2.6.25' into release

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / inet_fragment.c

diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index 4fec0b911f856ea047d60884dd1a1252bbea17c8..724d69aed031974234501ff024852b7a55ea1810 100644 (file)
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -47,7 +47,7 @@ static void inet_frag_secret_rebuild(unsigned long dummy)
        }
        write_unlock(&f->lock);
 
-       mod_timer(&f->secret_timer, now + f->ctl->secret_interval);
+       mod_timer(&f->secret_timer, now + f->secret_interval);
 }
 
 void inet_frags_init(struct inet_frags *f)
@@ -57,17 +57,14 @@ void inet_frags_init(struct inet_frags *f)
        for (i = 0; i < INETFRAGS_HASHSZ; i++)
                INIT_HLIST_HEAD(&f->hash[i]);
 
-       INIT_LIST_HEAD(&f->lru_list);
        rwlock_init(&f->lock);
 
        f->rnd = (u32) ((num_physpages ^ (num_physpages>>7)) ^
                                   (jiffies ^ (jiffies >> 6)));
 
-       atomic_set(&f->mem, 0);
-
        setup_timer(&f->secret_timer, inet_frag_secret_rebuild,
                        (unsigned long)f);
-       f->secret_timer.expires = jiffies + f->ctl->secret_interval;
+       f->secret_timer.expires = jiffies + f->secret_interval;
        add_timer(&f->secret_timer);
 }
 EXPORT_SYMBOL(inet_frags_init);
@@ -75,6 +72,8 @@ EXPORT_SYMBOL(inet_frags_init);
 void inet_frags_init_net(struct netns_frags *nf)
 {
        nf->nqueues = 0;
+       atomic_set(&nf->mem, 0);
+       INIT_LIST_HEAD(&nf->lru_list);
 }
 EXPORT_SYMBOL(inet_frags_init_net);
 
@@ -84,6 +83,13 @@ void inet_frags_fini(struct inet_frags *f)
 }
 EXPORT_SYMBOL(inet_frags_fini);
 
+void inet_frags_exit_net(struct netns_frags *nf, struct inet_frags *f)
+{
+       nf->low_thresh = 0;
+       inet_frag_evictor(nf, f);
+}
+EXPORT_SYMBOL(inet_frags_exit_net);
+
 static inline void fq_unlink(struct inet_frag_queue *fq, struct inet_frags *f)
 {
        write_lock(&f->lock);
@@ -107,13 +113,13 @@ void inet_frag_kill(struct inet_frag_queue *fq, struct inet_frags *f)
 
 EXPORT_SYMBOL(inet_frag_kill);
 
-static inline void frag_kfree_skb(struct inet_frags *f, struct sk_buff *skb,
-                                               int *work)
+static inline void frag_kfree_skb(struct netns_frags *nf, struct inet_frags *f,
+               struct sk_buff *skb, int *work)
 {
        if (work)
                *work -= skb->truesize;
 
-       atomic_sub(skb->truesize, &f->mem);
+       atomic_sub(skb->truesize, &nf->mem);
        if (f->skb_free)
                f->skb_free(skb);
        kfree_skb(skb);
@@ -123,22 +129,24 @@ void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f,
                                        int *work)
 {
        struct sk_buff *fp;
+       struct netns_frags *nf;
 
        BUG_TRAP(q->last_in & COMPLETE);
        BUG_TRAP(del_timer(&q->timer) == 0);
 
        /* Release all fragment data. */
        fp = q->fragments;
+       nf = q->net;
        while (fp) {
                struct sk_buff *xp = fp->next;
 
-               frag_kfree_skb(f, fp, work);
+               frag_kfree_skb(nf, f, fp, work);
                fp = xp;
        }
 
        if (work)
                *work -= f->qsize;
-       atomic_sub(f->qsize, &f->mem);
+       atomic_sub(f->qsize, &nf->mem);
 
        if (f->destructor)
                f->destructor(q);
@@ -147,20 +155,20 @@ void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f,
 }
 EXPORT_SYMBOL(inet_frag_destroy);
 
-int inet_frag_evictor(struct inet_frags *f)
+int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f)
 {
        struct inet_frag_queue *q;
        int work, evicted = 0;
 
-       work = atomic_read(&f->mem) - f->ctl->low_thresh;
+       work = atomic_read(&nf->mem) - nf->low_thresh;
        while (work > 0) {
                read_lock(&f->lock);
-               if (list_empty(&f->lru_list)) {
+               if (list_empty(&nf->lru_list)) {
                        read_unlock(&f->lock);
                        break;
                }
 
-               q = list_first_entry(&f->lru_list,
+               q = list_first_entry(&nf->lru_list,
                                struct inet_frag_queue, lru_list);
                atomic_inc(&q->refcnt);
                read_unlock(&f->lock);
@@ -205,12 +213,12 @@ static struct inet_frag_queue *inet_frag_intern(struct netns_frags *nf,
        }
 #endif
        qp = qp_in;
-       if (!mod_timer(&qp->timer, jiffies + f->ctl->timeout))
+       if (!mod_timer(&qp->timer, jiffies + nf->timeout))
                atomic_inc(&qp->refcnt);
 
        atomic_inc(&qp->refcnt);
        hlist_add_head(&qp->list, &f->hash[hash]);
-       list_add_tail(&qp->lru_list, &f->lru_list);
+       list_add_tail(&qp->lru_list, &nf->lru_list);
        nf->nqueues++;
        write_unlock(&f->lock);
        return qp;
@@ -226,7 +234,7 @@ static struct inet_frag_queue *inet_frag_alloc(struct netns_frags *nf,
                return NULL;
 
        f->constructor(q, arg);
-       atomic_add(f->qsize, &f->mem);
+       atomic_add(f->qsize, &nf->mem);
        setup_timer(&q->timer, f->frag_expire, (unsigned long)q);
        spin_lock_init(&q->lock);
        atomic_set(&q->refcnt, 1);