Skip to content

Commit 33d2811

Browse files
edumazetgregkh
authored andcommitted
tcp: Revert "tcp: tcp_probe: use spin_lock_bh()"
commit 29869d6 upstream. This reverts commit e70ac17. 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> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ee45a67 commit 33d2811

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

net/ipv4/tcp_probe.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ static void jtcp_rcv_established(struct sock *sk, struct sk_buff *skb,
117117
(fwmark > 0 && skb->mark == fwmark)) &&
118118
(full || tp->snd_cwnd != tcp_probe.lastcwnd)) {
119119

120-
spin_lock_bh(&tcp_probe.lock);
120+
spin_lock(&tcp_probe.lock);
121121
/* If log fills, just silently drop */
122122
if (tcp_probe_avail() > 1) {
123123
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,
157157
tcp_probe.head = (tcp_probe.head + 1) & (bufsize - 1);
158158
}
159159
tcp_probe.lastcwnd = tp->snd_cwnd;
160-
spin_unlock_bh(&tcp_probe.lock);
160+
spin_unlock(&tcp_probe.lock);
161161

162162
wake_up(&tcp_probe.wait);
163163
}

0 commit comments

Comments
 (0)