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

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

[INET]: Collect common frag sysctl variables together 



Some sysctl variables are used to tune the frag queues
management and it will be useful to work with them in
a common way in the future, so move them into one
structure, moreover they are the same for all the frag
management codes.

I don't place them in the existing inet_frags object,
introduced in the previous patch for two reasons:

 1. to keep them in the __read_mostly section;
 2. not to export the whole inet_frags objects outside.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7eb95156

include/net/inet_frag.h

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,13 @@ struct inet_frag_queue { 


#define INETFRAGS_HASHSZ		64



struct inet_frags_ctl {

	int high_thresh;

	int low_thresh;

	int timeout;

	int secret_interval;

};



struct inet_frags {

	struct list_head	lru_list;

	struct hlist_head	hash[INETFRAGS_HASHSZ];
@@ -28,6 +35,7 @@ struct inet_frags { 
	int			nqueues;

	atomic_t		mem;

	struct timer_list	secret_timer;

	struct inet_frags_ctl	*ctl;

};



void inet_frags_init(struct inet_frags *);

include/net/ip.h

+2 −4
Original line number Diff line number Diff line
@@ -177,10 +177,8 @@ extern int sysctl_ip_default_ttl; 
extern int sysctl_ip_nonlocal_bind;



/* From ip_fragment.c */

extern int sysctl_ipfrag_high_thresh; 

extern int sysctl_ipfrag_low_thresh;

extern int sysctl_ipfrag_time;

extern int sysctl_ipfrag_secret_interval;

struct inet_frags_ctl;

extern struct inet_frags_ctl ip4_frags_ctl;

extern int sysctl_ipfrag_max_dist;



/* From inetpeer.c */

include/net/ipv6.h

+2 −4
Original line number Diff line number Diff line
@@ -565,10 +565,8 @@ extern int inet6_hash_connect(struct inet_timewait_death_row *death_row, 
/*

 * reassembly.c

 */

extern int sysctl_ip6frag_high_thresh;

extern int sysctl_ip6frag_low_thresh;

extern int sysctl_ip6frag_time;

extern int sysctl_ip6frag_secret_interval;

struct inet_frags_ctl;

extern struct inet_frags_ctl ip6_frags_ctl;



extern const struct proto_ops inet6_stream_ops;

extern const struct proto_ops inet6_dgram_ops;

include/net/netfilter/ipv6/nf_conntrack_ipv6.h

+2 −3
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ extern void nf_ct_frag6_output(unsigned int hooknum, struct sk_buff *skb, 
			       struct net_device *out,

			       int (*okfn)(struct sk_buff *));



extern unsigned int nf_ct_frag6_timeout;

extern unsigned int nf_ct_frag6_low_thresh;

extern unsigned int nf_ct_frag6_high_thresh;

struct inet_frags_ctl;

extern struct inet_frags_ctl nf_frags_ctl;



#endif /* _NF_CONNTRACK_IPV6_H*/

net/ipv4/ip_fragment.c

+26 −21
Original line number Diff line number Diff line
@@ -50,21 +50,8 @@ 
 * as well. Or notify me, at least. --ANK

 */



/* Fragment cache limits. We will commit 256K at one time. Should we

 * cross that limit we will prune down to 192K. This should cope with

 * even the most extreme cases without allowing an attacker to measurably

 * harm machine performance.

 */

int sysctl_ipfrag_high_thresh __read_mostly = 256*1024;

int sysctl_ipfrag_low_thresh __read_mostly = 192*1024;



int sysctl_ipfrag_max_dist __read_mostly = 64;



/* Important NOTE! Fragment queue must be destroyed before MSL expires.

 * RFC791 is wrong proposing to prolongate timer each fragment arrival by TTL.

 */

int sysctl_ipfrag_time __read_mostly = IP_FRAG_TIME;



struct ipfrag_skb_cb

{

	struct inet_skb_parm	h;
@@ -87,6 +74,25 @@ struct ipq { 
	struct inet_peer *peer;

};



struct inet_frags_ctl ip4_frags_ctl __read_mostly = {

	/*

	 * Fragment cache limits. We will commit 256K at one time. Should we

	 * cross that limit we will prune down to 192K. This should cope with

	 * even the most extreme cases without allowing an attacker to

	 * measurably harm machine performance.

	 */

	.high_thresh	 = 256 * 1024,

	.low_thresh	 = 192 * 1024,



	/*

	 * Important NOTE! Fragment queue must be destroyed before MSL expires.

	 * RFC791 is wrong proposing to prolongate timer each fragment arrival

	 * by TTL.

	 */

	.timeout	 = IP_FRAG_TIME,

	.secret_interval = 10 * 60 * HZ,

};



static struct inet_frags ip4_frags;



int ip_frag_nqueues(void)
@@ -123,8 +129,6 @@ static unsigned int ipqhashfn(__be16 id, __be32 saddr, __be32 daddr, u8 prot) 
			    ip4_frags.rnd) & (INETFRAGS_HASHSZ - 1);

}



int sysctl_ipfrag_secret_interval __read_mostly = 10 * 60 * HZ;



static void ipfrag_secret_rebuild(unsigned long dummy)

{

	unsigned long now = jiffies;
@@ -150,7 +154,7 @@ static void ipfrag_secret_rebuild(unsigned long dummy) 
	}

	write_unlock(&ip4_frags.lock);



	mod_timer(&ip4_frags.secret_timer, now + sysctl_ipfrag_secret_interval);

	mod_timer(&ip4_frags.secret_timer, now + ip4_frags_ctl.secret_interval);

}



/* Memory Tracking Functions. */
@@ -237,7 +241,7 @@ static void ip_evictor(void) 
	struct list_head *tmp;

	int work;



	work = atomic_read(&ip4_frags.mem) - sysctl_ipfrag_low_thresh;

	work = atomic_read(&ip4_frags.mem) - ip4_frags_ctl.low_thresh;

	if (work <= 0)

		return;
@@ -326,7 +330,7 @@ static struct ipq *ip_frag_intern(struct ipq *qp_in) 
#endif

	qp = qp_in;



	if (!mod_timer(&qp->q.timer, jiffies + sysctl_ipfrag_time))

	if (!mod_timer(&qp->q.timer, jiffies + ip4_frags_ctl.timeout))

		atomic_inc(&qp->q.refcnt);



	atomic_inc(&qp->q.refcnt);
@@ -432,7 +436,7 @@ static int ip_frag_reinit(struct ipq *qp) 
{

	struct sk_buff *fp;



	if (!mod_timer(&qp->q.timer, jiffies + sysctl_ipfrag_time)) {

	if (!mod_timer(&qp->q.timer, jiffies + ip4_frags_ctl.timeout)) {

		atomic_inc(&qp->q.refcnt);

		return -ETIMEDOUT;

	}
@@ -733,7 +737,7 @@ int ip_defrag(struct sk_buff *skb, u32 user) 
	IP_INC_STATS_BH(IPSTATS_MIB_REASMREQDS);



	/* Start by cleaning up the memory. */

	if (atomic_read(&ip4_frags.mem) > sysctl_ipfrag_high_thresh)

	if (atomic_read(&ip4_frags.mem) > ip4_frags_ctl.high_thresh)

		ip_evictor();



	/* Lookup (or create) queue header */
@@ -758,9 +762,10 @@ void __init ipfrag_init(void) 
{

	init_timer(&ip4_frags.secret_timer);

	ip4_frags.secret_timer.function = ipfrag_secret_rebuild;

	ip4_frags.secret_timer.expires = jiffies + sysctl_ipfrag_secret_interval;

	ip4_frags.secret_timer.expires = jiffies + ip4_frags_ctl.secret_interval;

	add_timer(&ip4_frags.secret_timer);



	ip4_frags.ctl = &ip4_frags_ctl;

	inet_frags_init(&ip4_frags);

}