Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5a2bb84 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[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: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ac18e750

include/net/inet_frag.h

+3 −1
Original line number Diff line number Diff line
@@ -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);

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -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

include/net/ipv6.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

net/ipv4/inet_fragment.c

+8 −3
Original line number Diff line number Diff line
@@ -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;

}

net/ipv4/ip_fragment.c

+4 −2
Original line number Diff line number Diff line
@@ -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);

}