From patchwork Mon Nov 8 19:13:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 70444 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E2EC5B710A for ; Tue, 9 Nov 2010 06:14:14 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752070Ab0KHTOJ (ORCPT ); Mon, 8 Nov 2010 14:14:09 -0500 Received: from mail.candelatech.com ([208.74.158.172]:50718 "EHLO ns3.lanforge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751649Ab0KHTOI (ORCPT ); Mon, 8 Nov 2010 14:14:08 -0500 Received: from localhost.localdomain (firewall.candelatech.com [70.89.124.249]) by ns3.lanforge.com (8.14.2/8.14.2) with ESMTP id oA8JDn2T029477 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 8 Nov 2010 11:13:50 -0800 From: Ben Greear To: netdev@vger.kernel.org Cc: Ben Greear Subject: [PATCH 2/2] IPv6: Warn users when route/max_entries is reached. Date: Mon, 8 Nov 2010 11:13:49 -0800 Message-Id: <1289243629-20789-2-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1289243629-20789-1-git-send-email-greearb@candelatech.com> References: <1289243629-20789-1-git-send-email-greearb@candelatech.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Ben Greear --- :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);