From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Dumazet Subject: [PATCH] tcp: handle tcp_net_metrics_init() order-5 memory allocation failures Date: Thu, 15 Nov 2012 15:41:04 -0800 Message-ID: <1353022864.10798.6.camel@edumazet-glaptop> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: netdev , Julien Tinnes To: David Miller Return-path: Received: from mail-pa0-f46.google.com ([209.85.220.46]:60238 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750788Ab2KOXlN (ORCPT ); Thu, 15 Nov 2012 18:41:13 -0500 Received: by mail-pa0-f46.google.com with SMTP id hz1so1435546pad.19 for ; Thu, 15 Nov 2012 15:41:12 -0800 (PST) Sender: netdev-owner@vger.kernel.org List-ID: 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(-) 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; }