From: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
To: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <eric.dumazet@gmail.com>,
netdev@vger.kernel.org
Cc: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Subject: [PATCH v2 1/4] tcp: fix too short FIN_WAIT2 time out
Date: Mon, 18 Mar 2013 21:39:04 +0900 [thread overview]
Message-ID: <1363610344.7121.5.camel@ubuntu-vm-makita> (raw)
In-Reply-To: <1363610163.7121.2.camel@ubuntu-vm-makita>
When tcp_fin_timeout is between 60 and 120, a FIN_WAIT2 socket
disappears in (tcp_fin_timeout - 60) * 2 sec, which is shorter
than expected.
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
---
net/ipv4/tcp_timer.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index b78aac3..c20e474 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -576,12 +576,8 @@ static void tcp_keepalive_timer (unsigned long data)
if (sk->sk_state == TCP_FIN_WAIT2 && sock_flag(sk, SOCK_DEAD)) {
if (tp->linger2 >= 0) {
- const int tmo = tcp_fin_time(sk) - TCP_TIMEWAIT_LEN;
-
- if (tmo > 0) {
- tcp_time_wait(sk, TCP_FIN_WAIT2, tmo);
- goto out;
- }
+ tcp_time_wait(sk, TCP_FIN_WAIT2, TCP_TIMEWAIT_LEN);
+ goto out;
}
tcp_send_active_reset(sk, GFP_ATOMIC);
goto death;
--
1.7.10.4
next prev parent reply other threads:[~2013-03-18 12:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-18 12:36 [PATCH v2 0/4] tcp: fix problems when tcp_fin_timeout is greater than 60 Toshiaki Makita
2013-03-18 12:39 ` Toshiaki Makita [this message]
2013-03-18 12:43 ` [PATCH v2 2/4] tcp: fix FIN_WAIT2 timer expression in /proc/net/tcp Toshiaki Makita
2013-03-18 12:46 ` [PATCH v2 3/4] tcp: fix the indentation in timer calculation of /proc/net/tcp Toshiaki Makita
2013-03-18 12:50 ` [PATCH v2 4/4] inet_diag: fix FIN_WAIT2 timer expression in inet_diag Toshiaki Makita
2013-03-19 13:32 ` [PATCH v2 1/4] tcp: fix too short FIN_WAIT2 time out David Miller
2013-03-21 11:45 ` Toshiaki Makita
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1363610344.7121.5.camel@ubuntu-vm-makita \
--to=makita.toshiaki@lab.ntt.co.jp \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).