diff options
author | Eric Dumazet <dada1@cosmosbay.com> | 2008-12-02 02:37:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-02 02:37:17 -0500 |
commit | 6976a1d6c222c50ac93d2273b9cf57e6fd047e59 (patch) | |
tree | ba2973e7c724b16d5e176438ae635dac4d74bc75 /net/ipv4/inet_connection_sock.c | |
parent | 422d9cdcb85b3622d08a590fed66021af7aea333 (diff) |
net: percpu_counter_inc() should not be called in BH-disabled section
Based upon a lockdep report by Alexey Dobriyan.
I checked all per_cpu_counter_xxx() usages in network tree, and I
think all call sites are BH enabled except one in
inet_csk_listen_stop().
commit dd24c00191d5e4a1ae896aafe33c6b8095ab4bd1
(net: Use a percpu_counter for orphan_count)
replaced atomic_t orphan_count to a percpu_counter.
atomic_inc()/atomic_dec() can be called from any context, while
percpu_counter_xxx() should be called from a consistent state.
For orphan_count, this context can be the BH-enabled one.
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_connection_sock.c')
-rw-r--r-- | net/ipv4/inet_connection_sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 1ccdbba528be..fe32255a9808 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c | |||
@@ -632,6 +632,8 @@ void inet_csk_listen_stop(struct sock *sk) | |||
632 | 632 | ||
633 | acc_req = req->dl_next; | 633 | acc_req = req->dl_next; |
634 | 634 | ||
635 | percpu_counter_inc(sk->sk_prot->orphan_count); | ||
636 | |||
635 | local_bh_disable(); | 637 | local_bh_disable(); |
636 | bh_lock_sock(child); | 638 | bh_lock_sock(child); |
637 | WARN_ON(sock_owned_by_user(child)); | 639 | WARN_ON(sock_owned_by_user(child)); |
@@ -641,8 +643,6 @@ void inet_csk_listen_stop(struct sock *sk) | |||
641 | 643 | ||
642 | sock_orphan(child); | 644 | sock_orphan(child); |
643 | 645 | ||
644 | percpu_counter_inc(sk->sk_prot->orphan_count); | ||
645 | |||
646 | inet_csk_destroy_sock(child); | 646 | inet_csk_destroy_sock(child); |
647 | 647 | ||
648 | bh_unlock_sock(child); | 648 | bh_unlock_sock(child); |