korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 05:34:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Pavel Emelyanov 2008-01-22 06:06:23 -08:00 committed by David S. Miller
parent ac18e7509e
commit e5a2bb842c
9 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/inet_frag.h
View File

@ -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);

2
include/net/ip.h
View File

@ -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

2
include/net/ipv6.h
View File

@ -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 */

11
net/ipv4/inet_fragment.c
View File

@ -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;
}

6
net/ipv4/ip_fragment.c
View File

@ -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);
}

2
net/ipv4/proc.c
View File

@ -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;
}

1
net/ipv6/netfilter/nf_conntrack_reasm.c
View File

@ -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;

2
net/ipv6/proc.c
View File

@ -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;
}

6
net/ipv6/reassembly.c
View File

@ -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);
}