aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/inet_hashtables.h29
-rw-r--r--net/dccp/ipv4.c2
-rw-r--r--net/ipv4/inet_hashtables.c46
-rw-r--r--net/ipv4/tcp_ipv4.c2
4 files changed, 49 insertions, 30 deletions
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index 37f6cb112127..982d487751f9 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -264,37 +264,14 @@ static inline void inet_listen_unlock(struct inet_hashinfo *hashinfo)
264 wake_up(&hashinfo->lhash_wait); 264 wake_up(&hashinfo->lhash_wait);
265} 265}
266 266
267static inline void __inet_hash(struct inet_hashinfo *hashinfo, 267extern void __inet_hash(struct inet_hashinfo *hashinfo, struct sock *sk);
268 struct sock *sk, const int listen_possible) 268extern void __inet_hash_nolisten(struct inet_hashinfo *hinfo, struct sock *sk);
269{
270 struct hlist_head *list;
271 rwlock_t *lock;
272
273 BUG_TRAP(sk_unhashed(sk));
274 if (listen_possible && sk->sk_state == TCP_LISTEN) {
275 list = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)];
276 lock = &hashinfo->lhash_lock;
277 inet_listen_wlock(hashinfo);
278 } else {
279 struct inet_ehash_bucket *head;
280 sk->sk_hash = inet_sk_ehashfn(sk);
281 head = inet_ehash_bucket(hashinfo, sk->sk_hash);
282 list = &head->chain;
283 lock = inet_ehash_lockp(hashinfo, sk->sk_hash);
284 write_lock(lock);
285 }
286 __sk_add_node(sk, list);
287 sock_prot_inc_use(sk->sk_prot);
288 write_unlock(lock);
289 if (listen_possible && sk->sk_state == TCP_LISTEN)
290 wake_up(&hashinfo->lhash_wait);
291}
292 269
293static inline void inet_hash(struct inet_hashinfo *hashinfo, struct sock *sk) 270static inline void inet_hash(struct inet_hashinfo *hashinfo, struct sock *sk)
294{ 271{
295 if (sk->sk_state != TCP_CLOSE) { 272 if (sk->sk_state != TCP_CLOSE) {
296 local_bh_disable(); 273 local_bh_disable();
297 __inet_hash(hashinfo, sk, 1); 274 __inet_hash(hashinfo, sk);
298 local_bh_enable(); 275 local_bh_enable();
299 } 276 }
300} 277}
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 02fc91ce2505..f450df2fc863 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -408,7 +408,7 @@ struct sock *dccp_v4_request_recv_sock(struct sock *sk, struct sk_buff *skb,
408 408
409 dccp_sync_mss(newsk, dst_mtu(dst)); 409 dccp_sync_mss(newsk, dst_mtu(dst));
410 410
411 __inet_hash(&dccp_hashinfo, newsk, 0); 411 __inet_hash_nolisten(&dccp_hashinfo, newsk);
412 __inet_inherit_port(&dccp_hashinfo, sk, newsk); 412 __inet_inherit_port(&dccp_hashinfo, sk, newsk);
413 413
414 return newsk; 414 return newsk;
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 67704da04fc4..8dfd5a691e5f 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -267,6 +267,48 @@ static inline u32 inet_sk_port_offset(const struct sock *sk)
267 inet->dport); 267 inet->dport);
268} 268}
269 269
270void __inet_hash_nolisten(struct inet_hashinfo *hashinfo, struct sock *sk)
271{
272 struct hlist_head *list;
273 rwlock_t *lock;
274 struct inet_ehash_bucket *head;
275
276 BUG_TRAP(sk_unhashed(sk));
277
278 sk->sk_hash = inet_sk_ehashfn(sk);
279 head = inet_ehash_bucket(hashinfo, sk->sk_hash);
280 list = &head->chain;
281 lock = inet_ehash_lockp(hashinfo, sk->sk_hash);
282
283 write_lock(lock);
284 __sk_add_node(sk, list);
285 sock_prot_inc_use(sk->sk_prot);
286 write_unlock(lock);
287}
288EXPORT_SYMBOL_GPL(__inet_hash_nolisten);
289
290void __inet_hash(struct inet_hashinfo *hashinfo, struct sock *sk)
291{
292 struct hlist_head *list;
293 rwlock_t *lock;
294
295 if (sk->sk_state != TCP_LISTEN) {
296 __inet_hash_nolisten(hashinfo, sk);
297 return;
298 }
299
300 BUG_TRAP(sk_unhashed(sk));
301 list = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)];
302 lock = &hashinfo->lhash_lock;
303
304 inet_listen_wlock(hashinfo);
305 __sk_add_node(sk, list);
306 sock_prot_inc_use(sk->sk_prot);
307 write_unlock(lock);
308 wake_up(&hashinfo->lhash_wait);
309}
310EXPORT_SYMBOL_GPL(__inet_hash);
311
270/* 312/*
271 * Bind a port for a connect operation and hash it. 313 * Bind a port for a connect operation and hash it.
272 */ 314 */
@@ -334,7 +376,7 @@ ok:
334 inet_bind_hash(sk, tb, port); 376 inet_bind_hash(sk, tb, port);
335 if (sk_unhashed(sk)) { 377 if (sk_unhashed(sk)) {
336 inet_sk(sk)->sport = htons(port); 378 inet_sk(sk)->sport = htons(port);
337 __inet_hash(hinfo, sk, 0); 379 __inet_hash_nolisten(hinfo, sk);
338 } 380 }
339 spin_unlock(&head->lock); 381 spin_unlock(&head->lock);
340 382
@@ -351,7 +393,7 @@ ok:
351 tb = inet_csk(sk)->icsk_bind_hash; 393 tb = inet_csk(sk)->icsk_bind_hash;
352 spin_lock_bh(&head->lock); 394 spin_lock_bh(&head->lock);
353 if (sk_head(&tb->owners) == sk && !sk->sk_bind_node.next) { 395 if (sk_head(&tb->owners) == sk && !sk->sk_bind_node.next) {
354 __inet_hash(hinfo, sk, 0); 396 __inet_hash_nolisten(hinfo, sk);
355 spin_unlock_bh(&head->lock); 397 spin_unlock_bh(&head->lock);
356 return 0; 398 return 0;
357 } else { 399 } else {
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 652c32368ccc..fc9bdd8b7dcf 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1478,7 +1478,7 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
1478 } 1478 }
1479#endif 1479#endif
1480 1480
1481 __inet_hash(&tcp_hashinfo, newsk, 0); 1481 __inet_hash_nolisten(&tcp_hashinfo, newsk);
1482 __inet_inherit_port(&tcp_hashinfo, sk, newsk); 1482 __inet_inherit_port(&tcp_hashinfo, sk, newsk);
1483 1483
1484 return newsk; 1484 return newsk;