tcp/dccp: block bh before arming time_wait timer
Maciej Żenczykowski reported some panics in tcp_twsk_destructor() that might be caused by the following bug. timewait timer is pinned to the cpu, because we want to transition timwewait refcount from 0 to 4 in one go, once everything has been initialized. At the time commited2e923945
("tcp/dccp: fix timewait races in timer handling") was merged, TCP was always running from BH habdler. After commit5413d1babe
("net: do not block BH while processing socket backlog") we definitely can run tcp_time_wait() from process context. We need to block BH in the critical section so that the pinned timer has still its purpose. This bug is more likely to happen under stress and when very small RTO are used in datacenter flows. Fixes:5413d1babe
("net: do not block BH while processing socket backlog") Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: Maciej Żenczykowski <maze@google.com> Acked-by: Maciej Żenczykowski <maze@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
b484d8a53e
Коммит
cfac7f836a
|
@ -57,10 +57,16 @@ void dccp_time_wait(struct sock *sk, int state, int timeo)
|
|||
if (state == DCCP_TIME_WAIT)
|
||||
timeo = DCCP_TIMEWAIT_LEN;
|
||||
|
||||
/* tw_timer is pinned, so we need to make sure BH are disabled
|
||||
* in following section, otherwise timer handler could run before
|
||||
* we complete the initialization.
|
||||
*/
|
||||
local_bh_disable();
|
||||
inet_twsk_schedule(tw, timeo);
|
||||
/* Linkage updates. */
|
||||
__inet_twsk_hashdance(tw, sk, &dccp_hashinfo);
|
||||
inet_twsk_put(tw);
|
||||
local_bh_enable();
|
||||
} else {
|
||||
/* Sorry, if we're out of memory, just CLOSE this
|
||||
* socket up. We've got bigger problems than
|
||||
|
|
|
@ -310,10 +310,16 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
|
|||
if (state == TCP_TIME_WAIT)
|
||||
timeo = TCP_TIMEWAIT_LEN;
|
||||
|
||||
/* tw_timer is pinned, so we need to make sure BH are disabled
|
||||
* in following section, otherwise timer handler could run before
|
||||
* we complete the initialization.
|
||||
*/
|
||||
local_bh_disable();
|
||||
inet_twsk_schedule(tw, timeo);
|
||||
/* Linkage updates. */
|
||||
__inet_twsk_hashdance(tw, sk, &tcp_hashinfo);
|
||||
inet_twsk_put(tw);
|
||||
local_bh_enable();
|
||||
} else {
|
||||
/* Sorry, if we're out of memory, just CLOSE this
|
||||
* socket up. We've got bigger problems than
|
||||
|
|
Загрузка…
Ссылка в новой задаче