fix CONFIG_TCP_MD5SIG + CONFIG_PREEMPT timer BUG()
Subsystems (3)
PATCH 1/1 fix CONFIG_TCP_MD5SIG + CONFIG_PREEMPT timer BUG()
Hi,
I have recently came across a preemption imbalance detected by:
<4>huh, entered ffffffff80644630 with preempt_count 00000102, exited with 00000101? <0>------------[ cut here ]------------
<2>kernel BUG at /usr/src/linux/kernel/timer.c:664!
<0>invalid opcode: 0000 [1] PREEMPT SMP
with ffffffff80644630 being inet_twdr_hangman().
This appeared after I enabled CONFIG_TCP_MD5SIG and played with it a bit, so I looked at what might have caused it.
One thing that struck me as strange is tcp_twsk_destructor(), as it calls tcp_put_md5sig_pool() -- which entails a put_cpu(), causing the detected imbalance. Found on 2.6.23.9, but 2.6.31 is affected as well, as far as I can tell.
---
net/ipv4/tcp_minisocks.c +1 -1
@@ -363,7 +363,7 @@ void tcp_twsk_destructor(struct sock *sk#ifdef CONFIG_TCP_MD5SIG struct tcp_timewait_sock *twsk =tcp_twsk (sk);if (twsk->tw_md5_keylen) -tcp_put_md5sig_pool (); +tcp_free_md5sig_pool ();#endif }
Signature · 4 lines
Bye, Robert Varga Reality continues to ruin my life. -- Calvin
David Miller
maintainerFrom: Robert Varga <[email protected]>
Date: Wed, 16 Sep 2009 01:01:26 +0200
Quoted 14 lines
Hi,
I have recently came across a preemption imbalance detected by:
<4>huh, entered
ffffffff80644630withpreempt_count00000102, exited with 00000101? <0>------------[ cut here ]------------
<2>kernel BUG at/usr/src/linux/kernel/timer.c:664!
<0>invalid opcode: 0000 [1] PREEMPT SMPwith
ffffffff80644630beinginet_twdr_hangman().This appeared after I enabled
CONFIG_TCP_MD5SIGand played with it a bit, so I looked at what might have caused it.
Quoted 6 lines
One thing that struck me as strange is
tcp_twsk_destructor(), as it callstcp_put_md5sig_pool()-- which entails aput_cpu(), causing the detected imbalance. Found on 2.6.23.9, but 2.6.31 is affected as well, as far as I can tell.Signed-off-by Robert Varga <[email protected]>
Looks good, applied and queued up for stable.
Thanks!