diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-02-21 06:21:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-21 13:26:03 -0500 |
| commit | 29869d66870a715177bfb505f66a7e0e8bcc89c3 (patch) | |
| tree | 431d7f7c1ef0477d86e36ee6dbc3eb0d7640efd6 /net/ipv4/tcp_probe.c | |
| parent | d4af4c0ad0a4d070ef756010a2a10d96ff53d73d (diff) | |
| download | op-kernel-dev-29869d66870a715177bfb505f66a7e0e8bcc89c3.zip op-kernel-dev-29869d66870a715177bfb505f66a7e0e8bcc89c3.tar.gz | |
tcp: Revert "tcp: tcp_probe: use spin_lock_bh()"
This reverts commit e70ac171658679ecf6bea4bbd9e9325cd6079d2b.
jtcp_rcv_established() is in fact called with hard irq being disabled.
Initial bug report from Ricardo Nabinger Sanchez [1] still needs
to be investigated, but does not look like a TCP bug.
[1] https://www.spinics.net/lists/netdev/msg420960.html
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: kernel test robot <xiaolong.ye@intel.com>
Cc: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_probe.c')
| -rw-r--r-- | net/ipv4/tcp_probe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c index 3d063eb..f6c50af 100644 --- a/net/ipv4/tcp_probe.c +++ b/net/ipv4/tcp_probe.c @@ -117,7 +117,7 @@ static void jtcp_rcv_established(struct sock *sk, struct sk_buff *skb, (fwmark > 0 && skb->mark == fwmark)) && (full || tp->snd_cwnd != tcp_probe.lastcwnd)) { - spin_lock_bh(&tcp_probe.lock); + spin_lock(&tcp_probe.lock); /* If log fills, just silently drop */ if (tcp_probe_avail() > 1) { struct tcp_log *p = tcp_probe.log + tcp_probe.head; @@ -157,7 +157,7 @@ static void jtcp_rcv_established(struct sock *sk, struct sk_buff *skb, tcp_probe.head = (tcp_probe.head + 1) & (bufsize - 1); } tcp_probe.lastcwnd = tp->snd_cwnd; - spin_unlock_bh(&tcp_probe.lock); + spin_unlock(&tcp_probe.lock); wake_up(&tcp_probe.wait); } |
