[NETNS][FRAGS]: Make the nqueues counter per-namespace.

This is simple - just move the variable from struct inet_frags
to struct netns_frags and adjust the usage appropriately.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index 8ab6df64a12adce419ad93c757be81902d9f4f47..d36f3a6e6d4eb35bd24461c86906a0710f34c4da 100644 (file)
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -2,6 +2,7 @@
 #define __NET_FRAG_H__
 
 struct netns_frags {
+       int                     nqueues;
 };
 
 struct inet_frag_queue {
@@ -36,7 +37,6 @@ struct inet_frags {
        struct hlist_head       hash[INETFRAGS_HASHSZ];
        rwlock_t                lock;
        u32                     rnd;
-       int                     nqueues;
        int                     qsize;
        atomic_t                mem;
        struct timer_list       secret_timer;
@@ -55,6 +55,8 @@ struct inet_frags {
 void inet_frags_init(struct inet_frags *);
 void inet_frags_fini(struct inet_frags *);
 
+void inet_frags_init_net(struct netns_frags *nf);
+
 void inet_frag_kill(struct inet_frag_queue *q, struct inet_frags *f);
 void inet_frag_destroy(struct inet_frag_queue *q,
                                struct inet_frags *f, int *work);

diff --git a/include/net/ip.h b/include/net/ip.h
index 9d43ac222d1507195905c04ecbc76f4569c8c4c8..fbe28308bf739e52d8d3dcd968e9979ed37776b6 100644 (file)
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -332,7 +332,7 @@ enum ip_defrag_users
 
 int ip_defrag(struct sk_buff *skb, u32 user);
 int ip_frag_mem(void);
-int ip_frag_nqueues(void);
+int ip_frag_nqueues(struct net *net);
 
 /*
  *     Functions provided by ip_forward.c

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 87ca1bf17d711e54b1278ed488ac7662b705f569..da1c089680d8d205715f9c88b25d06e532679bae 100644 (file)
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -245,7 +245,7 @@ struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
 
 extern int ipv6_opt_accepted(struct sock *sk, struct sk_buff *skb);
 
-int ip6_frag_nqueues(void);
+int ip6_frag_nqueues(struct net *net);
 int ip6_frag_mem(void);
 
 #define IPV6_FRAG_TIMEOUT      (60*HZ)         /* 60 seconds */

diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index 158c5f60d023967d4592ba3959d28434c43e6aff..4fec0b911f856ea047d60884dd1a1252bbea17c8 100644 (file)
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -63,7 +63,6 @@ void inet_frags_init(struct inet_frags *f)
        f->rnd = (u32) ((num_physpages ^ (num_physpages>>7)) ^
                                   (jiffies ^ (jiffies >> 6)));
 
-       f->nqueues = 0;
        atomic_set(&f->mem, 0);
 
        setup_timer(&f->secret_timer, inet_frag_secret_rebuild,
@@ -73,6 +72,12 @@ void inet_frags_init(struct inet_frags *f)
 }
 EXPORT_SYMBOL(inet_frags_init);
 
+void inet_frags_init_net(struct netns_frags *nf)
+{
+       nf->nqueues = 0;
+}
+EXPORT_SYMBOL(inet_frags_init_net);
+
 void inet_frags_fini(struct inet_frags *f)
 {
        del_timer(&f->secret_timer);
@@ -84,7 +89,7 @@ static inline void fq_unlink(struct inet_frag_queue *fq, struct inet_frags *f)
        write_lock(&f->lock);
        hlist_del(&fq->list);
        list_del(&fq->lru_list);
-       f->nqueues--;
+       fq->net->nqueues--;
        write_unlock(&f->lock);
 }
 
@@ -206,7 +211,7 @@ static struct inet_frag_queue *inet_frag_intern(struct netns_frags *nf,
        atomic_inc(&qp->refcnt);
        hlist_add_head(&qp->list, &f->hash[hash]);
        list_add_tail(&qp->lru_list, &f->lru_list);
-       f->nqueues++;
+       nf->nqueues++;
        write_unlock(&f->lock);
        return qp;
 }

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 56211ef46eed1a86b00f09e29fe65c7aa2b4758d..cd8c83025b48f2b7ca99d54e19b2f2c61a054ad2 100644 (file)
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -95,9 +95,9 @@ static struct inet_frags_ctl ip4_frags_ctl __read_mostly = {
 
 static struct inet_frags ip4_frags;
 
-int ip_frag_nqueues(void)
+int ip_frag_nqueues(struct net *net)
 {
-       return ip4_frags.nqueues;
+       return net->ipv4.frags.nqueues;
 }
 
 int ip_frag_mem(void)
@@ -675,6 +675,8 @@ static inline int ip4_frags_ctl_register(struct net *net)
 
 static int ipv4_frags_init_net(struct net *net)
 {
+       inet_frags_init_net(&net->ipv4.frags);
+
        return ip4_frags_ctl_register(net);
 }
 

diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index cb3787fbeb909191e91981ebb318303dea1adb97..bae32808616eeedd72921f832809b71f60fc74ad 100644 (file)
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -62,7 +62,7 @@ static int sockstat_seq_show(struct seq_file *seq, void *v)
        seq_printf(seq, "UDPLITE: inuse %d\n", sock_prot_inuse_get(&udplite_prot));
        seq_printf(seq, "RAW: inuse %d\n", sock_prot_inuse_get(&raw_prot));
        seq_printf(seq,  "FRAG: inuse %d memory %d\n",
-                       ip_frag_nqueues(), ip_frag_mem());
+                       ip_frag_nqueues(&init_net), ip_frag_mem());
        return 0;
 }
 

diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 18accd4eab063816eee99592c4c12c0d275d5d88..0b9d0097b68dd68dc5115dd8171a46112c7bdf50 100644 (file)
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -712,6 +712,7 @@ int nf_ct_frag6_init(void)
        nf_frags.qsize = sizeof(struct nf_ct_frag6_queue);
        nf_frags.match = ip6_frag_match;
        nf_frags.frag_expire = nf_ct_frag6_expire;
+       inet_frags_init_net(&nf_init_frags);
        inet_frags_init(&nf_frags);
 
        return 0;

diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 571d95a21c15a54d067647cfa5c7bd7cf50c82c0..dec34c87cb4a962ce37b8ed051bd47982ce6a14d 100644 (file)
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -44,7 +44,7 @@ static int sockstat6_seq_show(struct seq_file *seq, void *v)
        seq_printf(seq, "RAW6: inuse %d\n",
                       sock_prot_inuse_get(&rawv6_prot));
        seq_printf(seq, "FRAG6: inuse %d memory %d\n",
-                      ip6_frag_nqueues(), ip6_frag_mem());
+                      ip6_frag_nqueues(&init_net), ip6_frag_mem());
        return 0;
 }
 

diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index ab2d53b81b70b2db90ae4b371c6c277ed0ed6417..77a874020f3a7e342cfb5b354ba25f7090a3a983 100644 (file)
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -84,9 +84,9 @@ struct frag_queue
 
 static struct inet_frags ip6_frags;
 
-int ip6_frag_nqueues(void)
+int ip6_frag_nqueues(struct net *net)
 {
-       return ip6_frags.nqueues;
+       return net->ipv6.frags.nqueues;
 }
 
 int ip6_frag_mem(void)
@@ -690,6 +690,8 @@ static int ipv6_frags_init_net(struct net *net)
        net->ipv6.sysctl.frags.timeout = IPV6_FRAG_TIMEOUT;
        net->ipv6.sysctl.frags.secret_interval = 10 * 60 * HZ;
 
+       inet_frags_init_net(&net->ipv6.frags);
+
        return ip6_frags_sysctl_register(net);
 }