diff options
author | Eric Dumazet <dada1@cosmosbay.com> | 2008-11-16 22:40:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-16 22:40:17 -0500 |
commit | 3ab5aee7fe840b5b1b35a8d1ac11c3de5281e611 (patch) | |
tree | 468296b7be813643248d4ca67497d6ddb6934fc6 /net/dccp | |
parent | 88ab1932eac721c6e7336708558fa5ed02c85c80 (diff) |
net: Convert TCP & DCCP hash tables to use RCU / hlist_nulls
RCU was added to UDP lookups, using a fast infrastructure :
- sockets kmem_cache use SLAB_DESTROY_BY_RCU and dont pay the
price of call_rcu() at freeing time.
- hlist_nulls permits to use few memory barriers.
This patch uses same infrastructure for TCP/DCCP established
and timewait sockets.
Thanks to SLAB_DESTROY_BY_RCU, no slowdown for applications
using short lived TCP connections. A followup patch, converting
rwlocks to spinlocks will even speedup this case.
__inet_lookup_established() is pretty fast now we dont have to
dirty a contended cache line (read_lock/read_unlock)
Only established and timewait hashtable are converted to RCU
(bind table and listen table are still using traditional locking)
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r-- | net/dccp/ipv4.c | 1 | ||||
-rw-r--r-- | net/dccp/ipv6.c | 1 | ||||
-rw-r--r-- | net/dccp/proto.c | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 528baa2e5be4..d1dd95289b89 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -938,6 +938,7 @@ static struct proto dccp_v4_prot = { | |||
938 | .orphan_count = &dccp_orphan_count, | 938 | .orphan_count = &dccp_orphan_count, |
939 | .max_header = MAX_DCCP_HEADER, | 939 | .max_header = MAX_DCCP_HEADER, |
940 | .obj_size = sizeof(struct dccp_sock), | 940 | .obj_size = sizeof(struct dccp_sock), |
941 | .slab_flags = SLAB_DESTROY_BY_RCU, | ||
941 | .rsk_prot = &dccp_request_sock_ops, | 942 | .rsk_prot = &dccp_request_sock_ops, |
942 | .twsk_prot = &dccp_timewait_sock_ops, | 943 | .twsk_prot = &dccp_timewait_sock_ops, |
943 | .h.hashinfo = &dccp_hashinfo, | 944 | .h.hashinfo = &dccp_hashinfo, |
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 4aa1148cdb20..f033e845bb07 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
@@ -1140,6 +1140,7 @@ static struct proto dccp_v6_prot = { | |||
1140 | .orphan_count = &dccp_orphan_count, | 1140 | .orphan_count = &dccp_orphan_count, |
1141 | .max_header = MAX_DCCP_HEADER, | 1141 | .max_header = MAX_DCCP_HEADER, |
1142 | .obj_size = sizeof(struct dccp6_sock), | 1142 | .obj_size = sizeof(struct dccp6_sock), |
1143 | .slab_flags = SLAB_DESTROY_BY_RCU, | ||
1143 | .rsk_prot = &dccp6_request_sock_ops, | 1144 | .rsk_prot = &dccp6_request_sock_ops, |
1144 | .twsk_prot = &dccp6_timewait_sock_ops, | 1145 | .twsk_prot = &dccp6_timewait_sock_ops, |
1145 | .h.hashinfo = &dccp_hashinfo, | 1146 | .h.hashinfo = &dccp_hashinfo, |
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 46cb3490d48e..1117d4d8c8f1 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
@@ -1090,8 +1090,8 @@ static int __init dccp_init(void) | |||
1090 | } | 1090 | } |
1091 | 1091 | ||
1092 | for (i = 0; i < dccp_hashinfo.ehash_size; i++) { | 1092 | for (i = 0; i < dccp_hashinfo.ehash_size; i++) { |
1093 | INIT_HLIST_HEAD(&dccp_hashinfo.ehash[i].chain); | 1093 | INIT_HLIST_NULLS_HEAD(&dccp_hashinfo.ehash[i].chain, i); |
1094 | INIT_HLIST_HEAD(&dccp_hashinfo.ehash[i].twchain); | 1094 | INIT_HLIST_NULLS_HEAD(&dccp_hashinfo.ehash[i].twchain, i); |
1095 | } | 1095 | } |
1096 | 1096 | ||
1097 | if (inet_ehash_locks_alloc(&dccp_hashinfo)) | 1097 | if (inet_ehash_locks_alloc(&dccp_hashinfo)) |