[PATCH 1/2] docs: Add neigh/gc_thresh3 and route/max_size documentation.

[PATCH 1/2] docs: Add neigh/gc_thresh3 and route/max_size documentation.

[Ben Greear]

Signed-off-by: Ben Greear <greearb@candelatech.com>
---
:100644 100644 f350c69... 7c5cca2... M	Documentation/networking/ip-sysctl.txt
 Documentation/networking/ip-sysctl.txt |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index f350c69..7c5cca2 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -20,6 +20,15 @@ ip_no_pmtu_disc - BOOLEAN
 min_pmtu - INTEGER
 	default 562 - minimum discovered Path MTU
 
+route/max_size - INTEGER
+	Maximum number of routes allowed in the kernel.  Increase
+	this when using large numbers of interfaces and/or routes.
+
+neigh/default/gc_thresh3 - INTEGER
+	Maximum number of neighbor entries allowed.  Increase this
+	when using large numbers of interfaces and when communicating
+	with large numbers of directly-connected peers. 
+
 mtu_expires - INTEGER
 	Time, in seconds, that cached PMTU information is kept.
 
-- 
1.6.2.5

[PATCH 2/2] IPv6: Warn users when route/max_entries is reached.

[Ben Greear]

Signed-off-by: Ben Greear <greearb@candelatech.com>
---
:100644 100644 a275c6e... 348b34c... M	net/ipv6/route.c
 net/ipv6/route.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index a275c6e..348b34c 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1060,8 +1060,12 @@ static int ip6_dst_gc(struct dst_ops *ops)
 	unsigned long rt_last_gc = net->ipv6.ip6_rt_last_gc;
 
 	if (time_after(rt_last_gc + rt_min_interval, now) &&
-	    atomic_read(&ops->entries) <= rt_max_size)
+	    atomic_read(&ops->entries) <= rt_max_size) {
+		if (net_ratelimit())
+			pr_warning("IPv6:  Maximum number of routes reached,"
+				   " consider increasing route/max_size.\n");
 		goto out;
+	}
 
 	net->ipv6.ip6_rt_gc_expire++;
 	fib6_run_gc(net->ipv6.ip6_rt_gc_expire, net);
-- 
1.6.2.5

Re: [PATCH 2/2] IPv6: Warn users when route/max_entries is reached.

[Ben Greear]

On 11/08/2010 11:13 AM, Ben Greear wrote:
> Signed-off-by: Ben Greear<greearb@candelatech.com>
> ---
> :100644 100644 a275c6e... 348b34c... M	net/ipv6/route.c
>   net/ipv6/route.c |    6 +++++-
>   1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/net/ipv6/route.c b/net/ipv6/route.c
> index a275c6e..348b34c 100644
> --- a/net/ipv6/route.c
> +++ b/net/ipv6/route.c
> @@ -1060,8 +1060,12 @@ static int ip6_dst_gc(struct dst_ops *ops)
>   	unsigned long rt_last_gc = net->ipv6.ip6_rt_last_gc;
>
>   	if (time_after(rt_last_gc + rt_min_interval, now)&&
> -	    atomic_read(&ops->entries)<= rt_max_size)
> +	    atomic_read(&ops->entries)<= rt_max_size) {
> +		if (net_ratelimit())
> +			pr_warning("IPv6:  Maximum number of routes reached,"
> +				   " consider increasing route/max_size.\n");
>   		goto out;
> +	}
>
>   	net->ipv6.ip6_rt_gc_expire++;
>   	fib6_run_gc(net->ipv6.ip6_rt_gc_expire, net);

Please don't apply this.  I mis-read this code and that warning
is useless at best in this place.

Thanks,
Ben


-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com

Re: [PATCH 2/2] IPv6: Warn users when route/max_entries is reached.

[David Miller]

From: Ben Greear <greearb@candelatech.com>
Date: Mon, 08 Nov 2010 13:09:29 -0800

> On 11/08/2010 11:13 AM, Ben Greear wrote:
>> Signed-off-by: Ben Greear<greearb@candelatech.com>
 ...
> Please don't apply this.  I mis-read this code and that warning
> is useless at best in this place.

Ok.

Re: [PATCH 1/2] docs: Add neigh/gc_thresh3 and route/max_size documentation.

[David Miller]

From: Ben Greear <greearb@candelatech.com>
Date: Mon,  8 Nov 2010 11:13:48 -0800

> Signed-off-by: Ben Greear <greearb@candelatech.com>

Applied.

> +	with large numbers of directly-connected peers. 

This line has trailing whitespace, please avoid that in the
future so I don't have to correct your patches by hand.

Thanks.