[PATCH v2 2/3] tcp: Eliminate FIN_TIMEOUT

[David Gibson <david@gibson.dropbear.id.au>]

Despite the name and its value of 60s, FIN_TIMEOUT is not related to
the kernel's net.ipv4.tcp_fin_timeout sysctl.  Indeed, we can't make
an equivalent to that, since it relies on information that endpoint
kernels have, but we do not.

Neither is it simply the time to wait for an ACK to a FIN.  It may
have been intended as that at some point, but the implementation has
not matched that for some time.  In any case RFC9293 makes no
distinction between ACKs to FIN segments and ACKs to data segments, so
we now implement handling of ACKs to FINs with the same code path as
ACKs to data segments.

The theory of operation describes FIN_TIMEOUT thus:

- FIN_TIMEOUT: if a FIN segment was acknowledged by tap/guest and a FIN
  segment (write shutdown) was sent via socket (events SOCK_FIN_SENT and
  TAP_FIN_ACKED), but no socket activity is detected from the socket within
  this time, reset the connection

In other words, it's attempting to handle the case that we
shutdown(SHUT_WR) on the socket side (causing the kernel to send a
FIN), but the kernel never responds with an EPOLLHUP event indicating
the peer has acked the FIN.

The description doesn't match what the code does: in tcp_timer_ctl()
we only set FIN_TIMEOUT on our timer when when ACK_FROM_TAP_DUE is
unset, but we only act on the FIN_TIMEOUT if ACK_FROM_TAP_DUE *is*
(also) set.

In fact, there's no need to handle this case.  Once we've called
shutdown(SHUT_WR), it's the kernel's responsibility to resend FINs as
needed (and reset the connection if that times out).  Therefore,
entirely remove the FIN_TIMEOUT related logic.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 tcp.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/tcp.c b/tcp.c
index dbfde2e0..0be871a4 100644
--- a/tcp.c
+++ b/tcp.c
@@ -190,11 +190,6 @@
  * - RTO_INIT_AFTER_SYN_RETRIES: if SYN retries happened during handshake and
  *   RTO is less than this, re-initialise RTO to this for data retransmissions
  *
- * - FIN_TIMEOUT: if a FIN segment was acknowledged by tap/guest and a FIN
- *   segment (write shutdown) was sent via socket (events SOCK_FIN_SENT and
- *   TAP_FIN_ACKED), but no socket activity is detected from the socket within
- *   this time, reset the connection
- *
  * - ACT_TIMEOUT, in the presence of any event: if no activity is detected on
  *   either side, the connection is reset
  *
@@ -341,7 +336,6 @@ enum {
 
 #define RTO_INIT			1		/* s, RFC 6298 */
 #define RTO_INIT_AFTER_SYN_RETRIES	3		/* s, RFC 6298 */
-#define FIN_TIMEOUT			60
 #define ACT_TIMEOUT			7200
 
 #define LOW_RTT_TABLE_SIZE		8
@@ -594,8 +588,6 @@ static void tcp_timer_ctl(const struct ctx *c, struct tcp_tap_conn *conn)
 			timeout = MAX(timeout, RTO_INIT_AFTER_SYN_RETRIES);
 		timeout <<= MAX(exp, 0);
 		it.it_value.tv_sec = MIN(timeout, c->tcp.rto_max);
-	} else if (CONN_HAS(conn, SOCK_FIN_SENT | TAP_FIN_ACKED)) {
-		it.it_value.tv_sec = FIN_TIMEOUT;
 	} else {
 		it.it_value.tv_sec = ACT_TIMEOUT;
 	}
@@ -715,9 +707,6 @@ void conn_event_do(const struct ctx *c, struct tcp_tap_conn *conn,
 			flow_hash_remove(c, TAP_SIDX(conn));
 		tcp_epoll_ctl(conn);
 	}
-
-	if (CONN_HAS(conn, SOCK_FIN_SENT | TAP_FIN_ACKED))
-		tcp_timer_ctl(c, conn);
 }
 
 /**
@@ -2590,9 +2579,6 @@ void tcp_timer_handler(const struct ctx *c, union epoll_ref ref)
 				conn_flag(c, conn, SYN_RETRIED);
 				tcp_timer_ctl(c, conn);
 			}
-		} else if (CONN_HAS(conn, SOCK_FIN_SENT | TAP_FIN_ACKED)) {
-			flow_dbg(conn, "FIN timeout");
-			tcp_rst(c, conn);
 		} else if (conn->retries == TCP_MAX_RETRIES) {
 			flow_dbg(conn, "retransmissions count exceeded");
 			tcp_rst(c, conn);
-- 
2.52.0