git: 1f0e13449bee - main - sctp: improve handling of stale cookie error causes

The branch main has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=1f0e13449beef3a983d9ed2faf4734075e4120d1

commit 1f0e13449beef3a983d9ed2faf4734075e4120d1
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2023-04-30 09:39:32 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-04-30 09:39:32 +0000

    sctp: improve handling of stale cookie error causes
    
    * If a measure of staleness of 0 is reported, use the RTT instead.
    * Ensure that we always send a cookie preservative parameter by
      rounding up during the calculation.
    * If allowed, perform a round trip time measurement.
    * Clear the overall error counter, since the error cause also
      acts like an ACK.
    
    MFC after:      1 week
---
 sys/netinet/sctp_input.c | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index f01c1fe710e4..26abf4953164 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -1133,26 +1133,47 @@ sctp_handle_error(struct sctp_chunkhdr *ch,
 			 */
 			if ((cause_length >= sizeof(struct sctp_error_stale_cookie)) &&
 			    (SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_ECHOED)) {
+				struct timeval now;
 				struct sctp_error_stale_cookie *stale_cookie;
+				uint64_t stale_time;
 
-				stale_cookie = (struct sctp_error_stale_cookie *)cause;
-				/* stable_time is in usec, convert to msec. */
-				asoc->cookie_preserve_req = ntohl(stale_cookie->stale_time) / 1000;
-				/* Double it to be more robust on RTX. */
-				asoc->cookie_preserve_req *= 2;
 				asoc->stale_cookie_count++;
-				if (asoc->stale_cookie_count >
-				    asoc->max_init_times) {
+				if (asoc->stale_cookie_count > asoc->max_init_times) {
 					sctp_abort_notification(stcb, false, true, 0, NULL, SCTP_SO_NOT_LOCKED);
-					/* now free the asoc */
 					(void)sctp_free_assoc(stcb->sctp_ep, stcb, SCTP_NORMAL_PROC,
 					    SCTP_FROM_SCTP_INPUT + SCTP_LOC_12);
 					return (-1);
 				}
-				/* blast back to INIT state */
+				stale_cookie = (struct sctp_error_stale_cookie *)cause;
+				stale_time = ntohl(stale_cookie->stale_time);
+				if (stale_time == 0) {
+					/* Use an RTT as an approximation. */
+					(void)SCTP_GETTIME_TIMEVAL(&now);
+					timevalsub(&now, &asoc->time_entered);
+					stale_time = (uint64_t)1000000 * (uint64_t)now.tv_sec + (uint64_t)now.tv_usec;
+					if (stale_time == 0) {
+						stale_time = 1;
+					}
+				}
+				/*
+				 * stale_time is in usec, convert it to
+				 * msec. Round upwards, to ensure that it is
+				 * non-zero.
+				 */
+				stale_time = (stale_time + 999) / 1000;
+				/* Double it, to be more robust on RTX. */
+				stale_time = 2 * stale_time;
+				asoc->cookie_preserve_req = (uint32_t)stale_time;
+				if (asoc->overall_error_count == 0) {
+					sctp_calculate_rto(stcb, asoc, net, &asoc->time_entered,
+					    SCTP_RTT_FROM_NON_DATA);
+				}
+				asoc->overall_error_count = 0;
+				/* Blast back to INIT state */
 				sctp_toss_old_cookies(stcb, &stcb->asoc);
-				SCTP_SET_STATE(stcb, SCTP_STATE_COOKIE_WAIT);
 				sctp_stop_all_cookie_timers(stcb);
+				SCTP_SET_STATE(stcb, SCTP_STATE_COOKIE_WAIT);
+				(void)SCTP_GETTIME_TIMEVAL(&asoc->time_entered);
 				sctp_send_initiate(stcb->sctp_ep, stcb, SCTP_SO_NOT_LOCKED);
 			}
 			break;