Re: cat /proc/net/tcp takes 0.5 seconds on x86_64

[Eric Dumazet <dada1@cosmosbay.com>]

[-- Attachment #1: Type: text/plain, Size: 1490 bytes --]

David Miller a écrit :
> From: Eric Dumazet <dada1@cosmosbay.com>
> Date: Thu, 28 Aug 2008 01:43:31 +0200
> 
>> David Miller a écrit :
>>> From: Eric Dumazet <dada1@cosmosbay.com>
>>> Date: Thu, 28 Aug 2008 01:09:19 +0200
>>>
>>>> Not really, I suspect commit (a7ab4b501f9b8a9dc4d5cee542db67b6ccd1088b [TCPv4]: Improve BH latency in /proc/net/tcp) is responsible for longer delays.
>>>> Note that its rather old :
>>>  ...
>>>> We used to disable bh once, while reading the table. This sucked.
>>>>
>>>> In case machine is handling trafic, we now are preemptable by softirqs
>>>> while reading /proc/net/tcp. Thats a good thing.
>>> Yes, that would account for it, good spotting.
>>>
>>>> By the way, I find Andi patch usefull. Same thing could be done for /proc/net/rt_cache.
>>> Fair enough.  If you can cook up a quick rt_cache patch I'll toss it and
>>> Andi's patch into net-next so it can cook for a while.
>> Well, first patch I would like to submit is about letting netlink being able to be faster than /proc/net/tcp again :)
> 
> Andi just posted a very similar patch :)

No problem :)

Here is the patch for /proc/net/rt_cache (legacy /proc and netlink interface)

Thank you

[PATCH] ip: speedup /proc/net/rt_cache handling

When scanning route cache hash table, we can avoid taking locks for empty buckets.
Both /proc/net/rt_cache and NETLINK RTM_GETROUTE interface are taken into account.

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>


[-- Attachment #2: route.patch --]
[-- Type: text/plain, Size: 1504 bytes --]

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index cca921e..71598f6 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -282,6 +282,8 @@ static struct rtable *rt_cache_get_first(struct seq_file *seq)
 	struct rtable *r = NULL;
 
 	for (st->bucket = rt_hash_mask; st->bucket >= 0; --st->bucket) {
+		if (!rt_hash_table[st->bucket].chain)
+			continue;
 		rcu_read_lock_bh();
 		r = rcu_dereference(rt_hash_table[st->bucket].chain);
 		while (r) {
@@ -299,11 +301,14 @@ static struct rtable *__rt_cache_get_next(struct seq_file *seq,
 					  struct rtable *r)
 {
 	struct rt_cache_iter_state *st = seq->private;
+
 	r = r->u.dst.rt_next;
 	while (!r) {
 		rcu_read_unlock_bh();
-		if (--st->bucket < 0)
-			break;
+		do {
+			if (--st->bucket < 0)
+				return NULL;
+		} while (!rt_hash_table[st->bucket].chain);
 		rcu_read_lock_bh();
 		r = rt_hash_table[st->bucket].chain;
 	}
@@ -2840,7 +2845,9 @@ int ip_rt_dump(struct sk_buff *skb,  struct netlink_callback *cb)
 	if (s_h < 0)
 		s_h = 0;
 	s_idx = idx = cb->args[1];
-	for (h = s_h; h <= rt_hash_mask; h++) {
+	for (h = s_h; h <= rt_hash_mask; h++, s_idx = 0) {
+		if (!rt_hash_table[h].chain)
+			continue;
 		rcu_read_lock_bh();
 		for (rt = rcu_dereference(rt_hash_table[h].chain), idx = 0; rt;
 		     rt = rcu_dereference(rt->u.dst.rt_next), idx++) {
@@ -2859,7 +2866,6 @@ int ip_rt_dump(struct sk_buff *skb,  struct netlink_callback *cb)
 			dst_release(xchg(&skb->dst, NULL));
 		}
 		rcu_read_unlock_bh();
-		s_idx = 0;
 	}
 
 done: