diff options
author | Tom Herbert <therbert@google.com> | 2010-06-07 03:43:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-07 03:43:42 -0400 |
commit | a8b690f98baf9fb1902b8eeab801351ea603fa3a (patch) | |
tree | b48940354a3236d33e33ca4f1b9169c9545cd551 /include/net/tcp.h | |
parent | 83038a2a7062f6cbbdcfaff47284566f060a5af1 (diff) |
tcp: Fix slowness in read /proc/net/tcp
This patch address a serious performance issue in reading the
TCP sockets table (/proc/net/tcp).
Reading the full table is done by a number of sequential read
operations. At each read operation, a seek is done to find the
last socket that was previously read. This seek operation requires
that the sockets in the table need to be counted up to the current
file position, and to count each of these requires taking a lock for
each non-empty bucket. The whole algorithm is O(n^2).
The fix is to cache the last bucket value, offset within the bucket,
and the file position returned by the last read operation. On the
next sequential read, the bucket and offset are used to find the
last read socket immediately without needing ot scan the previous
buckets the table. This algorithm t read the whole table is O(n).
The improvement offered by this patch is easily show by performing
cat'ing /proc/net/tcp on a machine with a lot of connections. With
about 182K connections in the table, I see the following:
- Without patch
time cat /proc/net/tcp > /dev/null
real 1m56.729s
user 0m0.214s
sys 1m56.344s
- With patch
time cat /proc/net/tcp > /dev/null
real 0m0.894s
user 0m0.290s
sys 0m0.594s
Signed-off-by: Tom Herbert <therbert@google.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/tcp.h')
-rw-r--r-- | include/net/tcp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index a1449144848a..573166484413 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -1413,7 +1413,8 @@ struct tcp_iter_state { | |||
1413 | sa_family_t family; | 1413 | sa_family_t family; |
1414 | enum tcp_seq_states state; | 1414 | enum tcp_seq_states state; |
1415 | struct sock *syn_wait_sk; | 1415 | struct sock *syn_wait_sk; |
1416 | int bucket, sbucket, num, uid; | 1416 | int bucket, offset, sbucket, num, uid; |
1417 | loff_t last_pos; | ||
1417 | }; | 1418 | }; |
1418 | 1419 | ||
1419 | extern int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo); | 1420 | extern int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo); |