diff options
| author | Herbert Xu | 2008-12-30 08:04:08 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-12-30 08:04:08 +0100 |
| commit | eb4dea5853046727bfbb579f0c9a8cae7369f7c6 (patch) | |
| tree | 79e18d6284494ab63a890885b0eecce9431a9597 /net/ipv4/tcp_ipv4.c | |
| parent | cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits: net (diff) | |
| download | kernel-qcow2-linux-eb4dea5853046727bfbb579f0c9a8cae7369f7c6.tar.gz kernel-qcow2-linux-eb4dea5853046727bfbb579f0c9a8cae7369f7c6.tar.xz kernel-qcow2-linux-eb4dea5853046727bfbb579f0c9a8cae7369f7c6.zip | |
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/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 10172487921b..9d839fa9331e 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -51,6 +51,7 @@ */ +#include <linux/bottom_half.h> #include <linux/types.h> #include <linux/fcntl.h> #include <linux/module.h> @@ -1797,7 +1798,9 @@ static int tcp_v4_init_sock(struct sock *sk) sk->sk_sndbuf = sysctl_tcp_wmem[1]; sk->sk_rcvbuf = sysctl_tcp_rmem[1]; + local_bh_disable(); percpu_counter_inc(&tcp_sockets_allocated); + local_bh_enable(); return 0; } |