Patchwork tcp: handle tcp_net_metrics_init() order-5 memory allocation failures

login
register
mail settings
Submitter David Miller
Date Nov. 16, 2012, 6:39 a.m.
Message ID <20121116.013940.813652515905883288.davem@davemloft.net>
Download mbox | patch
Permalink /patch/199494/
State RFC
Delegated to: David Miller
Headers show

Comments

David Miller - Nov. 16, 2012, 6:39 a.m.
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 15 Nov 2012 15:41:04 -0800

> 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>

Indeed, this has to be done better.

But this kind of retry solution results in non-deterministic behavior.
Yes the tcp metrics cache is best effort, but it's size can influence
behavior in a substantial way depending upon the workload.

I would suggest that we instead use different limits, ones which the
page allocator will satisfy for us always with GFP_KERNEL.

1) include linux/mmzone.h

2) Make the two limits based upon PAGE_ALLOC_COSTLY_ORDER.

That is, make the larger table size PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER
and the smaller one PAGE_SIZE << (PAGE_ALLOC_COSTLY_ORDER - 1).

How about something like this?

--
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

Patch

diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c
index 53bc584..d4b2d42 100644
--- a/net/ipv4/tcp_metrics.c
+++ b/net/ipv4/tcp_metrics.c
@@ -1,7 +1,6 @@ 
 #include <linux/rcupdate.h>
 #include <linux/spinlock.h>
 #include <linux/jiffies.h>
-#include <linux/bootmem.h>
 #include <linux/module.h>
 #include <linux/cache.h>
 #include <linux/slab.h>
@@ -9,6 +8,7 @@ 
 #include <linux/tcp.h>
 #include <linux/hash.h>
 #include <linux/tcp_metrics.h>
+#include <linux/mmzone.h>
 
 #include <net/inet_connection_sock.h>
 #include <net/net_namespace.h>
@@ -1025,10 +1025,12 @@  static int __net_init tcp_net_metrics_init(struct net *net)
 
 	slots = tcpmhash_entries;
 	if (!slots) {
-		if (totalram_pages >= 128 * 1024)
-			slots = 16 * 1024;
-		else
-			slots = 8 * 1024;
+		int order = PAGE_ALLOC_COSTLY_ORDER;
+
+		if (totalram_pages < 128 * 1024)
+			order--;
+		slots = (PAGE_SIZE << order) /
+			sizeof(struct tcpm_hash_bucket);
 	}
 
 	net->ipv4.tcp_metrics_hash_log = order_base_2(slots);