diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2008-12-29 23:04:08 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-29 23:04:08 -0800 |
| commit | eb4dea5853046727bfbb579f0c9a8cae7369f7c6 (patch) | |
| tree | 79e18d6284494ab63a890885b0eecce9431a9597 /net/dccp/proto.c | |
| parent | 0f23174aa8c1aa7a2a6050a72a60d290ef9ee578 (diff) | |
| download | op-kernel-dev-eb4dea5853046727bfbb579f0c9a8cae7369f7c6.zip op-kernel-dev-eb4dea5853046727bfbb579f0c9a8cae7369f7c6.tar.gz | |
net: Fix percpu counters deadlock
When we converted the protocol atomic counters such as the orphan
count and the total socket count deadlocks were introduced due to
the mismatch in BH status of the spots that used the percpu counter
operations.
Based on the diagnosis and patch by Peter Zijlstra, this patch
fixes these issues by disabling BH where we may be in process
context.
Reported-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Tested-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/proto.c')
| -rw-r--r-- | net/dccp/proto.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index d5c2bac..1747cca 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -964,7 +964,6 @@ adjudge_to_death: state = sk->sk_state; sock_hold(sk); sock_orphan(sk); - percpu_counter_inc(sk->sk_prot->orphan_count); /* * It is the last release_sock in its life. It will remove backlog. @@ -978,6 +977,8 @@ adjudge_to_death: bh_lock_sock(sk); WARN_ON(sock_owned_by_user(sk)); + percpu_counter_inc(sk->sk_prot->orphan_count); + /* Have we already been destroyed by a softirq or backlog? */ if (state != DCCP_CLOSED && sk->sk_state == DCCP_CLOSED) goto out; |
