leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: udp_unhash() can test if sk is hashed

Browse Source 
Impact: Optimization

Like done in inet_unhash(), we can avoid taking a chain lock if
socket is not hashed in udp_unhash()

Triggered by close(socket(AF_INET, SOCK_DGRAM, 0));

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2008-11-25 13:55:15 -08:00 committed by David S. Miller
parent 5bc0b3bfa7
commit 723b46108f
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/ipv4/udp.c
View File

@ -970,16 +970,18 @@ int udp_disconnect(struct sock *sk, int flags)
void udp_lib_unhash(struct sock *sk) void udp_lib_unhash(struct sock *sk)
{ {
struct udp_table *udptable = sk->sk_prot->h.udp_table; if (sk_hashed(sk)) {
unsigned int hash = udp_hashfn(sock_net(sk), sk->sk_hash); struct udp_table *udptable = sk->sk_prot->h.udp_table;
struct udp_hslot *hslot = &udptable->hash[hash]; unsigned int hash = udp_hashfn(sock_net(sk), sk->sk_hash);
struct udp_hslot *hslot = &udptable->hash[hash];
spin_lock_bh(&hslot->lock); spin_lock_bh(&hslot->lock);
if (sk_nulls_del_node_init_rcu(sk)) { if (sk_nulls_del_node_init_rcu(sk)) {
inet_sk(sk)->num = 0; inet_sk(sk)->num = 0;
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
}
spin_unlock_bh(&hslot->lock);
} }
spin_unlock_bh(&hslot->lock);
} }
EXPORT_SYMBOL(udp_lib_unhash); EXPORT_SYMBOL(udp_lib_unhash);