From: Eric Dumazet <eric.dumazet@gmail.com>
To: David Miller <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>, Julien Tinnes <jln@google.com>
Subject: [PATCH] tcp: handle tcp_net_metrics_init() order-5 memory allocation failures
Date: Thu, 15 Nov 2012 15:41:04 -0800 [thread overview]
Message-ID: <1353022864.10798.6.camel@edumazet-glaptop> (raw)
From: Eric Dumazet <edumazet@google.com>
order-5 allocations can fail with current kernels, we should
try to reduce allocation sizes to allow network namespace
creation.
Reported-by: Julien Tinnes <jln@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
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;
}
next reply other threads:[~2012-11-15 23:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-15 23:41 Eric Dumazet [this message]
2012-11-15 23:55 ` [PATCH] tcp: handle tcp_net_metrics_init() order-5 memory allocation failures Joe Perches
2012-11-16 0:47 ` Eric Dumazet
2012-11-16 6:39 ` David Miller
2012-11-16 15:31 ` Eric Dumazet
2012-11-16 18:37 ` David Miller
2012-11-16 18:51 ` Julien Tinnes
2012-11-16 19:08 ` Eric Dumazet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353022864.10798.6.camel@edumazet-glaptop \
--to=eric.dumazet@gmail.com \
--cc=davem@davemloft.net \
--cc=jln@google.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox