From patchwork Thu Nov 15 23:41:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: tcp: handle tcp_net_metrics_init() order-5 memory allocation failures Date: Thu, 15 Nov 2012 13:41:04 -0000 From: Eric Dumazet X-Patchwork-Id: 199457 Message-Id: <1353022864.10798.6.camel@edumazet-glaptop> To: David Miller Cc: netdev , Julien Tinnes From: Eric Dumazet order-5 allocations can fail with current kernels, we should try to reduce allocation sizes to allow network namespace creation. Reported-by: Julien Tinnes Signed-off-by: Eric Dumazet --- net/ipv4/tcp_metrics.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 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 --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c index 53bc584..15e93c4 100644 --- a/net/ipv4/tcp_metrics.c +++ b/net/ipv4/tcp_metrics.c @@ -1030,14 +1030,17 @@ static int __net_init tcp_net_metrics_init(struct net *net) else slots = 8 * 1024; } - +retry: net->ipv4.tcp_metrics_hash_log = order_base_2(slots); size = sizeof(struct tcpm_hash_bucket) << net->ipv4.tcp_metrics_hash_log; - net->ipv4.tcp_metrics_hash = kzalloc(size, GFP_KERNEL); - if (!net->ipv4.tcp_metrics_hash) - return -ENOMEM; - + net->ipv4.tcp_metrics_hash = kzalloc(size, GFP_KERNEL | __GFP_NOWARN); + if (!net->ipv4.tcp_metrics_hash) { + if (slots <= 16) + return -ENOMEM; + slots >>= 1; + goto retry; + } return 0; }