diff mbox

[v2] ipv6: don't count addrconf generated routes against gc limit

Message ID 20131207023345.GA16799@order.stressinduktion.org
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Hannes Frederic Sowa Dec. 7, 2013, 2:33 a.m. UTC 
Brett Ciphery reported that new ipv6 addresses failed to get installed
because the addrconf generated dsts where counted against the dst gc
limit. We don't need to count those routes like we currently don't count
administratively added routes.

Because the max_addresses check enforces a limit on unbounded address
generation first in case someone plays with router advertisments, we
are still safe here.

Reported-by: Brett Ciphery <brett.ciphery@windriver.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
---

On Fri, Dec 06, 2013 at 04:21:24PM -0500, David Miller wrote:
> So basically, we only want to count routes that will have RTF_CACHE
> set on them.

Exactly.

> This warning in the net_warn_ratelimited() is no longer relevant, only
> hard memory allocation failures can result in this !rt condition.  So
> please respin this patch with that warning removed.

Sorry, I spinned the patch too fast after testing.

 net/ipv6/route.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

David Miller Dec. 10, 2013, 2:01 a.m. UTC | #1 
From: Hannes Frederic Sowa <hannes@stressinduktion.org>
Date: Sat, 7 Dec 2013 03:33:45 +0100

> Brett Ciphery reported that new ipv6 addresses failed to get installed
> because the addrconf generated dsts where counted against the dst gc
> limit. We don't need to count those routes like we currently don't count
> administratively added routes.
> 
> Because the max_addresses check enforces a limit on unbounded address
> generation first in case someone plays with router advertisments, we
> are still safe here.
> 
> Reported-by: Brett Ciphery <brett.ciphery@windriver.com>
> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>

Applied and queued up for -stable, thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index ddb9d41..a0a48ac 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2166,12 +2166,10 @@  struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
 				    bool anycast)
 {
 	struct net *net = dev_net(idev->dev);
-	struct rt6_info *rt = ip6_dst_alloc(net, net->loopback_dev, 0, NULL);
-
-	if (!rt) {
-		net_warn_ratelimited("Maximum number of routes reached, consider increasing route/max_size\n");
+	struct rt6_info *rt = ip6_dst_alloc(net, net->loopback_dev,
+					    DST_NOCOUNT, NULL);
+	if (!rt)
 		return ERR_PTR(-ENOMEM);
-	}
 
 	in6_dev_hold(idev);